merge changes from upstream

.azure-pipelines/sync-alias.yml

@@ -14,10 +14,14 @@ resources:
     type: git
     name: internal.wiki
 
+variables:
+- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
+
 jobs:
 - job: UpdateYaml
   displayName: Update resourceManagement.yml
-  pool: pool-windows-2019
+  pool: 
+    name: ${{ variables.windows_pool }}
   uses:
     repositories:
     - ServiceContactList

.azure-pipelines/templates/variables.yml

@@ -1,4 +1,4 @@
 variables:
-  ubuntu_pool: 'pool-ubuntu-2004'
+  ubuntu_pool: 'pool-ubuntu-2204'
   windows_pool: 'pool-windows-2019'
-  ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
+  ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'

azure-pipelines.yml

@@ -12,11 +12,14 @@ pr:
     include:
       - '*'
 
+variables:
+- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
+
 jobs:
 - job: CredScan
   displayName: "Credential Scan"
   pool:
-    name: 'pool-windows-2019'
+    name: ${{ variables.windows_pool }}
   steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
     displayName: 'Run Credential Scanner'
@@ -34,7 +37,7 @@ jobs:
 - job: PolicyCheck
   displayName: "Policy Check"
   pool:
-    name: 'pool-windows-2019'
+    name: ${{ variables.windows_pool }}
   steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
     displayName: 'Run Policy Check'
@@ -51,7 +54,7 @@ jobs:
 - job: CheckLicenseHeader
   displayName: "Check License"
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.12'
@@ -67,7 +70,7 @@ jobs:
 - job: IndexVerify
   displayName: "Verify Extensions Index"
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.12'
@@ -84,7 +87,7 @@ jobs:
 - job: SourceTests
   displayName: "Integration Tests, Build Tests"
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   strategy:
     matrix:
       Python39:
@@ -119,7 +122,7 @@ jobs:
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
   continueOnError: true
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.12'
@@ -143,7 +146,7 @@ jobs:
   displayName: "azdev linter on Modified Extensions"
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.12'
@@ -168,7 +171,7 @@ jobs:
   displayName: "azdev scan ( High Confidence ) on Modified Extensions"
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.11'
@@ -199,7 +202,7 @@ jobs:
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
   continueOnError: true
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python 3.11'
@@ -228,7 +231,7 @@ jobs:
 #  displayName: "Verify Ref Docs"
 #  continueOnError: true
 #  pool:
-#    name: 'pool-ubuntu-2004'
+#    name: ${{ variables.ubuntu_pool }}
 #  steps:
 #  - task: UsePythonVersion@0
 #    displayName: 'Use Python 3.12'
@@ -245,7 +248,7 @@ jobs:
 - job: CheckInit
   displayName: "Check Init Files"
   pool:
-    name: 'pool-ubuntu-2004'
+    name: ${{ variables.ubuntu_pool }}
   steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.x'

scripts/ci/find_extension_upgraded.py

@@ -0,0 +1,141 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+import os
+import sys
+import json
+from subprocess import check_output
+from pkg_resources import parse_version
+
+def separator_line():
+    print('-' * 100)
+
+class AzdevExtensionHelper:
+    def __init__(self, extension_name):
+        self.name = extension_name
+
+    def _get_metadata_flags(self, setup_py_dir):
+        for root, _, files in os.walk(setup_py_dir):
+            if 'azext_metadata.json' in files:
+                metadata_path = os.path.join(root, 'azext_metadata.json')
+                with open(metadata_path, 'r') as f:
+                    metadata = json.load(f)
+                    is_experimental = metadata.get('azext.isExperimental', False)
+                    is_preview = metadata.get('azext.isPreview', False)
+                return is_experimental, is_preview
+        return False, False
+
+    def _adjust_version_for_preview(self, version, setup_py_dir):
+        is_experimental, is_preview = self._get_metadata_flags(setup_py_dir)
+        if is_experimental or is_preview:
+            version_parts = version.split('.')
+            if all(part.isdigit() for part in version_parts):
+                version = f"{version}b1"
+        return version
+
+    def is_version_upgrade(self):
+        with open('src/index.json') as fd:
+            current_extensions = json.loads(fd.read()).get("extensions")
+
+        setup_py = f'src/{self.name}/setup.py'
+        if not os.path.isfile(setup_py):
+            print('no setup.py')
+            return False
+
+        setup_py_dir = os.path.dirname(setup_py)
+        cmd = f'{sys.executable} setup.py --name'
+        self.name = check_output(cmd, shell=True, cwd=setup_py_dir).decode('utf-8').strip()
+        self.name = self.name.replace('_', '-')
+
+        metadata = current_extensions.get(self.name, None)
+        if metadata is None:    # for new added extension
+            return True
+
+        current_max_entry = max(metadata, key=lambda e: parse_version(e['metadata']['version']))
+        current_max_version = current_max_entry['metadata']['version']
+        current_max_version = self._adjust_version_for_preview(current_max_version, setup_py_dir)
+        print(f'current max version is {current_max_version}')
+
+        cmd = f'{sys.executable} setup.py --version'
+        modified_version = check_output(cmd, shell=True, cwd=setup_py_dir).decode('utf-8').strip()
+        print(f'modified version is {modified_version}')
+
+        if parse_version(current_max_version) > parse_version(modified_version):
+            err = f'version downgrade is not allowed in extension {setup_py}. [{current_max_version} -> {modified_version}]'
+            raise Exception(err)
+
+        if parse_version(current_max_version) == parse_version(modified_version):
+            return False
+
+        return True
+
+def find_modified_files_against_master_branch():
+    """
+    Deleted files don't count in diff
+    """
+    cmd = 'git --no-pager diff --diff-filter=ACMRT --name-only HEAD~1 -- src/'
+    files = check_output(cmd.split()).decode('utf-8').split('\n')
+    separator_line()
+    print('modified files:')
+    for f in files:
+        print(f)
+    separator_line()
+    return [f for f in files if len(f) > 0]
+
+def contain_extension_code(files):
+    with open('src/index.json', 'r') as fd:
+        current_extensions = json.loads(fd.read()).get("extensions")
+    current_extension_homes = set(f'src/{name}' for name in current_extensions)
+
+    for file in files:
+        if any([file.startswith(prefix) for prefix in current_extension_homes]):
+            return True
+
+    # for new added extensions or modules that src folder name does not match its wheel package name
+    for file in files:
+        if 'src/' in file and os.path.isfile(file) and os.path.isdir(os.path.dirname(file)):
+            new_extension_home = os.path.dirname(file)
+            new_extension_home = os.path.join(*new_extension_home.split('/')[:2])
+            if os.path.isfile(os.path.join(new_extension_home, 'setup.py')):
+                return True
+    return False
+
+def main():
+    modified_files = find_modified_files_against_master_branch()
+    if 'src/index.json' in modified_files:
+        modified_files.remove('src/index.json')
+
+    # check setup.py
+    for f in modified_files:
+        if f.endswith('setup.py'):
+            break
+    else:
+        separator_line()
+        print('no setup.py is modified, no need to publish')
+        separator_line()
+        return
+
+    # check source code
+    if not contain_extension_code(modified_files):
+        separator_line()
+        print('no extension source code is modified, no need to publish')
+        separator_line()
+        return
+
+    extension_names = set()
+    for f in modified_files:
+        src, name, *_ = f.split('/')
+        if os.path.isdir(os.path.join(src, name)):
+            extension_names.add(name)
+
+    for name in extension_names:
+        azdev_extension = AzdevExtensionHelper(name)
+        if azdev_extension.is_version_upgrade() is False:
+            print(f'extension [{name}] is not upgrade, no need to help publish')
+            continue
+        with open('./upgrade_extensions.txt', 'a') as fd:
+            fd.write(name + '\n')
+
+if __name__ == '__main__':
+    main()

