Merge pull request #1 from Azure/master

upDATE
bradleydamato · Oct 12, 2020 · 3f05de7 · 3f05de7
2 parents 5c56b81 + ff54d72
commit 3f05de7
Show file tree

Hide file tree

Showing 397 changed files with 43,637 additions and 6,169 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -25,6 +25,9 @@
 # PRLabel: %Storage
 /sdk/storage/                                                        @amishra-dev @zezha-msft @annatisch @rakshith91 @xiafu-msft @tasherif-msft @kasobol-msft
 
+# PRLabel: %App Configuration
+/sdk/appconfiguration/                                               @xiangyan99
+
 /sdk/applicationinsights/azure-applicationinsights/                  @divya-jay @geneh @alongafni
 /sdk/loganalytics/azure-loganalytics/                                @divya-jay @geneh @alongafni
 
@@ -33,7 +36,7 @@
 /sdk/cognitiveservices/azure-cognitiveservices-vision-customvision/  @areddish
 
 # PRLabel: %Communication
-/sdk/communication/                                                  @RezaJooyandeh @turalf
+/sdk/communication/                                                  @RezaJooyandeh @turalf @ankitarorabit @Azure/azure-sdk-communication-code-reviewers
 
 # PRLabel: %KeyVault
 /sdk/keyvault/                                                       @schaabs @chlowell @iscai-msft

diff --git a/doc/sphinx/package_service_mapping.json b/doc/sphinx/package_service_mapping.json
@@ -916,6 +916,11 @@
     "service_name": "Form Recognizer",
     "manually_generated": true
   },
