Merge branch 'Azure:main' into main

Author: bavneetsingh16

.github/CODEOWNERS

@@ -88,7 +88,7 @@
 
 /src/ip-group/ @necusjz @kairu-ms @jsntcy
 
-/src/connectedk8s/ @bavneetsingh16 @deeksha345 @anagg929
+/src/connectedk8s/ @bavneetsingh16 @deeksha345 @anagg929 @atchutbarli
 
 /src/storagesync/ @jsntcy
 
@@ -310,8 +310,6 @@
 
 /src/site-recovery/ @calvinhzy
 
-/src/hdinsightonaks/ @aim-for-better @yuc-Li
-
 /src/network-analytics/ @pikanghosh1
 
 /src/azurelargeinstance/ @8Gitbrix
@@ -331,3 +329,5 @@
 /src/vme/ @caoyihua
 
 /src/carbon/ @itiinani
+
+/src/amlfs/ @Aman-Jain-14 @amajai @mawhite @brpanask @tibanyas

.github/policies/resourceManagement.yml

@@ -252,7 +252,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - dyu1208
+            - mbifeld
             - FumingZhang
             - andyliuliming
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
@@ -614,13 +614,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mksuni
-            - bgklein
-            - mscurrell
             - dpwatrous
-            - gingi
-            - paterasMSFT
+            - wiboris
             - cRui861
+            - skapur12
+            - wanghoppe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1505,8 +1503,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - alec-baird
-            - costinhagiu
+            - MichaelWu
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1577,7 +1574,6 @@ configuration:
         - mentionUsers:
             mentionees:
             - sourabhguha
-            - inesk-vt
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1782,6 +1778,7 @@ configuration:
             - schaabs
             - chen-karen
             - chandanrr
+            - cheathamb36
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2293,6 +2290,17 @@ configuration:
             - rajsell
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Neon Postgre
+        then:
+        - mentionUsers:
+            mentionees:
+            - alluri02
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - hasLabel:
             label: Service Attention
@@ -2393,8 +2401,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - gopimsft
-            - gimotwanMSFT
-            - avripintoms
+            - Azure/azure-firewall
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2860,10 +2867,10 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mwesigwaguma
-            - a-Santamaria
+            - iliu816
+            - a-santamaria
             - LukeSlev
-            - jkochhar
+            - Jkochhar
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3001,6 +3008,20 @@ configuration:
             - xgithubtriage
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Storage Action
+        then:
+        - mentionUsers:
+            mentionees:
+            - blueww
+            - sshankMSFT
+            - golddove
+            - S-J-M
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - hasLabel:
             label: Service Attention

linter_exclusions.yml

@@ -1415,20 +1415,44 @@ iot edge deployment update:
       - no_parameter_defaults_for_update_commands
 iot ops asset create:
   parameters:
-    cluster_resource_group:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-    custom_location_resource_group:
+iot ops asset query:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops asset endpoint create custom:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops asset endpoint create onvif:
+  parameters:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-iot ops asset endpoint create:
+iot ops asset endpoint create opcua:
   parameters:
-    cluster_resource_group:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
-    custom_location_resource_group:
+iot ops asset endpoint query:
+  parameters:
+    instance_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot ops ns device create:
+  parameters:
+    instance_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
+iot ops broker persist update:
+  parameters:
+    broker_name:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
 k8sconfiguration create:
   parameters:
     helm_operator_version:

src/acrcssc/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.0.0b3
++++++++
+* Remove msrestazure dependency
+
 1.0.0b2
 ++++++
 * Bug fix: Updated to allow for az login when the account doesn't have any active subscriptions

src/acrcssc/azext_acrcssc/helper/_workflow_status.py

@@ -17,13 +17,13 @@
 )
 from azure.cli.core.commands import LongRunningOperation
 from azure.cli.core.commands.progress import IndeterminateProgressBar
+from azure.core.exceptions import HttpResponseError
 from azure.cli.core.profiles import ResourceType, get_sdk
 from azure.cli.core.azclierror import AzCLIError, ResourceNotFoundError
 from azure.core.polling import PollingMethod
 from azure.mgmt.core.tools import parse_resource_id
 from knack.log import get_logger
 from enum import Enum
-from msrestazure.azure_exceptions import CloudError
 
 
 logger = get_logger(__name__)
@@ -239,7 +239,7 @@ def process_taskrun(taskrun):
                 taskrun.task_log_result = tasklog
             except ResourceNotFoundError as e:
                 logger.debug("Failed to get logs for taskrun: %s with exception: %s", taskrun.run_id, e)
-            except CloudError as e:
+            except HttpResponseError as e:
                 logger.debug("An unexpected exception has occurred for taskrun: %s with exception: %s",
                              taskrun.run_id, e)
 
@@ -439,7 +439,7 @@ def generate_logs(cmd,
                 registry_name=registry_name,
                 run_id=run_id)
             log_file_sas = response.log_link
-        except (AttributeError, CloudError) as e:
+        except (AttributeError, HttpResponseError) as e:
             logger.debug("%s Exception: %s", error_msg, e)
             raise AzCLIError(error_msg)
         except ResourceNotFoundError as e:
@@ -476,7 +476,7 @@ def get_run_status_local(client, resource_group_name, registry_name, run_id):
         try:
             response = client.get(resource_group_name, registry_name, run_id)
             return response.status
-        except (AttributeError, CloudError):
+        except (AttributeError, HttpResponseError):
             return None
 
     @staticmethod

src/acrcssc/setup.py

@@ -13,7 +13,7 @@
     from distutils import log as logger
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
-VERSION = '1.0.0b2'
+VERSION = '1.0.0b3'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

src/aem/HISTORY.rst

@@ -2,6 +2,9 @@
 
 Release History
 ===============
+1.0.0
++++++
+* Remove msrestazure dependency
 
 0.3.0
 +++++

src/aem/azext_aem/custom.py

@@ -10,9 +10,9 @@
 from azure.cli.core.util import sdk_no_wait
 from azure.cli.core.profiles import ResourceType, get_sdk
 from azure.cli.core.commands.client_factory import get_mgmt_service_client, get_data_service_client
+from azure.core.exceptions import HttpResponseError
 from azure.mgmt.compute.models import ResourceIdentityType
-from msrestazure.tools import parse_resource_id
-from msrestazure.azure_exceptions import CloudError
+from azure.mgmt.core.tools import parse_resource_id
 
 from knack.util import CLIError
 from knack.log import get_logger
@@ -265,10 +265,10 @@ def _create_role_assignments_for_scopes(self, scopes):
 
                     self._roles_client.role_assignments.create(scope, assignment_name, params_role_assignment)
                     created = True
-                except CloudError as cex:
+                except HttpResponseError as cex:
                     logger.info("Error during role assignment %s", cex)
-                    if ((not cex.error) or (not cex.error.error) or
-                            (PRINCIPAL_NOT_FOUND_ERROR != cex.error.error.lower())):
+                    if ((not cex.error) or (not cex.error.code) or
+                            (PRINCIPAL_NOT_FOUND_ERROR != cex.error.code.lower())):
                         raise
 
                 if (not created) and ((datetime.now() - start_time).total_seconds() < MAX_WAIT_TIME_FOR_SP_SECONDS):