Merge branch 'main' into jizen/create_machine_clipreview

Author: FumingZhang

linter_exclusions.yml

@@ -3402,3 +3402,43 @@ eventgrid namespace topic update:
     event_retention_in_days:
       rule_exclusions:
       - option_length_too_long
+
+neon postgres endpoint create:
+  rule_exclusions:
+  - missing_command_example
+
+neon postgres neon-role create:
+  rule_exclusions:
+  - missing_command_example
+
+neon postgres neon-database create:
+  rule_exclusions:
+  - missing_command_example
+
+neon postgres get-postgres-version:
+  rule_exclusions:
+  - missing_command_example
+
+neon postgres branch:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+
+neon postgres endpoint:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+
+neon postgres neon-database:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+
+neon postgres neon-role:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+
+neon postgres organization:
+  rule_exclusions:
+  - require_wait_command_if_no_wait
+
+neon postgres project:
+  rule_exclusions:
+  - require_wait_command_if_no_wait

src/aks-preview/HISTORY.rst

@@ -11,10 +11,11 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+* Add machine command `az aks machine add` to add a machine to an existing machine pool.
 
 18.0.0b36
 +++++++
-* Add machine command `az aks machine add` to add a machine to an existing machine pool.
+* Add option `AzureLinux3` to `--os-sku` for `az aks nodepool add` and `az aks nodepool update`.
 
 18.0.0b35
 +++++++

src/aks-preview/azext_aks_preview/_consts.py

@@ -38,6 +38,7 @@
 CONST_OS_SKU_WINDOWS2022 = "Windows2022"
 CONST_OS_SKU_WINDOWSANNUAL = "WindowsAnnual"
 CONST_OS_SKU_AZURELINUX = "AzureLinux"
+CONST_OS_SKU_AZURELINUX3 = "AzureLinux3"
 CONST_OS_SKU_UBUNTU2204 = "Ubuntu2204"
 CONST_OS_SKU_UBUNTU2404 = "Ubuntu2404"
 

src/aks-preview/azext_aks_preview/_help.py

@@ -1922,7 +1922,7 @@
           short-summary: The OS Type. Linux or Windows. Windows not supported yet for "VirtualMachines" VM set type.
         - name: --os-sku
           type: string
-          short-summary: The os-sku of the agent node pool. Ubuntu, CBLMariner, Ubuntu2204 or Ubuntu2404 when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022 or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
+          short-summary: The os-sku of the agent node pool. Ubuntu, Ubuntu2204, Ubuntu2404, CBLMariner, AzureLinux or AzureLinux3 when os-type is Linux, default is Ubuntu if not set; Windows2019, Windows2022 or WindowsAnnual when os-type is Windows, the current default is Windows2022 if not set.
         - name: --enable-fips-image
           type: bool
           short-summary: Use FIPS-enabled OS on agent nodes.

src/aks-preview/azext_aks_preview/_params.py

@@ -92,6 +92,7 @@
     CONST_OS_DISK_TYPE_EPHEMERAL,
     CONST_OS_DISK_TYPE_MANAGED,
     CONST_OS_SKU_AZURELINUX,
+    CONST_OS_SKU_AZURELINUX3,
     CONST_OS_SKU_CBLMARINER,
     CONST_OS_SKU_MARINER,
     CONST_OS_SKU_UBUNTU,