+  "azure-ai-metricsadvisor": {
+    "category": "Client",
+    "service_name": "Metrics Advisor",
+    "manually_generated": true
+  },
   "azure-storage-blob": {
     "category": "Client",
     "service_name": "Storage",

diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -11,17 +11,17 @@
 [CmdletBinding(DefaultParameterSetName = 'Default', SupportsShouldProcess = $true, ConfirmImpact = 'Medium')]
 param (
     # Limit $BaseName to enough characters to be under limit plus prefixes, and https://docs.microsoft.com/azure/architecture/best-practices/resource-naming.
-    [Parameter(Mandatory = $true, Position = 0)]
+    [Parameter()]
     [ValidatePattern('^[-a-zA-Z0-9\.\(\)_]{0,80}(?<=[a-zA-Z0-9\(\)])$')]
     [string] $BaseName,
 
     [ValidatePattern('^[-\w\._\(\)]+$')]
     [string] $ResourceGroupName,
 
-    [Parameter(Mandatory = $true)]
+    [Parameter(Mandatory = $true, Position = 0)]
     [string] $ServiceDirectory,
 
-    [Parameter(Mandatory = $true)]
+    [Parameter()]
     [ValidatePattern('^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$')]
     [string] $TestApplicationId,
 
@@ -119,6 +119,8 @@ $root = [System.IO.Path]::Combine($repositoryRoot, "sdk", $ServiceDirectory) | R
 $templateFileName = 'test-resources.json'
 $templateFiles = @()
 $environmentVariables = @{}
+# Azure SDK Developer Playground
+$defaultSubscription = "faa080af-c1d8-40ad-9cce-e1a450ca5b57"
 
 Write-Verbose "Checking for '$templateFileName' files under '$root'"
 Get-ChildItem -Path $root -Filter $templateFileName -Recurse | ForEach-Object {
@@ -133,6 +135,26 @@ if (!$templateFiles) {
     exit
 }
 
+$UserName =  if ($env:USER) { $env:USER } else { "${env:USERNAME}" }
+
+# If no base name is specified use current user name
+if (!$BaseName) {
+    $BaseName = "$UserName$ServiceDirectory"
+
+    Log "BaseName was not set. Using default base name: '$BaseName'"
+}
+
+# Try detecting repos that support OutFile and defaulting to it
+if (!$CI -and !$PSBoundParameters.ContainsKey('OutFile') -and $IsWindows)
+{
+    # TODO: find a better way to detect the language
+    if (Test-Path "$repositoryRoot/eng/service.proj")
+    {
+        $OutFile = $true
+        Log "Detected .NET repository. Defaulting OutFile to true. Test environment settings would be stored into the file so you don't need to set environment variables manually."
+    }
+}
+
 # If no location is specified use safe default locations for the given
 # environment. If no matching environment is found $Location remains an empty
 # string.
@@ -147,7 +169,7 @@ if (!$Location) {
     Write-Verbose "Location was not set. Using default location for environment: '$Location'"
 }
 
-# Log in if requested; otherwise, the user is expected to already be authenticated via Connect-AzAccount.
+# Log in if requested; otherwise, try to login into playground subscription.
 if ($ProvisionerApplicationId) {
     $null = Disable-AzContextAutosave -Scope Process
 
@@ -176,6 +198,25 @@ if ($ProvisionerApplicationId) {
         }
     }
 }
+elseif (!$CI)
+{
+    # check if user is logged in and login into
+    $context = Get-AzContext;
+    if (!$context)
+    {
+        Log "You are not logged in, connecting to 'Azure SDK Developer Playground'"
+        Connect-AzAccount -Subscription $defaultSubscription
+    }
+
+    # If no test application id is specified create a new service principal
+    if (!$TestApplicationId) {        
+        Log "TestApplicationId was not specified, creating a new service principal."
+        $servicePrincipal = New-AzADServicePrincipal -Role Owner
+
+        $TestApplicationId = $servicePrincipal.ApplicationId
+        $TestApplicationSecret = (ConvertFrom-SecureString $servicePrincipal.Secret -AsPlainText);
+    }
+}
 
 # Get test application OID from ID if not already provided.
 if ($TestApplicationId -and !$TestApplicationOid) {
@@ -215,7 +256,7 @@ $ResourceGroupName = if ($ResourceGroupName) {
 
 # Tag the resource group to be deleted after a certain number of hours if specified.
 $tags = @{
-    Creator = if ($env:USER) { $env:USER } else { "${env:USERNAME}" }
+    Creator = $UserName
     ServiceDirectory = $ServiceDirectory
 }
 
@@ -284,7 +325,7 @@ $shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Pa
 } elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
     'shell', 'export {0}={1}'
 } else {
-    'PowerShell', '$env:{0} = ''{1}'''
+    'PowerShell', '${{env:{0}}} = ''{1}'''
 }
 
 # Deploy the templates
@@ -403,7 +444,11 @@ foreach ($templateFile in $templateFiles) {
 
 $exitActions.Invoke()
 
-return $environmentVariables
+# Suppress output locally
+if ($CI)
+{
+    return $environmentVariables
+}
 
 <#
 .SYNOPSIS
@@ -466,7 +511,7 @@ test resources (e.g. Role Assignments on resources). It is passed as to the ARM
 template as 'testApplicationOid'
 
 For more information on the relationship between AAD Applications and Service
-Principals see: https://docs.microsoft.com/en-us/azure/active-directory/develop/app-objects-and-service-principals
+Principals see: https://docs.microsoft.com/azure/active-directory/develop/app-objects-and-service-principals
 
 .PARAMETER TenantId
 The tenant ID of a service principal when a provisioner is specified. The same
@@ -568,4 +613,4 @@ log redaction).
 
 .LINK
 Remove-TestResources.ps1
-#>
+#>
diff --git a/eng/common/TestResources/New-TestResources.ps1.md b/eng/common/TestResources/New-TestResources.ps1.md
@@ -14,16 +14,16 @@ Deploys live test resources defined for a service directory to Azure.
 
 ### Default (Default)
 ```
-New-TestResources.ps1 [-BaseName] <String> [-ResourceGroupName <String>] -ServiceDirectory <String>
- -TestApplicationId <String> [-TestApplicationSecret <String>] [-TestApplicationOid <String>]
+New-TestResources.ps1 [-BaseName <String>] [-ResourceGroupName <String>] [-ServiceDirectory] <String>
+ [-TestApplicationId <String>] [-TestApplicationSecret <String>] [-TestApplicationOid <String>]
  [-DeleteAfterHours <Int32>] [-Location <String>] [-Environment <String>] [-AdditionalParameters <Hashtable>]
  [-CI] [-Force] [-OutFile] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Provisioner
 ```
-New-TestResources.ps1 [-BaseName] <String> [-ResourceGroupName <String>] -ServiceDirectory <String>
- -TestApplicationId <String> [-TestApplicationSecret <String>] [-TestApplicationOid <String>]
+New-TestResources.ps1 [-BaseName <String>] [-ResourceGroupName <String>] [-ServiceDirectory] <String>
+ [-TestApplicationId <String>] [-TestApplicationSecret <String>] [-TestApplicationOid <String>]
  -TenantId <String> [-SubscriptionId <String>] -ProvisionerApplicationId <String>
  -ProvisionerApplicationSecret <String> [-DeleteAfterHours <Int32>] [-Location <String>]
  [-Environment <String>] [-AdditionalParameters <Hashtable>] [-CI] [-Force] [-OutFile] [-WhatIf] [-Confirm]
@@ -106,8 +106,8 @@ Type: String
 Parameter Sets: (All)
 Aliases:
 
-Required: True
-Position: 1
+Required: False
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -140,7 +140,7 @@ Parameter Sets: (All)
 Aliases:
 
 Required: True
-Position: Named
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -159,7 +159,7 @@ Type: String
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False

diff --git a/eng/common/TestResources/README.md b/eng/common/TestResources/README.md
@@ -27,16 +27,10 @@ is a member of multiple subscriptions.
 
 ```powershell
 Connect-AzAccount -Subscription 'YOUR SUBSCRIPTION ID'
-$sp = New-AzADServicePrincipal -Role Owner
-eng\common\TestResources\New-TestResources.ps1 `
-  -BaseName 'myusername' `
-  -ServiceDirectory 'search' `
-  -TestApplicationId $sp.ApplicationId `
-  -TestApplicationSecret (ConvertFrom-SecureString $sp.Secret -AsPlainText)
+eng\common\TestResources\New-TestResources.ps1 -ServiceDirectory 'search'
 ```
 
-If you are running this for a .NET project on Windows, the recommended method is to
-add the `-OutFile` switch to the above command. This will save test environment settings
+The `OutFile` switch would be set if you are running this for a .NET project on Windows. This will save test environment settings
 into a test-resources.json.env file next to test-resources.json. The file is protected via DPAPI.
 The environment file would be scoped to the current repository directory and avoids the need to
 set environment variables or restart your IDE to recognize them.
@@ -45,14 +39,14 @@ Along with some log messages, this will output environment variables based on
 your current shell like in the following example:
 
 ```powershell
-$env:AZURE_TENANT_ID = '<<secret>>'
-$env:AZURE_CLIENT_ID = '<<secret>>'
-$env:AZURE_CLIENT_SECRET = '<<secret>>'
-$env:AZURE_SUBSCRIPTION_ID = 'YOUR SUBSCRIPTION ID'
-$env:AZURE_RESOURCE_GROUP = 'rg-myusername'
-$env:AZURE_LOCATION = 'westus2'
-$env:AZURE_SEARCH_STORAGE_NAME = 'myusernamestg'
-$env:AZURE_SEARCH_STORAGE_KEY = '<<secret>>'
+${env:AZURE_TENANT_ID} = '<<secret>>'
+${env:AZURE_CLIENT_ID} = '<<secret>>'
+${env:AZURE_CLIENT_SECRET} = '<<secret>>'
+${env:AZURE_SUBSCRIPTION_ID} = 'YOUR SUBSCRIPTION ID'
+${env:AZURE_RESOURCE_GROUP} = 'rg-myusername'
+${env:AZURE_LOCATION} = 'westus2'
+${env:AZURE_SEARCH_STORAGE_NAME} = 'myusernamestg'
+${env:AZURE_SEARCH_STORAGE_KEY} = '<<secret>>'
 ```
 
 For security reasons we do not set these environment variables automatically
@@ -68,14 +62,14 @@ applications started outside the terminal, you could copy and paste the
 following commands:
 
 ```powershell
-setx AZURE_TENANT_ID $env:AZURE_TENANT_ID
-setx AZURE_CLIENT_ID $env:AZURE_CLIENT_ID
-setx AZURE_CLIENT_SECRET $env:AZURE_CLIENT_SECRET
-setx AZURE_SUBSCRIPTION_ID $env:AZURE_SUBSCRIPTION_ID
-setx AZURE_RESOURCE_GROUP $env:AZURE_RESOURCE_GROUP
-setx AZURE_LOCATION $env:AZURE_LOCATION
-setx AZURE_SEARCH_STORAGE_NAME $env:AZURE_SEARCH_STORAGE_NAME
-setx AZURE_SEARCH_STORAGE_KEY $env:AZURE_SEARCH_STORAGE_KEY
+setx AZURE_TENANT_ID ${env:AZURE_TENANT_ID}
+setx AZURE_CLIENT_ID ${env:AZURE_CLIENT_ID}
+setx AZURE_CLIENT_SECRET ${env:AZURE_CLIENT_SECRET}
+setx AZURE_SUBSCRIPTION_ID ${env:AZURE_SUBSCRIPTION_ID}
+setx AZURE_RESOURCE_GROUP ${env:AZURE_RESOURCE_GROUP}
+setx AZURE_LOCATION ${env:AZURE_LOCATION}
+setx AZURE_SEARCH_STORAGE_NAME ${env:AZURE_SEARCH_STORAGE_NAME}
+setx AZURE_SEARCH_STORAGE_KEY ${env:AZURE_SEARCH_STORAGE_KEY}
 ```
 
 After running or recording live tests, if you do not plan on further testing

diff --git a/eng/common/pipelines/templates/steps/create-pull-request.yml b/eng/common/pipelines/templates/steps/create-pull-request.yml
@@ -17,6 +17,7 @@ parameters:
   GHTeamReviewersVariable: ''
   # Multiple labels seperated by comma, e.g. "bug, APIView"
   PRLabels: ''
+  SkipCheckingForChanges: false
 
 steps:
 
@@ -35,15 +36,19 @@ steps:
       echo "##vso[task.setvariable variable=HasChanges]$false"
       echo "No changes so skipping code push"
     }
+  displayName: Check for changes
+  condition: and(succeeded(), eq(${{ parameters.SkipCheckingForChanges }}, false))
+  workingDirectory: ${{ parameters.WorkingDirectory }}
+  ignoreLASTEXITCODE: true
 
+- pwsh: |
     # Remove the repo owner from the front of the repo name if it exists there
     $repoName = "${{ parameters.RepoName }}" -replace "^${{ parameters.RepoOwner }}/", ""
     echo "##vso[task.setvariable variable=RepoNameWithoutOwner]$repoName"
-    echo "RepoName = $repName"
-
-  displayName: Check for changes
+    echo "RepoName = $repoName"
+  displayName: Remove Repo Owner from Repo Name
+  condition: succeeded()
   workingDirectory: ${{ parameters.WorkingDirectory }}
-  ignoreLASTEXITCODE: true
 
 - task: PowerShell@2
   displayName: Push changes
@@ -57,6 +62,7 @@ steps:
       -CommitMsg "${{ parameters.CommitMsg }}"
       -GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.PROwner }}/$(RepoNameWithoutOwner).git"
       -PushArgs "${{ parameters.PushArgs }}"
