azure-deploy-cli 1.0.5__py3-none-any.whl → 1.1.0__py3-none-any.whl

azure_deploy_cli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.5'
-__version_tuple__ = version_tuple = (1, 0, 5)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)
 
 __commit_id__ = commit_id = None

azure_deploy_cli/aca/aca_cli.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import Any
 
 from azure.mgmt.appcontainers import ContainerAppsAPIClient
+from azure.mgmt.appcontainers.models import IpSecurityRestrictionRule
 
 from ..identity.managed_identity import create_or_get_user_identity
 from ..identity.role import assign_role_by_files
@@ -62,7 +63,9 @@ def _label_weight_pair(pair_str: str) -> tuple[str, int]:
     return (label, weight)
 
 
-def _convert_label_traffic_args(label_traffic_list: list[tuple[str, int]]) -> dict[str, int]:
+def _convert_label_traffic_args(
+    label_traffic_list: list[tuple[str, int]],
+) -> dict[str, int]:
     """
     Convert list of (label, weight) tuples to dictionary.
 
@@ -153,6 +156,19 @@ def cli_deploy(args: Any) -> None:
         if not env:
             raise ValueError("Cannot create container app env")
 
+        ip_rules: list[IpSecurityRestrictionRule] = []
+        if args.allowed_ips:
+            for name, cidr_ranges in args.allowed_ips:
+                for idx, cidr_range in enumerate(cidr_ranges):
+                    rule = IpSecurityRestrictionRule(
+                        name=f"{name}-{idx + 1}",
+                        action="Allow",
+                        ip_address_range=cidr_range,
+                        description=f"Allowed {name} IP range",
+                    )
+                    ip_rules.append(rule)
+            logger.critical(f"Configured {len(ip_rules)} Allowed IP restriction rules.")
+
         logger.critical("Deploying new revision...")
         result = deploy_revision(
             client=container_apps_api_client,
@@ -179,6 +195,7 @@ def cli_deploy(args: Any) -> None:
                 secret_names=args.env_var_secrets or [],
                 user_identity=user_identity,
             ),
+            ip_rules=ip_rules,
         )
 
         if args.custom_domains:
@@ -430,6 +447,24 @@ def add_commands(subparsers: argparse._SubParsersAction) -> None:
         "(includes image names, cpu, memory, env_vars, probes, ingress, and scale settings)",
     )
 
+    def tuple_ip(value: str) -> tuple[str, list[str]]:
+        if "=" not in value:
+            raise argparse.ArgumentTypeError(
+                f"Invalid format: '{value}'. Expected format: Name=IP1,IP2/CIDR"
+            )
+        name, ranges = value.split("=")
+        cidr_ranges = [cidr.strip() for cidr in ranges.split(",") if cidr.strip()]
+        return name, cidr_ranges
+
+    deploy_parser.add_argument(
+        "--allowed-ips",
+        nargs="*",
+        required=True,
+        type=tuple_ip,
+        help="List of allowed IP addresses or CIDR ranges for IP restriction. "
+        + "e.g., Name=1.3.5.7/32,2.3.4.3/24 Name2=3.4.5.6/43",
+    )
+
     deploy_parser.set_defaults(func=cli_deploy)
 
     # Add update-traffic command

azure_deploy_cli/aca/deploy_aca.py

@@ -20,6 +20,7 @@ from azure.mgmt.appcontainers.models import (
     ContainerResources,
     EnvironmentVar,
     Ingress,
+    IpSecurityRestrictionRule,
     LogAnalyticsConfiguration,
     ManagedEnvironment,
     ManagedServiceIdentity,
@@ -221,7 +222,12 @@ def build_container_images(
             source_full_image_name = get_aca_docker_image_name(
                 registry_server, container_config.image_name, container_config.existing_image_tag
             )
-            docker.pull_retag_and_push_image(source_full_image_name, target_full_image_name)
+            _login_to_acr(registry_server)
+            docker.pull_retag_and_push_image(
+                source_full_image_name,
+                target_full_image_name,
+                container_config.existing_image_platform,
+            )
             logger.success(f"Image retagged successfully to '{image_tag}'")
         elif container_config.dockerfile:
             logger.info(
@@ -259,6 +265,7 @@ def deploy_revision(
     min_replicas: int,
     max_replicas: int,
     secret_key_vault_config: SecretKeyVaultConfig,
+    ip_rules: list[IpSecurityRestrictionRule],
 ) -> RevisionDeploymentResult:
     """
     Deploy a new revision with multiple containers without updating traffic weights.
