resolving conflict

lil131 · Feb 10, 2023 · df3837e · df3837e
2 parents 1aefbb8 + 20a3f2e
commit df3837e
Show file tree

Hide file tree

Showing 219 changed files with 19,273 additions and 5,209 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -266,6 +266,10 @@
 
 /src/billing-benefits/ @gaoyp830 @rkapso @msft-adrianma @sornaks
 
+/src/serviceconnector-passwordless/ @xfz11
+
 /src/mobile-network/ @jsntcy
 
 /src/automanage/ @calvinhzy
+
+/src/voice-service/ @jsntcy
diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
@@ -12,6 +12,8 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
+* Mark AAD-legacy properties `--aad-client-app-id`, `--aad-server-app-id` and `--aad-server-app-secret` deprecated
+
 0.5.128
 +++++++
 * Fix option name `--duration` for command group `az aks maintenanceconfiguration`

diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py
@@ -109,13 +109,16 @@
           type: string
           short-summary: The ID of an Azure Active Directory client application of type "Native". This
                          application is for user login via kubectl.
+          long-summary: --aad-client-app-id is deprecated. See https://aka.ms/aks/aad-legacy for details.
         - name: --aad-server-app-id
           type: string
           short-summary: The ID of an Azure Active Directory server application of type "Web app/API". This
                          application represents the managed cluster's apiserver (Server application).
+          long-summary: --aad-server-app-id is deprecated. See https://aka.ms/aks/aad-legacy for details.
         - name: --aad-server-app-secret
           type: string
           short-summary: The secret of an Azure Active Directory server application.
+          long-summary: --aad-server-app-secret is deprecated. See https://aka.ms/aks/aad-legacy for details.
         - name: --aad-tenant-id
           type: string
           short-summary: The ID of an Azure Active Directory tenant.

diff --git a/src/aks-preview/azext_aks_preview/_params.py b/src/aks-preview/azext_aks_preview/_params.py
@@ -294,9 +294,9 @@ def load_arguments(self, _):
         c.argument('assign_kubelet_identity', validator=validate_assign_kubelet_identity)
         c.argument('enable_aad', action='store_true')
         c.argument('enable_azure_rbac', action='store_true')
-        c.argument('aad_client_app_id')
-        c.argument('aad_server_app_id')
-        c.argument('aad_server_app_secret')
+        c.argument('aad_client_app_id', deprecate_info=c.deprecate(target='--aad-client-app-id', hide=True))
+        c.argument('aad_server_app_id', deprecate_info=c.deprecate(target='--aad-server-app-id', hide=True))
+        c.argument('aad_server_app_secret', deprecate_info=c.deprecate(target='--aad-server-app-secret', hide=True))
         c.argument('aad_tenant_id')
         c.argument('aad_admin_group_object_ids')
         c.argument('enable_oidc_issuer', action='store_true')

diff --git a/...ks_preview/tests/latest/recordings/test_aks_create_and_update_with_http_proxy_config.yaml b/...ks_preview/tests/latest/recordings/test_aks_create_and_update_with_http_proxy_config.yaml
diff --git a/...preview/azext_aks_preview/tests/latest/recordings/test_aks_trustedaccess_rolebinding.yaml b/...preview/azext_aks_preview/tests/latest/recordings/test_aks_trustedaccess_rolebinding.yaml
diff --git a/src/amg/HISTORY.rst b/src/amg/HISTORY.rst
@@ -23,3 +23,11 @@ Release History
 ++++++
 * `az grafana service-account`: support service accounts
 
+1.0
+++++++
+* Command module GA
+
+1.1
+++++++
+* `az grafana update`: support email through new SMTP configuration arguments
+
diff --git a/src/amg/setup.py b/src/amg/setup.py
@@ -16,7 +16,7 @@
 
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '1.0.0'
+VERSION = '1.1.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/src/authV2/HISTORY.rst b/src/authV2/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+0.1.2
+++++++
+* Bug fix for '--unauthenticated-client-action' option in webapp auth, updated allowed values.
+
 0.1.0
 ++++++
 * Initial release.
