Merge pull request #25 from khushishah513/function-cli

merging with main and version update

Author: khushishah513

.github/policies/resourceManagement.yml

@@ -657,6 +657,17 @@ configuration:
             - us6193
             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: Blob Storage SFTP
+        then:
+        - mentionUsers:
+            mentionees:
+            - greeshma-microsoft
+            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
@@ -1454,7 +1465,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - rgreenMSFT
+            - amarjeetkr
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1567,6 +1578,21 @@ configuration:
             - nberdy
             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: Device Registry
+        then:
+        - mentionUsers:
+            mentionees:
+            - c-ryan-k
+            - digimaun
+            - rohankhandelwal
+            - mryanlo
+            - atastrophic
+            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
@@ -1588,7 +1614,6 @@ configuration:
         - mentionUsers:
             mentionees:
             - anishtrakru
-            - derekbekoe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1599,7 +1624,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - sourabhguha
+            - YingXue
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1649,6 +1674,17 @@ configuration:
             - Saglodha
             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: Fabric
+        then:
+        - mentionUsers:
+            mentionees:
+            - xinzhizou
+            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
@@ -1668,9 +1704,9 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - AnatoliB
-            - Francisco-Gamino
-            - shreyabatra4
+            - kamperiadis
+            - amamounelsayed
+            - khkh-ms
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1765,20 +1801,8 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - iluican
-            - jlian
-            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: IotDPS
-        then:
-        - mentionUsers:
-            mentionees:
-            - iluican
-            - jlian
+            - digimaun
+            - Azure/azure-iot-cli-triage
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2734,8 +2758,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - shariq-mcs
-            - MSFTeegarden
+            - abhijitch_microsoft
+            - yuvalm_microsoft
+            - nikitagarg_microsoft
+            - sanar_microsoft
+            - cawa_microsoft
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2848,10 +2875,10 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - bleroy
-            - tjacobhi
-            - markheff
-            - miwelsh
+            - kuanlu95
+            - efrainretana
+            - mattgotteiner
+            - Draconicida
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2874,6 +2901,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - nazang
+            - mooshc
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3084,6 +3112,20 @@ configuration:
             - 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
+        - hasLabel:
+            label: StorageDiscovery
+        then:
+        - mentionUsers:
+            mentionees:
+            - shanefujs
+            - apurv2304
+            - skallurk
+            - vdziunms
+            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

azure-pipelines.yml

@@ -90,8 +90,6 @@ jobs:
     name: ${{ variables.ubuntu_pool }}
   strategy:
     matrix:
-      Python39:
-        python.version: '3.9'
       Python310:
         python.version: '3.10'
       Python311:

linter_exclusions.yml

@@ -1207,6 +1207,14 @@ import-export update:
     backup_drive_manifest:
       rule_exclusions:
       - option_length_too_long
+iot adr ns policy update:
+  parameters:
+    certificate_key_type:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
+    certificate_validity_days:
+      rule_exclusions:
+      - no_parameter_defaults_for_update_commands
 iot central enrollment-group update:
   parameters:
     api_version:
@@ -1315,21 +1323,52 @@ iot central user update:
 iot du update:
   rule_exclusions:
     - require_wait_command_if_no_wait
+iot dps enrollment list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot dps enrollment update:
   parameters:
     auth_type_dataplane:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot dps enrollment-group list:
+  rule_exclusions:
+  - no_ids_for_list_commands
+iot dps enrollment-group registration list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot dps enrollment-group update:
   parameters:
     auth_type_dataplane:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot dps linked-hub create:
+  parameters:
+    apply_allocation_policy:
+      rule_exclusions:
+      - option_length_too_long
+    hub_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot dps linked-hub update:
+  parameters:
+    apply_allocation_policy:
+      rule_exclusions:
+      - option_length_too_long
+iot dps registration list:
+  rule_exclusions:
+  - no_ids_for_list_commands
+iot hub certificate list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot hub configuration update:
   parameters:
     auth_type_dataplane:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot hub consumer-group list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot hub device-identity update:
   parameters:
     auth_type_dataplane:
@@ -1370,6 +1409,9 @@ iot hub message-endpoint create storage-container:
     endpoint_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
+iot hub message-endpoint list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot hub message-endpoint update cosmosdb-container:
   parameters:
     endpoint_resource_group:
@@ -1395,6 +1437,12 @@ iot hub message-endpoint update storage-container:
     endpoint_resource_group:
       rule_exclusions:
       - parameter_should_not_end_in_resource_group
+iot hub message-enrichment list:
+  rule_exclusions:
+  - no_ids_for_list_commands
+iot hub message-route list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot hub module-identity update:
   parameters:
     auth_type_dataplane:
@@ -1405,6 +1453,20 @@ iot hub module-twin update:
     auth_type_dataplane:
       rule_exclusions:
       - no_parameter_defaults_for_update_commands
+iot hub policy list:
+  rule_exclusions:
+  - no_ids_for_list_commands
+iot hub route list:
+  rule_exclusions:
+  - no_ids_for_list_commands
+iot hub routing-endpoint create:
+  parameters:
+    endpoint_resource_group:
+      rule_exclusions:
+      - parameter_should_not_end_in_resource_group
+iot hub routing-endpoint list:
+  rule_exclusions:
+  - no_ids_for_list_commands
 iot hub state migrate:
   parameters:
     orig_resource_group_name:

src/aks-preview/HISTORY.rst

@@ -12,11 +12,14 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
+19.0.0b16
++++++++
+* Update --enable-container-network-logs DCR to ContainerNetworkLogs instead of RetinaNetworkFlowLogs
+
 19.0.0b15
 +++++++
 * Fix `NoneType` error when performing operations on automatic clusters that have hosted system components enabled.
 
-
 19.0.0b14
 +++++++
 * `az aks safeguards`: Add support for Deployment Safeguards with Pod Security Standards (PSS). New `--pss-level` parameter allows setting PSS enforcement level to Privileged, Baseline, or Restricted. Commands now support both `-g/-n` and `--cluster` argument patterns.

src/aks-preview/azext_aks_preview/addonconfiguration.py

@@ -58,7 +58,7 @@
     "Microsoft-ContainerInventory",
     "Microsoft-ContainerNodeInventory",
     "Microsoft-Perf",
-    "Microsoft-RetinaNetworkFlowLogs",
+    "Microsoft-ContainerNetworkLogs",
 ]
 
 

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -18252,7 +18252,7 @@ def test_aks_create_acns_with_flow_logs(
         get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2022-06-01'
         self.cmd(get_cmd, checks=[
             self.check('properties.destinations.logAnalytics[0].workspaceResourceId', f'{workspace_resource_id}'),
-            self.check('properties.dataFlows[0].streams[-1]', 'Microsoft-RetinaNetworkFlowLogs'),
+            self.check('properties.dataFlows[0].streams[-1]', 'Microsoft-ContainerNetworkLogs'),
         ])
 
         disable_cmd = "aks update --resource-group={resource_group} --name={name} --disable-container-network-logs -o json"

src/aks-preview/setup.py

@@ -9,7 +9,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "19.0.0b15"
+VERSION = "19.0.0b16"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",

src/confcom/.gitignore

@@ -36,3 +36,5 @@ azext_confcom/bin/*
 **/.coverage
 
 **/htmlcov
+
+!lib/

src/confcom/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+1.4.0
+++++++
+* Add --with-containers flag to acipolicygen and acifragmentgen to allow passing container policy definitions directly
+
 1.3.1
 ++++++
 * bugfix for --exclude-default-fragments flag not working as intended

src/confcom/azext_confcom/_params.py

@@ -4,6 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
+import json
 from knack.arguments import CLIArgumentType
 from azext_confcom._validators import (
     validate_params_file,
@@ -198,6 +199,14 @@ def load_arguments(self, _):
             required=False,
             help="Exclude default fragments in the generated policy",
         )
+        c.argument(
+            "container_definitions",
+            options_list=['--with-containers'],
+            action='append',
+            type=json.loads,
+            required=False,
+            help='Container definitions to include in the policy'
+        )
 
     with self.argument_context("confcom acifragmentgen") as c:
         c.argument(
@@ -345,6 +354,14 @@ def load_arguments(self, _):
             help="Path to JSON file to write fragment import information. This is used with --generate-import. If not specified, the import statement will print to the console",
             validator=validate_fragment_json,
         )
+        c.argument(
+            "container_definitions",
+            options_list=['--with-containers'],
+            action='append',
+            required=False,
+            type=json.loads,
+            help='Container definitions to include in the policy'
+        )
 
     with self.argument_context("confcom katapolicygen") as c:
         c.argument(