opsmith-cli 0.3.0b0__tar.gz → 0.3.1b0__tar.gz

{opsmith_cli-0.3.0b0 → opsmith_cli-0.3.1b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opsmith-cli
-Version: 0.3.0b0
+Version: 0.3.1b0
 Summary: Opsmith is an AI devops engineer in your terminal
 License-Expression: GPL-3.0-only
 License-File: LICENSE.txt

{opsmith_cli-0.3.0b0 → opsmith_cli-0.3.1b0}/opsmith/deployment_strategies/base.py

@@ -113,14 +113,14 @@ class BaseDeploymentStrategy(abc.ABC):
         # Registry name should probably be unique per region for the app
         registry_name = slugify(f"{app_name}-{environment.region}")
 
-        cloud_provider_instance = deployment_config.cloud_provider_instance
+        cloud_provider_instance = environment.cloud_provider_instance
         provider_name = cloud_provider_instance.name()
 
         registry_infra_path = (
             self.deployments_path
             / "environments"
             / "global"
-            / environment.region
+            / f"{cloud_provider_instance.name()}-{environment.region}"
             / "container_registry"
         )
         tf = TerraformProvisioner(working_dir=registry_infra_path)
@@ -201,7 +201,7 @@ class BaseDeploymentStrategy(abc.ABC):
 
             ansible_runner = AnsibleProvisioner(working_dir=build_infra_path)
 
-            provider_name = deployment_config.cloud_provider["name"].lower()
+            provider_name = environment.cloud_provider["name"].lower()
 
             extra_vars = {
                 "docker_path": str(self.agent_deps.src_dir),

{opsmith_cli-0.3.0b0 → opsmith_cli-0.3.1b0}/opsmith/deployment_strategies/monolithic.py

@@ -162,7 +162,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
 
         ansible_runner = AnsibleProvisioner(working_dir=deploy_compose_path)
         ansible_runner.copy_template(
-            "docker_compose_deploy", deployment_config.cloud_provider_instance.name().lower()
+            "docker_compose_deploy", environment.cloud_provider_instance.name().lower()
         )
 
         traefik_template = self.docker_compose_snippets_env.get_template("traefik.yml")
@@ -634,7 +634,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
             s for s in deployment_config.services if s.service_type != ServiceTypeEnum.FRONTEND
         ]
 
-        cloud_provider = deployment_config.cloud_provider_instance
+        cloud_provider = environment.cloud_provider_instance
         env_state_path = self._get_env_state_path(environment.name)
 
         env_state = MonolithicDeploymentState()
@@ -761,7 +761,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
         """Deploys the application."""
         env_state_path = self._get_env_state_path(environment.name)
         env_state = MonolithicDeploymentState.load(env_state_path)
-        cloud_provider = deployment_config.cloud_provider_instance
+        cloud_provider = environment.cloud_provider_instance
         state_updated = False
 
         # Release frontend services
@@ -839,7 +839,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
     ):
         """Destroys the environment's infrastructure."""
         print("\n[bold blue]Destroying monolithic environment...[/bold blue]")
-        cloud_provider = deployment_config.cloud_provider_instance
+        cloud_provider = environment.cloud_provider_instance
 
         env_state_path = self._get_env_state_path(environment.name)
         if not env_state_path.exists():
@@ -960,7 +960,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
                 self.deployments_path
                 / "environments"
                 / "global"
-                / environment.region
+                / f"{cloud_provider.name()}-{environment.region}"
                 / "container_registry"
             )
 

{opsmith_cli-0.3.0b0 → opsmith_cli-0.3.1b0}/opsmith/main.py

@@ -243,39 +243,9 @@ def setup(ctx: typer.Context):
             raise typer.Exit(code=1)
         app_name = app_name_answers["app_name"]
 
-        provider_questions = [
-            inquirer.List(
-                "cloud_provider",
-                message="Select the cloud provider for deployment",
-                choices=CLOUD_PROVIDER_REGISTRY.choices,
-            ),
-        ]
-        provider_answers = inquirer.prompt(provider_questions)
-        if not provider_answers:
-            print("[bold red]Cloud provider selection is required. Aborting.[/bold red]")
-            raise typer.Exit(code=1)
-
-        selected_provider_value = provider_answers["cloud_provider"]
-
-        # Get cloud details if new or changed
-        print(f"Initializing {selected_provider_value} provider...\n")
-        provider_class = CLOUD_PROVIDER_REGISTRY.get_provider_class(selected_provider_value)
-        try:
-            cloud_details = provider_class.get_account_details().model_dump(mode="json")
-        except CloudCredentialsError as e:
-            print(f"[bold red]Cloud provider authentication/configuration error:\n{e}[/bold red]")
-            raise typer.Exit(code=1)
-        except Exception as e:
-            print(
-                "[bold red]An unexpected error occurred while initializing cloud provider or"
-                f" fetching details: {e}. Aborting.[/bold red]"
-            )
-            raise typer.Exit(code=1)
-
         deployment_config = DeploymentConfig(
             app_name=app_name,
             app_name_slug=slugify(app_name),
-            cloud_provider=cloud_details,
         )
         scan_services = True
         git_repo.ensure_gitignore()
@@ -369,10 +339,39 @@ def deploy(ctx: typer.Context):
     selected_env_name = answers["environment"]
 
     if selected_env_name == "<Create a new environment>":
+        provider_questions = [
+            inquirer.List(
+                "cloud_provider",
+                message="Select the cloud provider for deployment",
+                choices=CLOUD_PROVIDER_REGISTRY.choices,
+            ),
+        ]
+        provider_answers = inquirer.prompt(provider_questions)
+        if not provider_answers:
+            print("[bold red]Cloud provider selection is required. Aborting.[/bold red]")
+            raise typer.Exit(code=1)
+
+        selected_provider_value = provider_answers["cloud_provider"]
+
+        # Initialize the provider
+        print(f"Initializing {selected_provider_value} provider...\n")
+        provider_class = CLOUD_PROVIDER_REGISTRY.get_provider_class(selected_provider_value)
+        try:
+            cloud_details = provider_class.get_account_details().model_dump(mode="json")
+        except CloudCredentialsError as e:
+            print(f"[bold red]Cloud provider authentication/configuration error:\n{e}[/bold red]")
+            raise typer.Exit(code=1)
+        except Exception as e:
+            print(
+                "[bold red]An unexpected error occurred while initializing cloud provider or"
+                f" fetching details: {e}. Aborting.[/bold red]"
+            )
+            raise typer.Exit(code=1)
+
         # Get cloud provider to fetch regions
         with WaitingSpinner(text="Fetching regions from your cloud provider"):
             try:
-                provider_instance = deployment_config.cloud_provider_instance
+                provider_instance = provider_class(cloud_details)
                 regions = provider_instance.get_regions()
             except CloudCredentialsError as e:
                 print(
@@ -466,6 +465,7 @@ def deploy(ctx: typer.Context):
 
         new_env = DeploymentEnvironment(
             name=selected_env_name,
+            cloud_provider=cloud_details,
             region=selected_region,
             strategy=selected_strategy,
             domains=domains,

{opsmith_cli-0.3.0b0 → opsmith_cli-0.3.1b0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opsmith-cli"
-version = "0.3.0b"
+version = "0.3.1b"
 description = "Opsmith is an AI devops engineer in your terminal"
 readme = {file = "README.md", content-type = "text/markdown"}
 classifiers = [