Merge pull request Azure#24 from Azure/master

Synced with official repo
zmssp · Nov 10, 2020 · ef688c3 · ef688c3
2 parents fb5771c + 145619a
commit ef688c3
Show file tree

Hide file tree

Showing 837 changed files with 190,609 additions and 44,346 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,8 +1,8 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-/linter_exclusions.yml @MyronFanQiu @haroldrandom @fengzhou-msft
+/linter_exclusions.yml @kairu-ms @haroldrandom @fengzhou-msft
 
-/src/index.json @haroldrandom @fengzhou-msft @arrownj @bim @qwordy @houk-ms @MyronFanQiu @jsntcy @Juliehzl @jiasli @zhoxing-ms @evelyn-ys @msyyc
+/src/index.json @haroldrandom @fengzhou-msft @arrownj @bim @qwordy @houk-ms @kairu-ms @jsntcy @Juliehzl @jiasli @zhoxing-ms @evelyn-ys @msyyc
 
 /src/footprint/ @jonunezd @Diego-Perez-Botero
 
@@ -30,7 +30,7 @@
 
 /src/dms-preview/ @temandr
 
-/src/express-route-cross-connection/ @MyronFanQiu
+/src/express-route-cross-connection/ @kairu-ms @haroldrandom
 
 /src/application-insights/ @alexeldeib
 
@@ -42,13 +42,13 @@
 
 /src/resource-graph/ @demyanenko @amirhbk @chiragg4u
 
-/src/azure-firewall/ @MyronFanQiu
+/src/azure-firewall/ @kairu-ms @haroldrandom
 
-/src/virtual-network-tap/ @MyronFanQiu
+/src/virtual-network-tap/ @kairu-ms @haroldrandom
 
-/src/virtual-wan/ @MyronFanQiu
+/src/virtual-wan/ @kairu-ms @haroldrandom
 
-/src/express-route/ @MyronFanQiu
+/src/express-route/ @kairu-ms @haroldrandom
 
 /src/front-door/ @pichandwork
 
@@ -64,11 +64,11 @@
 
 /src/hack/ @geektrainer
 
-/src/internet-analyzer/ @MyronFanQiu @jsntcy
+/src/internet-analyzer/ @jsntcy
 
 /src/spring-cloud/ @peizhou298
 
-/src/peering/ @MyronFanQiu @jsntcy
+/src/peering/ @jsntcy
 
 /src/connectedmachine/ @farehar
 
@@ -110,6 +110,8 @@
 
 /src/databox/ @jsntcy
 
+/src/datadog/ @limingu
+
 /src/hpc-cache/ @zhoxing-ms
 
 /src/timeseriesinsights/ @jiasli
@@ -136,7 +138,7 @@
 
 /src/datafactory/ @qiaozha
 
-/src/blockchain/ @MyronFanQiu @jsntcy
+/src/blockchain/ @jsntcy
 
 /src/codespaces/ @derekbekoe
 
@@ -150,7 +152,10 @@
 
 /src/maintenance/ @sotaneja
 
-/src/scheduled-query/ @MyronFanQiu @jsntcy
+/src/scheduled-query/ @jsntcy
 
-/src/stack-hci/ @zhoxing-ms
+/src/cli-translator/ @arrownj
 
+/src/vmware/ @fengzhou-msft @qwordy
+
+/src/stack-hci/ @zhoxing-ms
diff --git a/linter_exclusions.yml b/linter_exclusions.yml
@@ -179,18 +179,15 @@ blockchain member update:
       - option_length_too_long
 blueprint assignment create:
   parameters:
-    identity_user_assigned_identities:
+    user_assigned_identity:
       rule_exclusions:
       - option_length_too_long
     locks_excluded_principals:
       rule_exclusions:
       - option_length_too_long
 blueprint assignment update:
   parameters:
-    identity_type:
-      rule_exclusions:
-      - no_parameter_defaults_for_update_commands
-    identity_user_assigned_identities:
+    user_assigned_identity:
       rule_exclusions:
       - option_length_too_long
     locks_excluded_principals:
