merge Azure

eng/common/scripts/Prepare-Release.ps1

@@ -109,11 +109,15 @@ else
 $releaseDateString = $ParsedReleaseDate.ToString("MM/dd/yyyy")
 $month = $ParsedReleaseDate.ToString("MMMM")
 
-Write-Host
 Write-Host "Assuming release is in $month with release date $releaseDateString" -ForegroundColor Green
+if (Test-Path "Function:GetExistingPackageVersions")
+{
+    $releasedVersions = GetExistingPackageVersions -PackageName $packageProperties.Name -GroupId $packageProperties.Group
+    $latestReleasedVersion = $releasedVersions[$releasedVersions.Count - 1]
+    Write-Host "Latest released version: ${latestReleasedVersion}" -ForegroundColor Green
+}
 
 $currentProjectVersion = $packageProperties.Version
-
 $newVersion = Read-Host -Prompt "Input the new version, or press Enter to use use current project version '$currentProjectVersion'"
 
 if (!$newVersion)

eng/common/scripts/stress-testing/deploy-stress-tests.ps1

@@ -76,9 +76,9 @@ function DeployStressTests(
     [string]$environment = 'test',
     [string]$repository = 'images',
     [boolean]$pushImages = $false,
-    [string]$clusterGroup = 'rg-stress-test-cluster-',
+    [string]$clusterGroup = 'rg-stress-cluster-test',
     [string]$deployId = 'local',
-    [string]$subscription = 'Azure SDK Test Resources'
+    [string]$subscription = 'Azure SDK Developer Playground'
 ) {
     if ($PSCmdlet.ParameterSetName -eq 'DoLogin') {
         Login $subscription $clusterGroup $pushImages

scripts/auto_release/PythonSdkLiveTest.yml

@@ -55,6 +55,9 @@ jobs:
         export AZURE_CLIENT_ID=$(ENV_CLIENT_ID)
         export AZURE_CLIENT_SECRET=$(ENV_CLIENT_SECRET)
         export AZURE_SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID)
+        export ISSUE_LINK=$(ISSUE_LINK)
+        export UPDATE_TOKEN=$(UPDATE_TOKEN)
+        export USR_TOKEN=$(USR_TOKEN)
 
         # run
         cd azure-sdk-for-python
@@ -74,12 +77,9 @@ jobs:
         # create PR
         export NEW_BRANCH=`sed -n '1p' $output_path/output.txt`
         export TARGET_BRANCH=`sed -n '2p' $output_path/output.txt`
-        export ISSUE_LINK=$(ISSUE_LINK)
         export PIPELINE_LINK=$(PIPELINE_LINK)
         export USR_NAME=$(USR_NAME)
-        export USR_TOKEN=$(USR_TOKEN)
         export TEST_RESULT=$test_result
-        export UPDATE_TOKEN=$(UPDATE_TOKEN)
 
         python $script_path/create_auto_release_pr.py
         echo "\'[AutoRelease] $new_branch \' has been created!!!"

scripts/auto_release/create_auto_release_pr.py

@@ -15,6 +15,6 @@ def main():
     # Add issue link on PR
     api = GhApi(owner='Azure', repo='azure-sdk-for-python', token=os.getenv('UPDATE_TOKEN'))
     api.issues.create_comment(issue_number=pr_number, body='issue link:{}'.format(os.getenv('ISSUE_LINK')))
-
+    
 if __name__ == '__main__':
     main()

scripts/auto_release/main.py

@@ -4,6 +4,7 @@
 import time
 import argparse
 import logging
+from ghapi.all import GhApi
 
 
 SERVICE_NAME = 'servicename'
@@ -157,6 +158,12 @@ def edit_version(add_content):
     if TRACK == '1' and VERSION_LAST_RELEASE[0] == '0':
         num = VERSION_LAST_RELEASE.split('.')
         VERSION_NEW = f'{num[0]}.{int(num[1]) + 1}.0'
+    # '0.0.0' means there must be abnormal situation
+    if VERSION_NEW == '0.0.0':
+        api_request = GhApi(owner='Azure', repo='sdk-release-request', token=os.getenv('UPDATE_TOKEN'))
+        link = os.getenv('ISSUE_LINK')
+        issue_number = link.split('/')[-1]
+        api_request.issues.add_labels(issue_number=int(issue_number), labels=['base-branch-attention'])
 
 
 def edit_changelog(add_content):
@@ -459,4 +466,5 @@ def main():
         my_print(e)
     else:
         with open(f'{OUT_PATH}/output.txt', 'w') as file_out:
-            file_out.writelines([f'{NEW_BRANCH}\n', "main" if TRACK == '2' else 'release/v3'])
+            file_out.writelines([f'{NEW_BRANCH}\n', "main\n" if TRACK == '2' else 'release/v3\n'])
+

scripts/release_issue_status/main.py

@@ -17,7 +17,9 @@
 _NULL = ' '
 _FILE_OUT = 'release_issue_status.csv'
 _FILE_OUT_PYTHON = 'release_python_status.md'
-_PYTHON_SDK_ADMINISTRATORS = {'msyyc', 'RAY-316', 'BigCat20196'}
+_PYTHON_SDK_ADMINISTRATORS = ['msyyc', 'RAY-316', 'BigCat20196']
+_PYTHON_SDK_ASSIGNEES = ['RAY-316', 'BigCat20196']
+_ASSIGNER_DICT = {'RAY-316': os.getenv('ZED_TOKEN'), 'BigCat20196': os.getenv('JF_TOKEN')}
 logging.basicConfig(level=logging.INFO,
                     format='[auto-reply  log] - %(funcName)s[line:%(lineno)d] - %(levelname)s: %(message)s')
 
@@ -128,7 +130,7 @@ def _latest_comment_time(comments, delay_from_create_date):
     return delay_from_create_date if not q else int((time.time() - q[-1][0]) / 3600 / 24)
 
 
-def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines):
+def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes):
     logging.info("new issue number: {}".format(item.issue_object.number))
 
     if 'auto-link' not in item.labels:
@@ -156,8 +158,9 @@ def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python
     try:
         logging.info(python_piplines)
         pipeline_url = get_pipeline_url(python_piplines, output_folder)
+        assigner_repo = assigner_repoes[item.assignee]
         rg.begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link,
-                                sdk_repo=sdk_repo, pipeline_url=pipeline_url)
+                                sdk_repo=sdk_repo, pipeline_url=pipeline_url, assigner_repo=assigner_repo)
         if 'Configured' in item.labels:
             item.issue_object.remove_from_labels('Configured')
     except Exception as e:
@@ -170,8 +173,11 @@ def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python
 def main():
     # get latest issue status
     g = Github(os.getenv('TOKEN'))  # please fill user_token
+    assigner_repoes = {}
+    for k, v in _ASSIGNER_DICT.items():
+        assigner_repoes[k] = Github(v).get_repo('Azure/sdk-release-request')
     request_repo = g.get_repo('Azure/sdk-release-request')
-    rest_repo = g.get_repo('Azure/azure-rest-api-specs')   
+    rest_repo = g.get_repo('Azure/azure-rest-api-specs')
     sdk_repo = g.get_repo('Azure/azure-sdk-for-python')
     label1 = request_repo.get_label('ManagementPlane')
     open_issues = request_repo.get_issues(state='open', labels=[label1])
@@ -226,13 +232,13 @@ def main():
             item.bot_advice = 'new issue and better to confirm quickly.'
             if 'assigned' not in item.labels:
                 time.sleep(0.1)
-                assign_count = int(str(time.time())[-1]) % 2
-                if assign_count == 1:
-                    item.issue_object.remove_from_assignees(*['RAY-316'])
-                    item.issue_object.add_to_assignees(*['BigCat20196'])
+                assign_count = int(str(time.time())[-1]) % len(_PYTHON_SDK_ASSIGNEES)
+                item.issue_object.remove_from_assignees(item.assignee)
+                item.issue_object.add_to_assignees(_PYTHON_SDK_ASSIGNEES[assign_count])
+                item.assignee=item.issue_object.assignee.login
                 item.issue_object.add_to_labels('assigned')
             try:
-                auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines)
+                auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes)
             except Exception as e:
                 continue
         elif not item.author_latest_comment in _PYTHON_SDK_ADMINISTRATORS:

scripts/release_issue_status/release_issue_status.yml

@@ -39,6 +39,8 @@ jobs:
         export HEADERS=$(PIPELINE_HEADERS)
         export URL=$(PIPELINE_URL)
         export PIPELINE_TOKEN=$(PIPELINE-TOKEN)
+        export JF_TOKEN=$(Jiefeng-GitToken)
+        export ZED_TOKEN=$(Zed-GitToken)
         export COOKIE=$(USR_TOKEN)
 
         # create virtual env

scripts/release_issue_status/reply_generator.py

@@ -52,8 +52,10 @@ def get_latest_pr_from_readme(rest_repo, link_dict):
     return latest_pr_number_int[-1]
 
 