src/ad/setup.py

@@ -11,10 +11,6 @@
 
 # HISTORY.rst entry.
 VERSION = '0.1.0'
-try:
-    from azext_ad.manual.version import VERSION
-except ImportError:
-    pass
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

src/alias/setup.py

@@ -9,11 +9,7 @@
 import re
 from setuptools import setup, find_packages
 
-# Inspired by https://github.com/Azure/azure-sdk-for-python/blob/master/azure-mgmt-cdn/setup.py#L45
-extension_path = os.path.dirname(os.path.realpath(__file__))
-with open(os.path.join(extension_path, 'azext_alias', 'version.py'), 'r') as version_file:
-    VERSION = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
-                        version_file.read(), re.MULTILINE).group(1)
+VERSION = '0.5.2'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',

src/application-insights/HISTORY.rst

@@ -2,6 +2,9 @@
 
 Release History
 ===============
+1.2.3
+++++++++++++++++++
+* `az monitor app-insights events/metrics/query`: Fix error: Profile.get_login_credentials() got an unexpected keyword argument 'resource'
 
 1.2.2
 ++++++++++++++++++

src/application-insights/azext_applicationinsights/_client_factory.py

@@ -3,18 +3,37 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
+class _Track1Credential:  # pylint: disable=too-few-public-methods
+
+    def __init__(self, credential, resource):
+        """Track 1 credential that can be fed into Track 1 SDK clients. Exposes signed_session protocol.
+        :param credential: Track 2 credential that exposes get_token protocol
+        :param resource: AAD resource
+        """
+        self._credential = credential
+        self._resource = resource
+
+    def signed_session(self, session=None):
+        import requests
+        from azure.cli.core.auth.util import resource_to_scopes
+        session = session or requests.Session()
+        token = self._credential.get_token(*resource_to_scopes(self._resource))
+        header = "{} {}".format('Bearer', token.token)
+        session.headers['Authorization'] = header
+        return session
+
 
 def applicationinsights_data_plane_client(cli_ctx, _, subscription=None):
     """Initialize Log Analytics data client for use with CLI."""
     from .vendored_sdks.applicationinsights import ApplicationInsightsDataClient
     from azure.cli.core._profile import Profile
     profile = Profile(cli_ctx=cli_ctx)
-    cred, _, _ = profile.get_login_credentials(
-        resource=cli_ctx.cloud.endpoints.app_insights_resource_id,
-        subscription_id=subscription
-    )
+    # Note: temporarily adapt track2 auth to track1 by the guidance:
+    # https://github.com/Azure/azure-cli/pull/29631#issuecomment-2716799520
+    # need to be removed after migrated by codegen
+    cred, _, _ = profile.get_login_credentials(subscription_id=subscription)
     return ApplicationInsightsDataClient(
-        cred,
+        _Track1Credential(cred, cli_ctx.cloud.endpoints.app_insights_resource_id),
         base_url=f'{cli_ctx.cloud.endpoints.app_insights_resource_id}/v1'
     )