@@ -348,6 +355,7 @@ def deploy_revision(
         transport=ingress_transport,
         traffic=existing_traffic_weights,  # Preserve existing traffic
         custom_domains=existing_custom_domains,
+        ip_security_restrictions=ip_rules,
     )
 
     revision_name = generate_revision_name(container_app_name, revision_suffix, stage)

azure_deploy_cli/aca/model.py

@@ -52,6 +52,9 @@ class ContainerConfig(BaseModel):
         default=None, description="List of probe configurations"
     )
     existing_image_tag: str | None = Field(default=None, description="Optional tag to retag from")
+    existing_image_platform: str | None = Field(
+        default=None, description="Optional platform for existing image pull"
+    )
     dockerfile: str | None = Field(default=None, description="Optional dockerfile path")
 
     def post_init(self):

azure_deploy_cli/utils/docker.py

@@ -61,17 +61,22 @@ def push_image(full_image_name: str) -> None:
         raise RuntimeError("Docker push failed")
 
 
-def pull_image(full_image_name: str) -> None:
+def pull_image(full_image_name: str, platform: str | None = None) -> None:
     """
     Pull a Docker image from the registry.
 
     Args:
         full_image_name: Full image name including registry, repository, and tag
+        platform: Optional platform specification (e.g., "linux/amd64")
 
     Raises:
         RuntimeError: If the docker pull command fails
     """
-    returncode = _run_and_stream(["docker", "pull", full_image_name])
+    cmd = ["docker", "pull"]
+    if platform:
+        cmd.extend(["--platform", platform])
+    cmd.append(full_image_name)
+    returncode = _run_and_stream(cmd)
     if returncode != 0:
         raise RuntimeError("Docker pull failed")
 
@@ -95,6 +100,7 @@ def tag_image(source_image: str, target_image: str) -> None:
 def pull_retag_and_push_image(
     source_full_image_name: str,
     target_full_image_name: str,
+    platform: str | None = None,
 ) -> None:
     """
     Pull an existing image, retag it, and push to registry.
@@ -107,7 +113,7 @@ def pull_retag_and_push_image(
         RuntimeError: If the source image doesn't exist or operations fail
     """
     if not image_exists(source_full_image_name):
-        pull_image(source_full_image_name)
+        pull_image(source_full_image_name, platform)
 
     tag_image(source_full_image_name, target_full_image_name)
     push_image(target_full_image_name)