+      -SkipCommit $${{parameters.SkipCheckingForChanges}}
 
 - task: PowerShell@2
   displayName: Create pull request

diff --git a/eng/common/scripts/Add-Issue-Comment.ps1 b/eng/common/scripts/Add-Issue-Comment.ps1
@@ -0,0 +1,53 @@
+[CmdletBinding(SupportsShouldProcess = $true)]
+param(
+  [Parameter(Mandatory = $true)]
+  [string]$RepoOwner,
+
+  [Parameter(Mandatory = $true)]
+  [string]$RepoName,
+
+  [Parameter(Mandatory = $true)]
+  [string]$IssueNumber,
+
+  [Parameter(Mandatory = $false)]
+  [string]$CommentPrefix,
+
+  [Parameter(Mandatory = $true)]
+  [string]$Comment,
+
+  [Parameter(Mandatory = $false)]
+  [string]$CommentPostFix,
+
+  [Parameter(Mandatory = $true)]
+  [string]$AuthToken
+)
+
+. "${PSScriptRoot}\logging.ps1"
+
+$headers = @{
+  Authorization = "bearer $AuthToken"
+}
+
+$apiUrl = "https://api.github.com/repos/$RepoOwner/$RepoName/issues/$IssueNumber/comments"
+
+$commentPrefixValue = [System.Environment]::GetEnvironmentVariable($CommentPrefix)
+$commentValue = [System.Environment]::GetEnvironmentVariable($Comment)
+$commentPostFixValue = [System.Environment]::GetEnvironmentVariable($CommentPostFix)
+
+if (!$commentPrefixValue) { $commentPrefixValue = $CommentPrefix }
+if (!$commentValue) { $commentValue = $Comment }
+if (!$commentPostFixValue) { $commentPostFixValue = $CommentPostFix }
+
+$PRComment = "$commentPrefixValue $commentValue $commentPostFixValue"
+
+$data = @{
+  body = $PRComment
+}
+
+try {
+  $resp = Invoke-RestMethod -Method POST -Headers $headers -Uri $apiUrl -Body ($data | ConvertTo-Json)
+}
+catch {
+  LogError "Invoke-RestMethod [ $apiUrl ] failed with exception:`n$_"
+  exit 1
+}