@@ -262,6 +259,48 @@ databricks workspace vnet-peering update:
     allow_virtual_network_access:
       rule_exclusions:
       - option_length_too_long
+datadog monitor create:
+  parameters:
+    datadog_organization_properties:
+      rule_exclusions:
+      - option_length_too_long
+    marketplace_subscription_status:
+      rule_exclusions:
+      - option_length_too_long
+datadog tag-rule create:
+  parameters:
+    log_rules_filtering_tags:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_aad_logs:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_resource_logs:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_subscription_logs:
+      rule_exclusions:
+      - option_length_too_long
+    metric_rules_filtering_tags:
+      rule_exclusions:
+      - option_length_too_long
+datadog tag-rule update:
+  parameters:
+    log_rules_filtering_tags:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_aad_logs:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_resource_logs:
+      rule_exclusions:
+      - option_length_too_long
+    log_rules_send_subscription_logs:
+      rule_exclusions:
+      - option_length_too_long
+    metric_rules_filtering_tags:
+      rule_exclusions:
+      - option_length_too_long
 datafactory factory configure-factory-repo:
   parameters:
     factory_git_hub_configuration:

diff --git a/scripts/ci/update_ext_cmd_tree.py b/scripts/ci/update_ext_cmd_tree.py
@@ -24,7 +24,7 @@
 def merge(data, key, value):
     if isinstance(value, str):
         if key in data:
-            raise Exception(f"Key: {key} already exists. 2 extensions cannot have the same command!")
+            raise Exception(f"Key: {key} already exists in {data[key]}. 2 extensions cannot have the same command!")
         data[key] = value
     else:
         data.setdefault(key, {})
@@ -49,7 +49,14 @@ def update_cmd_tree(ext_name):
     EXT_CMD_TREE_TO_UPLOAD = Session()
     EXT_CMD_TREE_TO_UPLOAD.load(os.path.expanduser(os.path.join('~', '.azure', file_name)))
     root = {}
-    for cmd_name, _ in extension_command_table.items():
+    for cmd_name, ext_cmd in extension_command_table.items():
+        try:
+            # do not include hidden deprecated command
+            if ext_cmd.deprecate_info.hide:
+                print(f"Skip hidden deprecated command: {cmd_name}")
+                continue
+        except AttributeError:
+            pass
         parts = cmd_name.split()
         parent = root
         for i, part in enumerate(parts):
@@ -88,4 +95,5 @@ def upload_cmd_tree():
 if __name__ == '__main__':
     for ext in sys.argv[1:]:
         update_cmd_tree(ext)
+        print()
     upload_cmd_tree()
diff --git a/src/account/HISTORY.rst b/src/account/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+0.2.1
++++++
+* az account alias create: add --reseller-id
+
 0.2.0
 +++++
 * Breaking Change: remove `az account subscription create`.

diff --git a/src/account/azext_account/generated/_params.py b/src/account/azext_account/generated/_params.py
@@ -49,6 +49,7 @@ def load_arguments(self, _):
                    'LegacyEA')
         c.argument('subscription_id', type=str, help='This parameter can be used to create alias for existing '
                    'subscription ID')
+        c.argument('reseller_id', type=str, help='Reseller ID, basically MPN Id')
 
     with self.argument_context('account alias delete') as c:
         c.argument('alias_name', options_list=['--name', '-n'], help='Alias Name')

diff --git a/src/account/azext_account/generated/custom.py b/src/account/azext_account/generated/custom.py
@@ -57,12 +57,14 @@ def account_alias_create(client,
                          billing_scope=None,
                          display_name=None,
                          subscription_id=None,
+                         reseller_id=None,
                          no_wait=False):
     properties = {
         'display_name': display_name,
         'workload': workload,
         'billing_scope': billing_scope,
-        'subscription_id': subscription_id
+        'subscription_id': subscription_id,
+        'reseller_id': reseller_id
     }
     return sdk_no_wait(no_wait,
                        client.begin_create,