Merge branch 'main' of github.com:Azure/azure-cli-extensions into rel…

…ease-1.2.5
AzureArcForKubernetes · Jul 28, 2022 · e3b7e84 · e3b7e84
2 parents 37017b3 + 67aaaaa
commit e3b7e84
Show file tree

Hide file tree

Showing 329 changed files with 88,044 additions and 59,502 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -239,3 +239,5 @@
 /src/containerapp-compose/ @smurawski @jldeen
 
 /src/change-analysis/ @linglingtong
+
+/src/fluid-relay/ @kairu-ms @necusjz @ZengTaoxu
diff --git a/linter_exclusions.yml b/linter_exclusions.yml
@@ -234,6 +234,12 @@ sql mi-arc create:
     sync_secondary_to_commit:
       rule_exclusions:
       - option_length_too_long
+    storage_class_orchestrator_logs:
+      rule_exclusions:
+      - option_length_too_long
+    volume_size_orchestrator_logs:
+      rule_exclusions:
+      - option_length_too_long
 attestation policy set:
   parameters:
     new_attestation_policy:
@@ -688,6 +694,17 @@ dms project task create:
     target_connection_json:
       rule_exclusions:
       - option_length_too_long
+dt data-history connection create:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+dt data-history connection create adx:
+  parameters:
+    adx_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+    eh_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
 dt endpoint create servicebus:
   parameters:
     servicebus_resource_group:
@@ -1085,6 +1102,22 @@ iot central export update:
     central_dns_suffix:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot central device attestation update:
+  parameters:
+    api_version:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
+    central_dns_suffix:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
+iot central device twin update:
+  parameters:
+    api_version:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
+    central_dns_suffix:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
 iot central device update:
   parameters:
     api_version:
@@ -1093,6 +1126,14 @@ iot central device update:
     central_dns_suffix:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot central device-group update:
+  parameters:
+    api_version:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
+    central_dns_suffix:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
 iot central device-template update:
   parameters:
     api_version:
@@ -2339,6 +2380,36 @@ ssh arc:
     ssh_args:
       rule_exclusions:
         - no_positional_parameters
+stack-hci arc-setting create:
+  parameters:
+    arc_application_client_id:
+      rule_exclusions:
+        - option_length_too_long
+    arc_application_object_id:
+      rule_exclusions:
+        - option_length_too_long
+    arc_application_tenant_id:
+      rule_exclusions:
+        - option_length_too_long
+    arc_service_principal_object_id:
+      rule_exclusions:
+        - option_length_too_long
+    connectivity_properties:
+      rule_exclusions:
+        - option_length_too_long
+stack-hci arc-setting update:
+  parameters:
+    connectivity_properties:
+      rule_exclusions:
+        - option_length_too_long
+stack-hci cluster create:
+  parameters:
+    aad_application_object_id:
+      rule_exclusions:
+        - option_length_too_long
+    aad_service_principal_object_id:
+      rule_exclusions:
+        - option_length_too_long
 storage account create:
   parameters:
     hierarchical_namespace:

diff --git a/scripts/ci/credscan/CredScanSuppressions.json b/scripts/ci/credscan/CredScanSuppressions.json
@@ -144,7 +144,8 @@
         "src\\containerapp\\azext_containerapp\\tests\\latest\\cert.pfx",
         "src\\containerapp\\azext_containerapp\\tests\\latest\\test_containerapp_commands.py",
         "src\\containerapp\\azext_containerapp\\tests\\latest\\test_containerapp_env_commands.py",
-        "src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_registry_msi.yaml"
+        "src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_registry_msi.yaml",
+        "src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_update_containers.yaml"
       ],
       "_justification": "Dummy resources' keys left during testing Microsoft.App (required for log-analytics to create managedEnvironments)"
     },

diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
@@ -12,6 +12,35 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
+0.5.92
+++++++
+
+* Move Azure KeyVault KMS to GA.
+* Support disabling Azure KeyVault KMS.
+* Update to use 2022-06-02-preview api version.
+
+0.5.91
+++++++
+
+* Fix compatibility issue when enabling Microsoft Defender via aks-preview.
+    * az aks create
+    * az aks update
+
+0.5.90 (NOT RELEASED)
++++++++++++++++++++++
+
+* Skip this version due to conflict.
+
+0.5.89
+++++++
+
+* Fix for the az aks addon list command to return enable:true, if virtual-node addon is enabled for the AKS cluster.
+
+0.5.88
+++++++
+
+* AKS Monitoring MSI Auth related code imported from Azure CLI to reuse the code between aks-preview and Azure CLI.
+
 0.5.87
 ++++++
 

diff --git a/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/cli_matrix_default.json
@@ -10,13 +10,13 @@
         ],
         "need feature registration": [
             "test_aks_create_enable_encryption",
-            "test_aks_create_edge_zone",
+            "test_aks_create_edge_zone"
+        ],
+        "need namespace registration (AME)": [
             "test_aks_create_with_monitoring_aad_auth_msi",
             "test_aks_create_with_monitoring_aad_auth_uai",
             "test_aks_enable_monitoring_with_aad_auth_msi",
-            "test_aks_enable_monitoring_with_aad_auth_uai",
-            "test_aks_create_with_defender",
-            "test_aks_update_with_defender"
+            "test_aks_enable_monitoring_with_aad_auth_uai"
         ]
     }
 }
diff --git a/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json b/src/aks-preview/azcli_aks_live_test/configs/ext_matrix_default.json
@@ -16,10 +16,6 @@
             "test_aks_create_with_pod_identity_enabled",
             "test_aks_create_using_azurecni_with_pod_identity_enabled",
             "test_aks_pod_identity_usage",
-            "test_aks_create_with_monitoring_aad_auth_msi",
-            "test_aks_create_with_monitoring_aad_auth_uai",
-            "test_aks_enable_monitoring_with_aad_auth_msi",
-            "test_aks_enable_monitoring_with_aad_auth_uai",
             "test_aks_nodepool_add_with_workload_runtime",
             "test_aks_nodepool_add_with_gpu_instance_profile",
             "test_aks_create_with_crg_id",
@@ -29,9 +25,19 @@
             "test_list_trustedaccess_roles",
             "test_aks_custom_ca_trust_flow",
             "test_aks_create_with_csi_driver_v2",
-            "test_aks_create_and_update_csi_driver_to_v2",
+            "test_aks_create_and_update_csi_driver_to_v2"
+        ],
+        "toggle": [
             "test_aks_create_with_azurekeyvaultkms_private_key_vault",
-            "test_aks_update_with_azurekeyvaultkms_private_key_vault"
+            "test_aks_update_with_azurekeyvaultkms_private_key_vault",
+            "test_aks_create_with_azurekeyvaultkms_public_key_vault",
+            "test_aks_create_with_azurekeyvaultkms_private_cluster_v1_private_key_vault"
+        ],
+        "need namespace registration (AME)": [
+            "test_aks_create_with_monitoring_aad_auth_msi",
+            "test_aks_create_with_monitoring_aad_auth_uai",
+            "test_aks_enable_monitoring_with_aad_auth_msi",
+            "test_aks_enable_monitoring_with_aad_auth_uai"
         ]
     }
 }
diff --git a/src/aks-preview/azext_aks_preview/__init__.py b/src/aks-preview/azext_aks_preview/__init__.py
@@ -16,7 +16,7 @@ def register_aks_preview_resource_type():
     register_resource_type(
         "latest",
         CUSTOM_MGMT_AKS_PREVIEW,
-        SDKProfile("2022-05-02-preview", {"container_services": "2017-07-01"}),
+        SDKProfile("2022-06-02-preview", {"container_services": "2017-07-01"}),
     )
 
 

diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py
@@ -771,6 +771,9 @@
         - name: --enable-azure-keyvault-kms
           type: bool
           short-summary: Enable Azure KeyVault Key Management Service.
+        - name: --disable-azure-keyvault-kms
+          type: bool
+          short-summary: Disable Azure KeyVault Key Management Service.
         - name: --azure-keyvault-kms-key-id
           type: string
           short-summary: Identifier of Azure Key Vault key.

diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py
@@ -298,10 +298,10 @@ def load_arguments(self, _):
         c.argument('enable_pod_identity_with_kubenet', action='store_true')
         c.argument('enable_workload_identity', arg_type=get_three_state_flag())
         c.argument('enable_oidc_issuer', action='store_true', is_preview=True)
-        c.argument('enable_azure_keyvault_kms', action='store_true', is_preview=True)
-        c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id, is_preview=True)
-        c.argument('azure_keyvault_kms_key_vault_network_access', arg_type=get_enum_type(keyvault_network_access_types), default=CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PUBLIC, is_preview=True)
-        c.argument('azure_keyvault_kms_key_vault_resource_id', validator=validate_azure_keyvault_kms_key_vault_resource_id, is_preview=True)
+        c.argument('enable_azure_keyvault_kms', action='store_true')
+        c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id)
+        c.argument('azure_keyvault_kms_key_vault_network_access', arg_type=get_enum_type(keyvault_network_access_types), default=CONST_AZURE_KEYVAULT_NETWORK_ACCESS_PUBLIC)
+        c.argument('azure_keyvault_kms_key_vault_resource_id', validator=validate_azure_keyvault_kms_key_vault_resource_id)
         c.argument('cluster_snapshot_id', validator=validate_cluster_snapshot_id, is_preview=True)
         c.argument('disk_driver_version', arg_type=get_enum_type(disk_driver_versions))
         c.argument('disable_disk_driver', action='store_true')
@@ -388,10 +388,11 @@ def load_arguments(self, _):
         c.argument('disable_pod_identity', action='store_true')
         c.argument('enable_workload_identity', arg_type=get_three_state_flag())
         c.argument('enable_oidc_issuer', action='store_true', is_preview=True)
-        c.argument('enable_azure_keyvault_kms', action='store_true', is_preview=True)
-        c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id, is_preview=True)
-        c.argument('azure_keyvault_kms_key_vault_network_access', arg_type=get_enum_type(keyvault_network_access_types), is_preview=True)
-        c.argument('azure_keyvault_kms_key_vault_resource_id', validator=validate_azure_keyvault_kms_key_vault_resource_id, is_preview=True)
+        c.argument('enable_azure_keyvault_kms', action='store_true')
+        c.argument('disable_azure_keyvault_kms', action='store_true')
+        c.argument('azure_keyvault_kms_key_id', validator=validate_azure_keyvault_kms_key_id)
+        c.argument('azure_keyvault_kms_key_vault_network_access', arg_type=get_enum_type(keyvault_network_access_types))
+        c.argument('azure_keyvault_kms_key_vault_resource_id', validator=validate_azure_keyvault_kms_key_vault_resource_id)
         c.argument('enable_disk_driver', action='store_true')
         c.argument('disk_driver_version', arg_type=get_enum_type(disk_driver_versions))
         c.argument('disable_disk_driver', action='store_true')

diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py
@@ -766,6 +766,7 @@ def aks_update(
     enable_workload_identity=None,
     enable_oidc_issuer=False,
     enable_azure_keyvault_kms=False,
+    disable_azure_keyvault_kms=False,
     azure_keyvault_kms_key_id=None,
     azure_keyvault_kms_key_vault_network_access=None,
     azure_keyvault_kms_key_vault_resource_id=None,
@@ -1383,6 +1384,7 @@ def aks_addon_list_available():
 def aks_addon_list(cmd, client, resource_group_name, name):
     mc = client.get(resource_group_name, name)
     current_addons = []
+    os_type = 'Linux'
 
     for name, addon_key in ADDONS.items():
         # web_application_routing is a special case, the configuration is stored in a separate profile
@@ -1395,6 +1397,8 @@ def aks_addon_list(cmd, client, resource_group_name, name):
                 else False
             )
         else:
+            if name == "virtual-node":
+                addon_key += os_type
             enabled = (
                 True
                 if mc.addon_profiles and
Original file line number	Diff line number	Diff line change
Expand Up		@@ -239,3 +239,5 @@
		/src/containerapp-compose/ @smurawski @jldeen

		/src/change-analysis/ @linglingtong

		/src/fluid-relay/ @kairu-ms @necusjz @ZengTaoxu