diff --git a/src/authV2/azext_authV2/_params.py b/src/authV2/azext_authV2/_params.py
@@ -12,7 +12,7 @@
 from azure.cli.core.local_context import LocalContextAttribute, LocalContextAction
 from azure.cli.core.cloud import AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD
 
-UNAUTHENTICATED_CLIENT_ACTION = ['RedirectToLoginPage', 'AllowAnonymous', 'RejectWith401', 'RejectWith404']
+UNAUTHENTICATED_CLIENT_ACTION = ['RedirectToLoginPage', 'AllowAnonymous', 'Return401', 'Return404', 'Return403']
 FORWARD_PROXY_CONVENTION = ['NoProxy', 'Standard', 'Custom']
 CLOUD_NAMES = [AZURE_PUBLIC_CLOUD.name, AZURE_CHINA_CLOUD.name, AZURE_US_GOV_CLOUD.name, AZURE_GERMAN_CLOUD.name]
 

diff --git a/src/authV2/azext_authV2/tests/latest/recordings/test_authV2_auth.yaml b/src/authV2/azext_authV2/tests/latest/recordings/test_authV2_auth.yaml
diff --git a/src/authV2/azext_authV2/tests/latest/recordings/test_authV2_authclassic.yaml b/src/authV2/azext_authV2/tests/latest/recordings/test_authV2_authclassic.yaml
diff --git a/...hV2/azext_authV2/tests/latest/recordings/test_authV2_clientsecret_param_combinations.yaml b/...hV2/azext_authV2/tests/latest/recordings/test_authV2_clientsecret_param_combinations.yaml
diff --git a/src/authV2/setup.py b/src/authV2/setup.py
@@ -14,7 +14,7 @@
     from distutils import log as logger
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
-VERSION = '0.1.1'
+VERSION = '0.1.2'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/src/automanage/HISTORY.rst b/src/automanage/HISTORY.rst
@@ -2,6 +2,13 @@
 
 Release History
 ===============
+0.1.2
+++++++
+* Add exmaple for `az automanage configuration-profile create` of datetime array format
+
+0.1.1
+++++++
+* Fix doc for `az automanage configuration-profile create/update` and `az automanage configuration-profile version create/update`.
 
 0.1.0
 ++++++

diff --git a/src/automanage/README.md b/src/automanage/README.md
@@ -4,13 +4,13 @@ This is an extension to Azure CLI to manage Automanage resources.
 ## How to use ##
 # configuration-profile
 Create a configuration-profile  
-`az automanage configuration-profile create -n {profile_name} -g {rg} --configuration {"Antimalware/Enable":false,"Backup/Enable":false,"VMInsights/Enable":true,"AzureSecurityCenter/Enable":true,"UpdateManagement/Enable":true,"ChangeTrackingAndInventory/Enable":true,"GuestConfiguration/Enable":true,"LogAnalytics/Enable":true,"BootDiagnostics/Enable":true}`  
+`az automanage configuration-profile create -n {profile_name} -g {rg} --configuration '{"Antimalware/Enable":false,"Backup/Enable":false,"VMInsights/Enable":true,"AzureSecurityCenter/Enable":true,"UpdateManagement/Enable":true,"ChangeTrackingAndInventory/Enable":true,"GuestConfiguration/Enable":true,"LogAnalytics/Enable":true,"BootDiagnostics/Enable":true}'`  
 
 Show a configuration-profile  
 `az automanage configuration-profile show -n {profile_name} -g {rg}`
 
 Update a configuration-profile  
-`az automanage configuration-profile update -n {profile_name} -g {rg} --configuration {"Antimalware/Enable":true,"VMInsights/Enable":false}`
+`az automanage configuration-profile update -n {profile_name} -g {rg} --configuration '{"Antimalware/Enable":true,"VMInsights/Enable":false}'`
 
 List configuration-profiles  
 `az automanage configuration-profile list -g {rg}`