{azure_deploy_cli-1.0.5.dist-info → azure_deploy_cli-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: azure-deploy-cli
-Version: 1.0.5
+Version: 1.1.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

{azure_deploy_cli-1.0.5.dist-info → azure_deploy_cli-1.1.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 azure_deploy_cli/__init__.py,sha256=Xj8ZMqmqKWc2hhR8rtSETkOmkvrFgh020MYVB_yHp4s,1134
-azure_deploy_cli/_version.py,sha256=uYAmg6HpJuEIdeeqRyfS9YeZSA-4pXIPoW7JKBe0Uvw,704
+azure_deploy_cli/_version.py,sha256=ePNVzJOkxR8FY5bezqKQ_fgBRbzH1G7QTaRDHvGQRAY,704
 azure_deploy_cli/cli.py,sha256=I1hXskorvbryjNg0XXdqLjdBuQTPKgZeW03tLHlLxzk,1663
 azure_deploy_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-azure_deploy_cli/aca/aca_cli.py,sha256=_6c6l7iH5W2Prue3JHSHBQL12WGs9twGivmsZ9h8STU,15944
-azure_deploy_cli/aca/deploy_aca.py,sha256=c9aZlNqGyOCKgN6aD95HNEI7Zhfyze4wM7Tfw5ZF4z8,30535
-azure_deploy_cli/aca/model.py,sha256=rCIVd9WF89g7r7AOZoCPTG6siMaZwSXNR_RzqmKRQEQ,2581
+azure_deploy_cli/aca/aca_cli.py,sha256=Ng7faQLMoK9SEOEOrjrKJpoKq-v7RBlu2WSe7nNXTLo,17323
+azure_deploy_cli/aca/deploy_aca.py,sha256=bABLN9q1qxl84kCN8xX6meNrcFMBwouBECsN8l_TYJA,30804
+azure_deploy_cli/aca/model.py,sha256=elz4p02Apl0seUIA2IBz1KydaOHZpBgTVKbmSiVx_3U,2714
 azure_deploy_cli/aca/yaml_loader.py,sha256=awCJLx88j8ErLm-tLIdV8mFtlSQqGezIqugU0v4m9BI,1413
 azure_deploy_cli/aca/bash/aca-cert/create.sh,sha256=FI3Mdp9qv_DqwiAdxWmZnSY98oRxH1Y6gwDQH4OAxCc,6556
 azure_deploy_cli/aca/bash/aca-cert/destroy.sh,sha256=iao35H_c4YnZHLDpKaYeyd3I7RhHKJzSAUbNovUdcFg,1171
@@ -18,14 +18,14 @@ azure_deploy_cli/identity/role.py,sha256=WlSJmn54Urar58x4HmJUC0adbeuSTPyW-0lGodv
 azure_deploy_cli/identity/service_principal.py,sha256=IDBKVVTQP4PBso0Cv0gcApexKEdXUlKEQ3sMr4OjC1U,7958
 azure_deploy_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 azure_deploy_cli/utils/azure_cli.py,sha256=mQXHedduPShY6NqG4JePijWJnK3alCMxrTjqHCn2MaM,2576
-azure_deploy_cli/utils/docker.py,sha256=S-X5YkuxiC6TEphwrXlM8Hk_Ik-i_eTnmAs6ymvN4Z8,3965
+azure_deploy_cli/utils/docker.py,sha256=Mqm6S-UCGp2I4XV81z_1rJ_WOGomTmXKmAG3sFKnhfQ,4200
 azure_deploy_cli/utils/env.py,sha256=Qoc0mlrEcyCGk6TLl0AJNfuvhdBuok_93EW2g7Clpu8,3451
 azure_deploy_cli/utils/key_vault.py,sha256=9JYE1pmoPhggU7TZXod_qmu8TgeVmdM0OEIVHPYtPvM,354
 azure_deploy_cli/utils/logging.py,sha256=NxrhhNGnS0SWReKbwJ56A8LYLmjRd77ZBVOVQe9bgQE,3813
 azure_deploy_cli/utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-azure_deploy_cli-1.0.5.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-azure_deploy_cli-1.0.5.dist-info/METADATA,sha256=1TKYGTc1mNmS_L2BUdS3Hlzp__CHbbv8qpijMeRHxFI,29137
-azure_deploy_cli-1.0.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-azure_deploy_cli-1.0.5.dist-info/entry_points.txt,sha256=vuN79v5YJtDi5tF3rCd5qVvCGAMEQMImRHq64B-y-KQ,91
-azure_deploy_cli-1.0.5.dist-info/top_level.txt,sha256=luw_MJJWFd2vFwCtx3wbmihlkCdlZxk1NZou1eToBtU,17
-azure_deploy_cli-1.0.5.dist-info/RECORD,,
+azure_deploy_cli-1.1.0.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+azure_deploy_cli-1.1.0.dist-info/METADATA,sha256=m3YwByyI6FqYJRGgwisxN64nf_Ev2bIR2w2tnLGGb3g,29137
+azure_deploy_cli-1.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+azure_deploy_cli-1.1.0.dist-info/entry_points.txt,sha256=vuN79v5YJtDi5tF3rCd5qVvCGAMEQMImRHq64B-y-KQ,91
+azure_deploy_cli-1.1.0.dist-info/top_level.txt,sha256=luw_MJJWFd2vFwCtx3wbmihlkCdlZxk1NZou1eToBtU,17
+azure_deploy_cli-1.1.0.dist-info/RECORD,,