1password-secrets 0.0.1.dev238__tar.gz → 0.0.1.dev243__tar.gz

{1password_secrets-0.0.1.dev238 → 1password_secrets-0.0.1.dev243}/1password_secrets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 1password-secrets
-Version: 0.0.1.dev238
+Version: 0.0.1.dev243
 Summary: 1password-secrets is a set of utilities to sync 1password secrets.
 Home-page: https://github.com/significa/fly-1password-secrets
 Author: Significa
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: python-dotenv==1.2.4
-Requires-Dist: requests==2.32.5
+Requires-Dist: requests==2.34.2
 Requires-Dist: rich==15.0.0
 Requires-Dist: inquirer==3.4.1
 Dynamic: author

{1password_secrets-0.0.1.dev238 → 1password_secrets-0.0.1.dev243}/1password_secrets.egg-info/requires.txt

@@ -1,4 +1,4 @@
 python-dotenv==1.2.4
-requests==2.32.5
+requests==2.34.2
 rich==15.0.0
 inquirer==3.4.1

{1password_secrets-0.0.1.dev238 → 1password_secrets-0.0.1.dev243}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 1password-secrets
-Version: 0.0.1.dev238
+Version: 0.0.1.dev243
 Summary: 1password-secrets is a set of utilities to sync 1password secrets.
 Home-page: https://github.com/significa/fly-1password-secrets
 Author: Significa
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: python-dotenv==1.2.4
-Requires-Dist: requests==2.32.5
+Requires-Dist: requests==2.34.2
 Requires-Dist: rich==15.0.0
 Requires-Dist: inquirer==3.4.1
 Dynamic: author

{1password_secrets-0.0.1.dev238 → 1password_secrets-0.0.1.dev243}/onepassword_secrets/fly.py

@@ -90,13 +90,8 @@ def set_fly_secrets(app_id, values, token=None) -> None:
     )
 
 
-def deploy_fly_secrets(app_id):
-    """Deploy secrets to a Fly app using the fly CLI."""
-    console.print()
-    console.print(f"[bold cyan]Deploying secrets to Fly app '{app_id}'...[/bold cyan]")
-    console.print()
-
-    command_args = ["fly", "secrets", "deploy", "-a", app_id]
+def run_fly_command(command_args, failure_message):
+    """Run a fly CLI command, raising a user-facing error if it is unavailable or fails."""
     debug_command(command_args)
 
     try:
@@ -107,7 +102,26 @@ def deploy_fly_secrets(app_id):
     debug_command(command_args, returncode=result.returncode)
 
     if result.returncode != 0:
-        raise_error(f"Failed to deploy secrets (exit code {result.returncode})")
+        raise_error(f"{failure_message} (exit code {result.returncode})")
+
+
+def deploy_fly_secrets(app_id):
+    """Sync and deploy secrets to a Fly app using the fly CLI."""
+    console.print()
+    console.print(
+        f"[bold cyan]Syncing secrets on Fly app '{app_id}' (fly secrets sync)...[/bold cyan]"
+    )
+    console.print()
+
+    run_fly_command(["fly", "secrets", "sync", "-a", app_id], "Failed to sync secrets")
+
+    console.print()
+    console.print(
+        f"[bold cyan]Deploying secrets to Fly app '{app_id}' (fly secrets deploy)...[/bold cyan]"
+    )
+    console.print()
+
+    run_fly_command(["fly", "secrets", "deploy", "-a", app_id], "Failed to deploy secrets")
 
     console.print()
     console.print(f"[bold green]Secrets deployed to Fly app '{app_id}'[/bold green]")
@@ -141,5 +155,5 @@ def update_fly_secrets(app_id, secrets):
     console.print()
     console.print(f"[bold green]Secrets staged on Fly app '{app_id}'[/bold green]")
 
-    if boolean_prompt("Deploy secrets now (run fly secrets deploy)?"):
+    if boolean_prompt("Deploy secrets now ( fly secrets sync && fly secrets deploy)?"):
         deploy_fly_secrets(app_id)