azure-deploy-cli 0.1.12__tar.gz → 1.0.0__tar.gz

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     rev: v1.11.2
     hooks:
       - id: mypy
-        additional_dependencies: []
+        additional_dependencies: [types-PyYAML]
         args: [--config-file=pyproject.toml]
         exclude: ^tests/
 

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.0.0] - 2026-01-09
+
+### 🚀 Features
+
+- [**breaking**] Add new required YAML-based multi-container configuration for Azure Container Apps (#27)
 ## [0.1.12] - 2026-01-06
 
 ### 🐛 Bug Fixes

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azure-deploy-cli
-Version: 0.1.12
+Version: 1.0.0
 Summary: Python CLI for Azure deployment automation - identity, roles, and container apps management
 Author-email: decewei <celinew1221@gmail.com>
 License: Mozilla Public License Version 2.0
@@ -399,6 +399,7 @@ Requires-Dist: azure-mgmt-keyvault
 Requires-Dist: azure-mgmt-msi
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pyyaml>=6.0
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.0; extra == "dev"
 Requires-Dist: mypy>=1.7.0; extra == "dev"
@@ -409,6 +410,7 @@ Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: commitizen>=3.0.0; extra == "dev"
 Requires-Dist: pre-commit>=3.0.0; extra == "dev"
 Requires-Dist: types-setuptools; extra == "dev"
+Requires-Dist: types-PyYAML; extra == "dev"
 Dynamic: license-file
 
 # Azure Deploy CLI
@@ -459,11 +461,11 @@ pip install -e /path/to/scripts
 
 ### Azure Container Apps (ACA) Deployment
 
-The ACA deployment process is split into two stages for better control:
+The ACA deployment process uses YAML configuration for containers and is split into two stages for better control:
 
 #### Stage 1: Deploy Revision
 
-Deploy a new container revision without affecting traffic:
+Deploy a new container revision from YAML configuration without affecting traffic:
 
 ```bash
 azd azaca deploy \
@@ -474,25 +476,76 @@ azd azaca deploy \
   --user-assigned-identity-name my-identity \
   --container-app my-app \
   --registry-server myregistry.azurecr.io \
-  --image-name my-image \
   --stage prod \
-  --target-port 8000 \
-  --cpu 0.5 \
-  --memory 1.0 \
+  --target-port 8080 \
   --min-replicas 1 \
   --max-replicas 10 \
   --keyvault-name my-keyvault \
-  --dockerfile ./Dockerfile \
-  --env-vars ENV_VAR1 ENV_VAR2 \
+  --container-config ./container-config.yaml \
   --env-var-secrets SECRET1 SECRET2
 ```
 
 This command:
 
+- Loads container configurations from YAML file
+- Builds/pushes container images for all containers
 - Creates or updates a new revision with 0% traffic
+- Supports multiple containers with independent configurations
 - Verifies the revision is healthy and active
 - Outputs the revision name for use in traffic management
 
+**Container Configuration YAML:**
+
+The `--container-config` file specifies container settings including images, resources, environment variables, and health probes:
+
+```yaml
+containers:
+  - name: my-app
+    image_name: my-image
+    cpu: 0.5
+    memory: "1.0Gi"
+    env_vars:
+      - ENV_VAR1
+      - ENV_VAR2
+    # relative to the directory which command will run fromm
+    dockerfile: ./Dockerfile
+    probes:
+      - type: Liveness
+        http_get:
+          path: /health
+          port: 8080
+        initial_delay_seconds: 10
+        period_seconds: 30
+      - type: Readiness
+        http_get:
+          path: /ready
+          port: 8080
+        initial_delay_seconds: 5
+        period_seconds: 10
+
+  - name: sidecar
+    image_name: sidecar-image
+    cpu: 0.25
+    memory: "0.5Gi"
+    env_vars:
+      - SIDECAR_CONFIG
+    existing_image_tag: v1.0.0  # Optional: retag from existing image
+```
+
+**Configuration Fields:**
+
+- `containers` (required): List of container configurations
+  - `name`: Container name (required)
+  - `image_name`: Image name without registry/tag (required)
+  - `cpu`: CPU allocation (required, e.g., 0.5)
+  - `memory`: Memory allocation (required, e.g., "1.0Gi")
+  - `env_vars`: List of environment variable names to load (optional)
+  - `dockerfile`: Path to Dockerfile for building (required if existing_image_tag not provided)
+  - `existing_image_tag`: Tag to retag from instead of building (required if dockerfile not provided)
+  - `probes`: List of health probes (optional)
+
+**Note:** Ingress configuration (target port) and scaling parameters (min/max replicas) are specified via CLI arguments, not in the YAML file.
+
 #### Stage 2: Update Traffic Weights
 
 Update traffic distribution and deactivate old revisions:

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/README.md

@@ -46,11 +46,11 @@ pip install -e /path/to/scripts
 
 ### Azure Container Apps (ACA) Deployment
 
-The ACA deployment process is split into two stages for better control:
+The ACA deployment process uses YAML configuration for containers and is split into two stages for better control:
 
 #### Stage 1: Deploy Revision
 
-Deploy a new container revision without affecting traffic:
+Deploy a new container revision from YAML configuration without affecting traffic:
 
 ```bash
 azd azaca deploy \
@@ -61,25 +61,76 @@ azd azaca deploy \
   --user-assigned-identity-name my-identity \
   --container-app my-app \
   --registry-server myregistry.azurecr.io \
-  --image-name my-image \
   --stage prod \
-  --target-port 8000 \
-  --cpu 0.5 \
-  --memory 1.0 \
+  --target-port 8080 \
   --min-replicas 1 \
   --max-replicas 10 \
   --keyvault-name my-keyvault \
-  --dockerfile ./Dockerfile \
-  --env-vars ENV_VAR1 ENV_VAR2 \
+  --container-config ./container-config.yaml \
   --env-var-secrets SECRET1 SECRET2
 ```
 
 This command:
 
+- Loads container configurations from YAML file
+- Builds/pushes container images for all containers
 - Creates or updates a new revision with 0% traffic
+- Supports multiple containers with independent configurations
 - Verifies the revision is healthy and active
 - Outputs the revision name for use in traffic management
 
+**Container Configuration YAML:**
+
+The `--container-config` file specifies container settings including images, resources, environment variables, and health probes:
+
+```yaml
+containers:
+  - name: my-app
+    image_name: my-image
+    cpu: 0.5
+    memory: "1.0Gi"
+    env_vars:
+      - ENV_VAR1
+      - ENV_VAR2
+    # relative to the directory which command will run fromm
+    dockerfile: ./Dockerfile
+    probes:
+      - type: Liveness
+        http_get:
+          path: /health
+          port: 8080
+        initial_delay_seconds: 10
+        period_seconds: 30
+      - type: Readiness
+        http_get:
+          path: /ready
+          port: 8080
+        initial_delay_seconds: 5
+        period_seconds: 10
+
+  - name: sidecar
+    image_name: sidecar-image
+    cpu: 0.25
+    memory: "0.5Gi"
+    env_vars:
+      - SIDECAR_CONFIG
+    existing_image_tag: v1.0.0  # Optional: retag from existing image
+```
+
+**Configuration Fields:**
+
+- `containers` (required): List of container configurations
+  - `name`: Container name (required)
+  - `image_name`: Image name without registry/tag (required)
+  - `cpu`: CPU allocation (required, e.g., 0.5)
+  - `memory`: Memory allocation (required, e.g., "1.0Gi")
+  - `env_vars`: List of environment variable names to load (optional)
+  - `dockerfile`: Path to Dockerfile for building (required if existing_image_tag not provided)
+  - `existing_image_tag`: Tag to retag from instead of building (required if dockerfile not provided)
+  - `probes`: List of health probes (optional)
+
+**Note:** Ingress configuration (target port) and scaling parameters (min/max replicas) are specified via CLI arguments, not in the YAML file.
+
 #### Stage 2: Update Traffic Weights
 
 Update traffic distribution and deactivate old revisions:

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/pyproject.toml

@@ -58,6 +58,7 @@ azure_deploy_cli = [
 line-length = 100
 target-version = "py310"
 src = ["src", "tests"]
+exclude = ["*/_version.py"]
 
 [tool.ruff.lint]
 select = [

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/requirements-dev.txt

@@ -7,3 +7,4 @@ pytest-cov>=4.0.0
 commitizen>=3.0.0
 pre-commit>=3.0.0
 types-setuptools
+types-PyYAML

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/requirements.txt

@@ -5,3 +5,4 @@ azure-mgmt-keyvault
 azure-mgmt-msi
 python-dotenv>=1.0.0
 pydantic>=2.0.0
+pyyaml>=6.0

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/src/azure_deploy_cli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.12'
-__version_tuple__ = version_tuple = (0, 1, 12)
+__version__ = version = '1.0.0'
+__version_tuple__ = version_tuple = (1, 0, 0)
 
-__commit_id__ = commit_id = 'gce185d829'
+__commit_id__ = commit_id = 'g2aebd8fbb'

{azure_deploy_cli-0.1.12 → azure_deploy_cli-1.0.0}/src/azure_deploy_cli/aca/aca_cli.py

@@ -15,14 +15,13 @@ from ..utils.logging import get_logger
 from .deploy_aca import (
     SecretKeyVaultConfig,
     bind_aca_managed_certificate,
-    build_acr_image,
     create_container_app_env,
     deploy_revision,
     generate_revision_suffix,
-    get_aca_docker_image_name,
     update_traffic_weights,
     validate_revision_suffix_and_throw,
 )
+from .yaml_loader import ContainerAppConfig, load_app_config_yaml
 
 logger = get_logger(__name__)
 
@@ -92,16 +91,16 @@ def _validate_cli_deploy(args: Any):
 
 def cli_deploy(args: Any) -> None:
     """
-    Note: this is an opinionated deployment flow for ACA.
-    Deploy Azure Container App revision without updating traffic.
+    Deploy Azure Container App revision from YAML configuration without updating traffic.
 
     This command orchestrates:
-    1. Create/get user-assigned managed identity (if specified)
-    2. Assign roles to the identity (if role config provided)
-    3. Build and push container image (if not skipped)
-    4. Deploy new revision with 0% traffic
-    5. Verify revision activation and health
-    6. Output the revision name for use in traffic management
+    1. Load container configuration from YAML
+    2. Create/get user-assigned managed identity (if specified)
+    3. Assign roles to the identity (if role config provided)
+    4. Build/push container images for all containers
+    5. Deploy new revision with 0% traffic
+    6. Verify revision activation and health
+    7. Output the revision name for use in traffic management
 
     Args:
         args: Parsed command line arguments
@@ -128,24 +127,9 @@ def cli_deploy(args: Any) -> None:
             else generate_revision_suffix(stage=args.stage)
         )
 
-        logger.critical("Building and pushing ACR image...")
-        logger.info(f"Using revision suffix '{revision_suffix}' as target image tag")
-        build_acr_image(
-            registry_server=args.registry_server,
-            dockerfile=args.dockerfile,
-            full_image_name=get_aca_docker_image_name(
-                registry_server=args.registry_server,
-                image_name=args.image_name,
-                image_tag=revision_suffix,
-            ),
-            source_full_image_name=get_aca_docker_image_name(
-                registry_server=args.registry_server,
-                image_name=args.image_name,
-                image_tag=args.existing_image_tag,
-            )
-            if args.existing_image_tag
-            else None,
-        )
+        logger.critical(f"Loading container configuration from '{args.container_config}'...")
+        app_config: ContainerAppConfig = load_app_config_yaml(args.container_config)
+        logger.critical(f"Loaded configuration with {len(app_config.containers)} container(s)")
 
         logger.critical("Setting up managed identity and roles...")
         user_identity = create_or_get_user_identity(
@@ -180,14 +164,13 @@ def cli_deploy(args: Any) -> None:
             registry_server=args.registry_server,
             registry_user=registry_user,
             registry_pass_env_name=REGISTRY_PASS_SECRET_ENV_NAME,
-            image_name=args.image_name,
-            image_tag=revision_suffix,
             revision_suffix=revision_suffix,
             location=args.location,
             stage=args.stage,
+            container_configs=app_config.containers,
             target_port=args.target_port,
-            cpu=args.cpu,
-            memory=args.memory,
+            ingress_external=args.ingress_external,
+            ingress_transport=args.ingress_transport,
             min_replicas=args.min_replicas,
             max_replicas=args.max_replicas,
             secret_key_vault_config=SecretKeyVaultConfig(
@@ -196,8 +179,6 @@ def cli_deploy(args: Any) -> None:
                 secret_names=args.env_var_secrets or [],
                 user_identity=user_identity,
             ),
-            env_var_names=args.env_vars,
-            existing_image_tag=args.existing_image_tag,
         )
 
         if args.custom_domains:
@@ -352,65 +333,57 @@ def add_commands(subparsers: argparse._SubParsersAction) -> None:
         help="Container registry server.",
     )
     deploy_parser.add_argument(
-        "--image-name",
+        "--keyvault-name",
         required=True,
         type=str,
-        help="Name of the container image.",
+        help="Name of the Key Vault for storing secrets.",
     )
+
     deploy_parser.add_argument(
-        "--existing-image-tag",
-        required=False,
+        "--stage",
+        required=True,
         type=str,
-        help=(
-            "Tag of an existing image to retag to the revision suffix. "
-            "If provided, the image with this tag will be pulled from the registry, "
-            "retagged to the revision suffix, and pushed. "
-            "If the image doesn't exist, deployment will fail."
-        ),
+        help="Deployment stage label (e.g., staging, prod) used for revision naming.",
     )
+
     deploy_parser.add_argument(
         "--target-port",
         required=True,
         type=int,
-        help="Target port for the container app.",
+        help="Target port for the container app ingress.",
     )
+
     deploy_parser.add_argument(
-        "--cpu",
-        required=True,
-        type=float,
-        help="CPU allocation for the container app.",
+        "--ingress-external",
+        required=False,
+        type=bool,
+        default=True,
+        help="Whether ingress is external (default: True).",
     )
+
     deploy_parser.add_argument(
-        "--memory",
-        required=True,
+        "--ingress-transport",
+        required=False,
         type=str,
-        help="Memory allocation for the container app (e.g., '2.0Gi').",
+        default="auto",
+        choices=["auto", "http", "http2", "tcp"],
+        help="Ingress transport protocol (default: auto).",
     )
+
     deploy_parser.add_argument(
         "--min-replicas",
         required=True,
         type=int,
         help="Minimum number of replicas for the container app.",
     )
+
     deploy_parser.add_argument(
         "--max-replicas",
         required=True,
         type=int,
         help="Maximum number of replicas for the container app.",
     )
-    deploy_parser.add_argument(
-        "--keyvault-name",
-        required=True,
-        type=str,
-        help="Name of the Key Vault for storing secrets.",
-    )
 
-    deploy_parser.add_argument(
-        "--stage",
-        required=True,
-        type=str,
-        help="Deployment stage label (e.g., staging, prod) used for revision naming.",
-    )
     deploy_parser.add_argument(
         "--env-var-secrets",
         required=False,
@@ -419,14 +392,6 @@ def add_commands(subparsers: argparse._SubParsersAction) -> None:
         help="Space-separated names of environment variables to be stored as secrets in Key Vault.",
     )
 
-    deploy_parser.add_argument(
-        "--env-vars",
-        required=False,
-        type=str,
-        nargs="+",
-        help="Space-separated names of environment variables to pass to the container.",
-    )
-
     deploy_parser.add_argument(
         "--role-config",
         required=False,
@@ -458,10 +423,11 @@ def add_commands(subparsers: argparse._SubParsersAction) -> None:
     )
 
     deploy_parser.add_argument(
-        "--dockerfile",
+        "--container-config",
         required=True,
-        type=str,
-        help="Path to the Dockerfile for building the container image.",
+        type=Path,
+        help="Path to YAML file containing container configurations "
+        "(includes image names, cpu, memory, env_vars, probes, ingress, and scale settings)",
     )
 
     deploy_parser.set_defaults(func=cli_deploy)