@@ -270,6 +271,7 @@
 ]
 node_os_skus_create = [
     CONST_OS_SKU_AZURELINUX,
+    CONST_OS_SKU_AZURELINUX3,
     CONST_OS_SKU_UBUNTU,
     CONST_OS_SKU_CBLMARINER,
     CONST_OS_SKU_MARINER,
@@ -283,6 +285,7 @@
 ]
 node_os_skus_update = [
     CONST_OS_SKU_AZURELINUX,
+    CONST_OS_SKU_AZURELINUX3,
     CONST_OS_SKU_UBUNTU,
     CONST_OS_SKU_UBUNTU2204,
     CONST_OS_SKU_UBUNTU2404,

src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_nodepool_add_with_ossku_azurelinux3.yaml

@@ -2924,6 +2924,42 @@ def test_aks_nodepool_add_with_ossku_ubuntu2204(self, resource_group, resource_g
         self.cmd(
             'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()])
 
+    @AllowLargeResponse()
+    @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='eastus2euap')
+    def test_aks_nodepool_add_with_ossku_azurelinux3(self, resource_group, resource_group_location):
+        aks_name = self.create_random_name('cliakstest', 16)
+        node_pool_name = self.create_random_name('c', 6)
+        node_pool_name_second = self.create_random_name('c', 6)
+        self.kwargs.update({
+            'resource_group': resource_group,
+            'name': aks_name,
+            'node_pool_name': node_pool_name,
+            'node_pool_name_second': node_pool_name_second,
+            'ssh_key_value': self.generate_ssh_keys()
+        })
+
+        create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \
+                     '--nodepool-name {node_pool_name} -c 1 ' \
+                     '--ssh-key-value={ssh_key_value}'
+        self.cmd(create_cmd, checks=[
+            self.check('provisioningState', 'Succeeded'),
+        ])
+
+        # nodepool get-upgrades
+        self.cmd('aks nodepool add '
+                 '--resource-group={resource_group} '
+                 '--cluster-name={name} '
+                 '--name={node_pool_name_second} '
+                 '--os-sku AzureLinux3',
+                 checks=[
+                    self.check('provisioningState', 'Succeeded'),
+                    self.check('osSku', 'AzureLinux3'),
+                 ])
+
+        # delete
+        self.cmd(
+            'aks delete -g {resource_group} -n {name} --yes --no-wait', checks=[self.is_empty()])
+
     @AllowLargeResponse()
     @AKSCustomResourceGroupPreparer(
         random_name_length=17, name_prefix="clitest", location="westus2"

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

@@ -3,6 +3,13 @@
 Release History
 ===============
 
+1.2.7
+++++++
+* bugfix making it so that oras discover function doesn't error when no fragments are found in the remote repository
+* splitting out documentation into command-specific files and adding info about --input flag
+* adding standalone fragment support
+* bugfix for oras pulling fragments when offline
+
 1.2.6
 ++++++
 * bugfix making it so the fields in the --input format are case-insensitive

src/confcom/HISTORY.rst

@@ -866,6 +866,18 @@ Using the same command, the default mounts and environment variables used by VN2
 az confcom acifragmentgen --input ./fragment_config.json --svn 1 --namespace contoso
 ```
 
+Example 6: Create an import statement from a signed fragment in a remote repo:
+
+```bash
+az confcom acifragmentgen --generate-import --fragment-path contoso.azurecr.io/<my-fragment>:v1 --minimum-svn 1
+```
+
+This is assuming there is a standalone fragment present at the specified location of `contoso.azurecr.io/<my-fragment>:v1`. Fragment imports can also be created using local paths to signed fragment files such as:
+
+```bash
+az confcom acifragmentgen --generate-import --fragment-path ./contoso.rego.cose --minimum-svn 1
+```
+
 ## Microsoft Azure CLI 'confcom katapolicygen' Extension Examples
 
 Run `az confcom katapolicygen --help` to see a list of supported arguments along with explanations. The following commands demonstrate the usage of different arguments to generate confidential computing security policies.

src/confcom/azext_confcom/README.md

@@ -165,7 +165,7 @@
 
         - name: --fragment-path -p
           type: string
-          short-summary: 'Path to an existing policy fragment file to be used with --generate-import. This option allows you to create import statements for the specified fragment without needing to pull it from an OCI registry'
+          short-summary: 'Path to an existing signed policy fragment file to be used with --generate-import. This option allows you to create import statements for the specified fragment without needing to explicitly pull it from an OCI registry. This can either be a local path or an OCI registry reference. For local fragments, the file will remain in the same location. For remote fragments, the file will be downloaded and cleaned up after processing'
 
         - name: --omit-id
           type: boolean