Merge branch 'Azure:main' into main

Author: idanielsteven

.github/CODEOWNERS

@@ -62,6 +62,8 @@
 
 /src/aks-preview/ @andyzhangx @andyliuliming @fumingzhang
 
+/src/aks-agent/ @nilo19 @mainerd
+
 /src/bastion/ @aavalang
 
 /src/vm-repair/ @haagha
@@ -333,3 +335,5 @@
 /src/amlfs/ @Aman-Jain-14 @amajai @mawhite @brpanask @tibanyas
 
 /src/storage-discovery/ @shanefujs @calvinhzy
+
+/src/aks-agent/ @feiskyer @mainred @nilo19

.github/workflows/TestTriggerExtensionRelease.yml

@@ -0,0 +1,95 @@
+name: Trigger ADO OneBranch Extension Release Pipeline
+
+# Run this workflow every time a commit gets pushed to main
+# This triggers the ADO OneBranch Extension Release Pipeline
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+    build:
+        name: Trigger Extension Release Pipeline
+        runs-on: ubuntu-latest
+        steps:
+        - name: Harden Runner
+          uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+          with:
+            egress-policy: audit
+        - name: Azure login
+          uses: azure/login@v2
+          with:
+            client-id: ${{ secrets.ADO_SP_ClientID }}
+            tenant-id: ${{ secrets.ADO_SP_TenantID }}
+            allow-no-subscriptions: true
+        - name: Trigger ADO Pipeline and Wait for Completion
+          uses: azure/cli@v2
+          env:
+            ado-org: ${{secrets.ADO_ORGANIZATION}}
+            ado-project: ${{secrets.ADO_PROJECT}}
+            ado-pipeline-id: 396380
+            commit-id: ${{ github.sha }}
+          with:
+            inlineScript: |
+              # Trigger the pipeline and capture the build ID
+              echo "Triggering ADO pipeline..."
+              BUILD_RESULT=$(az pipelines build queue \
+                --definition-id ${{ env.ado-pipeline-id }} \
+                --organization ${{ env.ado-org }} \
+                --project ${{ env.ado-project }} \
+                --variables commit_id=${{ env.commit-id }} \
+                --output json)
+              
+              BUILD_ID=$(echo $BUILD_RESULT | jq -r '.id')
+              echo "Pipeline triggered with Build ID: $BUILD_ID"
+              
+              if [ "$BUILD_ID" = "null" ] || [ -z "$BUILD_ID" ]; then
+                echo "Failed to get build ID from pipeline trigger"
+                exit 1
+              fi
+              
+              # Wait for the build to complete
+              echo "Waiting for build $BUILD_ID to complete..."
+              while true; do
+                BUILD_JSON=$(az pipelines build show \
+                  --id $BUILD_ID \
+                  --organization ${{ env.ado-org }} \
+                  --project ${{ env.ado-project }} \
+                  --output json)
+                
+                BUILD_STATUS=$(echo "$BUILD_JSON" | jq -r '.status')
+                BUILD_RESULT_STATUS=$(echo "$BUILD_JSON" | jq -r '.result // "none"')
+                
+                echo "Current status: $BUILD_STATUS, Result: $BUILD_RESULT_STATUS"
+                
+                # Check if build is completed
+                if [ "$BUILD_STATUS" = "completed" ]; then
+                  echo "Build completed with result: $BUILD_RESULT_STATUS"
+                  
+                  # Check if the build was successful
+                  if [ "$BUILD_RESULT_STATUS" = "succeeded" ]; then
+                    echo "✅ ADO pipeline build succeeded!"
+                    exit 0
+                  elif [ "$BUILD_RESULT_STATUS" = "partiallySucceeded" ]; then
+                    echo "⚠️ ADO pipeline build partially succeeded"
+                    exit 1
+                  else
+                    echo "❌ ADO pipeline build failed with result: $BUILD_RESULT_STATUS"
+                    exit 1
+                  fi
+                fi
+                
+                # Check for other terminal states
+                if [ "$BUILD_STATUS" = "cancelling" ] || [ "$BUILD_STATUS" = "cancelled" ]; then
+                  echo "❌ ADO pipeline build was cancelled"
+                  exit 1
+                fi
+                
+                # Wait 30 seconds before checking again
+                echo "Build still running... waiting 30 seconds"
+                sleep 30
+              done

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/aem/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.0.1
++++++
+* Remove DATA_COSMOS_TABLE and DATA_STORAGE references
+
 1.0.0
 +++++
 * Remove msrestazure dependency