-def reply_owner(reply_content):
-    issue_object_rg.create_comment(reply_content)
+def reply_owner(assigner_issue, reply_content):
+    assigner_issue.create_comment(reply_content)
+    user_tips = 'Tips: If you have special needs for release date or other things, please let us know. Otherwise we will release it ASAP after your check.'
+    assigner_issue.create_comment(user_tips)
 
 
 
@@ -74,7 +76,7 @@ def get_reply_and_sdk_number_from_readme(rest_repo, link_dict):
     return info_model, sdk_link_number
 
 
-def begin_reply_generate(item, rest_repo, readme_link, sdk_repo, pipeline_url):
+def begin_reply_generate(item, rest_repo, readme_link, sdk_repo, pipeline_url, assigner_repo):
     global issue_object_rg
     issue_object_rg = item.issue_object
     link_dict = get_links(readme_link)
@@ -91,7 +93,8 @@ def begin_reply_generate(item, rest_repo, readme_link, sdk_repo, pipeline_url):
             logging.info(f'{issue_object_rg.number} run pipeline successfully')
         else:
             logging.info(f'{issue_object_rg.number} run pipeline fail')
-        reply_owner(reply_content)
+        assigner_issue = assigner_repo.get_issue(number=issue_object_rg.number)
+        reply_owner(assigner_issue, reply_content)
         issue_object_rg.add_to_labels('auto-ask-check')
     else:
         logging.info('issue {} need config readme'.format(issue_object_rg.number))

sdk/azurearcdata/azure-mgmt-azurearcdata/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History
 
+## 1.0.0 (2021-10-26)
+
+**Features**
+
+  - Model DataControllerProperties has a new parameter logs_dashboard_credential
+  - Model DataControllerProperties has a new parameter metrics_dashboard_credential
+
 ## 1.0.0b1 (2021-09-15)
 
 * Initial Release

sdk/azurearcdata/azure-mgmt-azurearcdata/_meta.json

@@ -4,7 +4,7 @@
     "@autorest/[email protected]",
     "@autorest/[email protected]"
   ],
-  "commit": "e23a590abc2f98437bafac9da5ccd608b2981a45",
+  "commit": "b28a542b3eb4f2f4f384b14b635d0a835df818cd",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest_command": "autorest specification/azurearcdata/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.4.5",
   "readme": "specification/azurearcdata/resource-manager/readme.md"

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/_configuration.py

@@ -48,7 +48,7 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-08-01"
+        self.api_version = "2021-11-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
         kwargs.setdefault('sdk_moniker', 'mgmt-azurearcdata/{}'.format(VERSION))
         self._configure(**kwargs)

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/_metadata.json

@@ -1,6 +1,6 @@
 {
-    "chosen_version": "2021-08-01",
-    "total_api_version_list": ["2021-08-01"],
+    "chosen_version": "2021-11-01",
+    "total_api_version_list": ["2021-11-01"],
     "client": {
         "name": "AzureArcDataManagementClient",
         "filename": "_azure_arc_data_management_client",

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0b1"
+VERSION = "1.0.0"

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/aio/_configuration.py

@@ -45,7 +45,7 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-08-01"
+        self.api_version = "2021-11-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
         kwargs.setdefault('sdk_moniker', 'mgmt-azurearcdata/{}'.format(VERSION))
         self._configure(**kwargs)

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/aio/operations/_data_controllers_operations.py

@@ -61,7 +61,7 @@ def list_in_subscription(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -133,7 +133,7 @@ def list_in_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -197,7 +197,7 @@ async def _put_data_controller_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -325,7 +325,7 @@ async def _delete_data_controller_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         # Construct URL
@@ -445,7 +445,7 @@ async def get_data_controller(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         # Construct URL
@@ -507,7 +507,7 @@ async def patch_data_controller(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/aio/operations/_operations.py

@@ -57,7 +57,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):

sdk/azurearcdata/azure-mgmt-azurearcdata/azure/mgmt/azurearcdata/aio/operations/_sql_managed_instances_operations.py

@@ -61,7 +61,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -133,7 +133,7 @@ def list_by_resource_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -207,7 +207,7 @@ async def get(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         # Construct URL
@@ -256,7 +256,7 @@ async def _create_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -384,7 +384,7 @@ async def _delete_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         accept = "application/json"
 
         # Construct URL
@@ -507,7 +507,7 @@ async def update(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2021-08-01"
+        api_version = "2021-11-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"