diff --git a/src/automanage/azext_automanage/aaz/latest/automanage/configuration_profile/_create.py b/src/automanage/azext_automanage/aaz/latest/automanage/configuration_profile/_create.py
@@ -18,7 +18,10 @@ class Create(AAZCommand):
     """Create a configuration profile
 
     :example: create configuration-profile
-        az automanage configuration-profile create -n {profile_name} -g {rg} --configuration {"Antimalware/Enable":false,"Backup/Enable":false,"VMInsights/Enable":true,"AzureSecurityCenter/Enable":true,"UpdateManagement/Enable":true,"ChangeTrackingAndInventory/Enable":true,"GuestConfiguration/Enable":true,"LogAnalytics/Enable":true,"BootDiagnostics/Enable":true}
+        az automanage configuration-profile create -n {profile_name} -g {rg} --configuration '{"Antimalware/Enable":false,"Backup/Enable":false,"VMInsights/Enable":true,"AzureSecurityCenter/Enable":true,"UpdateManagement/Enable":true,"ChangeTrackingAndInventory/Enable":true,"GuestConfiguration/Enable":true,"LogAnalytics/Enable":true,"BootDiagnostics/Enable":true}'
+
+    :example: create with datatime array
+        az automanage configuration-profile create -n {profile_name} -g {rg} --configuration '{"Backup/SchedulePolicy/ScheduleRunTimes":["2023-02-10T18:25:43.511Z", "2023-02-12T01:02:03.456Z"],"Backup/RetentionPolicy/DailySchedule/RetentionTimes":["2023-02-10T18:25:43.511Z", "2023-02-12T01:02:03.456Z"]}'
     """
 
     _aaz_info = {

diff --git a/src/automanage/azext_automanage/aaz/latest/automanage/configuration_profile/_update.py b/src/automanage/azext_automanage/aaz/latest/automanage/configuration_profile/_update.py
@@ -18,7 +18,7 @@ class Update(AAZCommand):
     """Update a configuration profile
 
     :example: update configuration-profile
-        az automanage configuration-profile update -n {profile_name} -g {rg} --configuration {"Antimalware/Enable":true,"VMInsights/Enable":false}
+        az automanage configuration-profile update -n {profile_name} -g {rg} --configuration '{"Antimalware/Enable":true,"VMInsights/Enable":false}'
     """
 
     _aaz_info = {

diff --git a/...utomanage/azext_automanage/aaz/latest/automanage/configuration_profile/version/_create.py b/...utomanage/azext_automanage/aaz/latest/automanage/configuration_profile/version/_create.py
@@ -18,7 +18,7 @@ class Create(AAZCommand):
     """Create a configuration profile version
 
     :example: create configuration-profile version
-        az automanage configuration-profile version create --profile-name {profile_name} -g {rg} -n {version_name} --configuration {"Antimalware/Enable":false}
+        az automanage configuration-profile version create --profile-name {profile_name} -g {rg} -n {version_name} --configuration '{"Antimalware/Enable":false}'
     """
 
     _aaz_info = {

diff --git a/...utomanage/azext_automanage/aaz/latest/automanage/configuration_profile/version/_update.py b/...utomanage/azext_automanage/aaz/latest/automanage/configuration_profile/version/_update.py
@@ -18,7 +18,7 @@ class Update(AAZCommand):
     """Update a configuration profile version
 
     :example: update configuration-profile version
-        az automanage configuration-profile version update --profile-name {profile_name} -g {rg} -n {version_name} --configuration {"Antimalware/Enable":true}
+        az automanage configuration-profile version update --profile-name {profile_name} -g {rg} -n {version_name} --configuration '{"Antimalware/Enable":true}'
     """
 
     _aaz_info = {
-Original file line number
+Diff line change
@@ Expand Up @@
     Pending
     +++++++
+    * Mark AAD-legacy properties `--aad-client-app-id`, `--aad-server-app-id` and `--aad-server-app-secret` deprecated
 .5.128
     +++++++
     * Fix option name `--duration` for command group `az aks maintenanceconfiguration`
@@ Expand Down @@