src/aem/azext_aem/custom.py

@@ -463,7 +463,7 @@ def _verify_old(self, skip_storage_check, wait_time_in_minutes, aem_ext):
                 else:
                     logger.warning("\t\tStorage Metrics configuration check for '%s'...", storage_account_name)
                     storage_client = self._get_storage_client(storage_account_name, disk['key'])
-                    service_properties = storage_client.get_blob_service_properties()
+                    service_properties = storage_client.get_service_properties()
                     storage_cfg_ok = EnhancedMonitoring._check_storage_analytics(service_properties)
                     if storage_cfg_ok:
                         logger.warning('\t\tStorage Metrics configuration check: %s', succ_word)
@@ -731,44 +731,47 @@ def _get_disk_info(self):
         return disks_info
 
     def _get_blob_size(self, storage_account_name, container, blob, key):
-        storage_client = self._get_storage_client(storage_account_name, key)
+        blob_service_client = self._get_storage_client(storage_account_name, key)
+        blob_client = blob_service_client.get_blob_client(container, blob)
         # convert to GB
-        return int(storage_client.get_blob_properties(container, blob).properties.content_length / (1 << 30))
+        return int(blob_client.properties.size / (1 << 30))
 
     def _get_storage_client(self, storage_account_name, key):
-        BlockBlobService = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_STORAGE,
-                                   'blob.blockblobservice#BlockBlobService')
+        BlobServiceClient = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_STORAGE_BLOB,
+                                    '_blob_service_client#BlobServiceClient')
         return get_data_service_client(
             self._cmd.cli_ctx,
-            BlockBlobService,
+            BlobServiceClient,
             storage_account_name,
             key,
             endpoint_suffix=self._cmd.cli_ctx.cloud.suffixes.storage_endpoint)  # pylint: disable=no-member
 
     def _enable_storage_analytics(self, storage_account_name, key):
         storage_client = self._get_storage_client(storage_account_name, key)
-        service_properties = storage_client.get_blob_service_properties()
+        service_properties = storage_client.get_service_properties()
         if not EnhancedMonitoring._check_storage_analytics(service_properties):
-            t_logging, t_retention_policy, t_metrics = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_STORAGE, 'Logging',
-                                                               'RetentionPolicy', 'Metrics', mod='common.models')
+            t_logging, t_retention_policy, t_metrics = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_STORAGE_BLOB,
+                                                               'BlobAnalyticsLogging', 'RetentionPolicy', 'Metrics',
+                                                               mod='_models')
             retention_policy = t_retention_policy(enabled=True, days=13)
             logging = t_logging(delete=True, read=True, write=True, retention_policy=retention_policy)
             minute_metrics = t_metrics(enabled=True, include_apis=True, retention_policy=retention_policy)
             if getattr(service_properties, 'hour_metrics', None):
                 service_properties.hour_metrics.retention_policy.days = 13
-            storage_client.set_blob_service_properties(logging, minute_metrics=minute_metrics,
-                                                       hour_metrics=service_properties.hour_metrics)
+            storage_client.set_service_properties(analytics_logging=logging, minute_metrics=minute_metrics,
+                                                  hour_metrics=service_properties.hour_metrics)
 
     @staticmethod
     def _check_storage_analytics(service_properties):
-        return (service_properties and service_properties.logging and
+        return (service_properties and service_properties.analytics_logging and
                 service_properties.minute_metrics and service_properties.minute_metrics.include_apis and
                 service_properties.minute_metrics.retention_policy.days)
 
     def _check_table_and_content(self, storage_account_name, key, table_name,
                                  filter_string, timeout_in_minutes):
         sleep_period = 15
-        TableService = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_COSMOS_TABLE, 'table#TableService')
+        TableService = get_sdk(self._cmd.cli_ctx, ResourceType.DATA_STORAGE_TABLE,
+                               '_table_service_client#TableServiceClient')
         table_client = get_data_service_client(
             self._cmd.cli_ctx,
             TableService,