Merge pull request #5 from Azure/main

Update 7/9

Author: BigCat20196

common/smoketest/requirements_async.txt

@@ -1 +1 @@
-aiohttp==3.5.4
+aiohttp==3.7.4

doc/dev/debug_guide.md

@@ -0,0 +1,23 @@
+# Debug
+
+This guide is to help Python SDK users to get the process about how SDK call REST api
+
+(1) Copy the following code in your .py file
+```
+import sys
+import logging
+
+logger = logging.getLogger('')
+logger.setLevel(logging.DEBUG)
+handler = logging.StreamHandler(stream=sys.stdout, )
+logger.addHandler(handler)
+formatter = logging.Formatter(
+    '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
+```
+
+![Position example](./debug_guide_position.png "Position example")
+
+(2) Run your .py program and you could find the log info in screen. It is convenient to get the process about how SDK call REST api:
+
+![example](./debug_guide_example.png "example")

doc/dev/debug_guide_example.png

@@ -27,7 +27,6 @@ pyOpenSSL==19.1.0
 json-delta==2.0
 ConfigArgParse==1.2.3
 six==1.14.0
-vcrpy==3.0.0
 pyyaml==5.3.1
 pytest==5.4.2; python_version >= '3.5'
 pytest==4.6.9; python_version == '2.7'

doc/dev/debug_guide_position.png

@@ -119,6 +119,26 @@ function MergeHashes([hashtable] $source, [psvariable] $dest) {
     }
 }
 
+function BuildBicepFile([System.IO.FileSystemInfo] $file) {
+    if (!(Get-Command bicep -ErrorAction Ignore)) {
+        Write-Error "A bicep file was found at '$($file.FullName)' but the Azure Bicep CLI is not installed. See https://aka.ms/install-bicep-pwsh"
+        throw
+    }
+
+    $tmp = $env:TEMP ? $env:TEMP : [System.IO.Path]::GetTempPath()
+    $templateFilePath = Join-Path $tmp "test-resources.$(New-Guid).compiled.json"
+
+    # Az can deploy bicep files natively, but by compiling here it becomes easier to parse the
+    # outputted json for mismatched parameter declarations.
+    bicep build $file.FullName --outfile $templateFilePath
+    if ($LASTEXITCODE) {
+        Write-Error "Failure building bicep file '$($file.FullName)'"
+        throw
+    }
+
+    return $templateFilePath
+}
+
 # Support actions to invoke on exit.
 $exitActions = @({
     if ($exitActions.Count -gt 1) {
@@ -140,15 +160,18 @@ try {
     # Enumerate test resources to deploy. Fail if none found.
     $repositoryRoot = "$PSScriptRoot/../../.." | Resolve-Path
     $root = [System.IO.Path]::Combine($repositoryRoot, "sdk", $ServiceDirectory) | Resolve-Path
-    $templateFileName = 'test-resources.json'
     $templateFiles = @()
 
-    Write-Verbose "Checking for '$templateFileName' files under '$root'"
-    Get-ChildItem -Path $root -Filter $templateFileName -Recurse | ForEach-Object {
-        $templateFile = $_.FullName
-
-        Write-Verbose "Found template '$templateFile'"
-        $templateFiles += $templateFile
+    'test-resources.json', 'test-resources.bicep' | ForEach-Object {
+        Write-Verbose "Checking for '$_' files under '$root'"
+        Get-ChildItem -Path $root -Filter "$_" -Recurse | ForEach-Object {
+            Write-Verbose "Found template '$($_.FullName)'"
+            if ($_.Extension -eq '.bicep') {
+                $templateFiles += (BuildBicepFile $_)
+            } else {
+                $templateFiles += $_.FullName
+            }
+        }
     }
 
     if (!$templateFiles) {
@@ -556,6 +579,11 @@ try {
             Log "Invoking post-deployment script '$postDeploymentScript'"
             &$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
         }
+
+        if ($templateFile.EndsWith('.compiled.json')) {
+            Write-Verbose "Removing compiled bicep file $templateFile"
+            Remove-Item $templateFile
+        }
     }
 
 } finally {

eng/ci_tools.txt

@@ -58,3 +58,5 @@ steps:
         -Force `
         -Verbose | Out-Null
     displayName: Deploy test resources
+    env:
+      TEMP: $(Agent.TempDirectory)

eng/common/TestResources/New-TestResources.ps1

@@ -27,10 +27,10 @@ parameters:
   default: []
 - name: Pool
   type: string
-  default: azsdk-pool-mms-ubuntu-1804-general
+  default: azsdk-pool-mms-ubuntu-2004-general
 - name: OsVmImage
   type: string
-  default: MMSUbuntu18.04
+  default: MMSUbuntu20.04
 # This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE.
 # When that occurs, provide a name other than the default value.
 - name: GenerateJobName

eng/common/TestResources/deploy-test-resources.yml

@@ -39,9 +39,15 @@ steps:
               Write-Host "Repository $($repository.Name) has already been initialized. Skipping this step."
             } else {
               Write-Host "Repository $($repository.Name) is being initialized."
+
+              Write-Host "git clone --no-checkout --filter=tree:0 git://github.com/$($repository.Name) ."
               git clone --no-checkout --filter=tree:0 git://github.com/$($repository.Name) .
+
+              Write-Host "git sparse-checkout init"
               git sparse-checkout init
-              git sparse-checkout set eng
+
+              Write-Host "git sparse-checkout set '/*' '!/*/' '/eng'"
+              git sparse-checkout set '/*' '!/*/' '/eng'
             }
 
             $gitsparsecmd = "git sparse-checkout add $paths"

eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml

@@ -18,7 +18,6 @@ pyOpenSSL==19.1.0
 json-delta==2.0
 ConfigArgParse==1.2.3
 six==1.14.0
-vcrpy==3.0.0
 pyyaml==5.3.1
 packaging==20.4
 wheel==0.34.2