Merge branch 'main' into feature/mgmt-track2-network

Azure · Aug 12, 2021 · 4fc3468 · 4fc3468
2 parents 9bd9e69 + 08a8b3b
commit 4fc3468
Show file tree

Hide file tree

Showing 332 changed files with 14,957 additions and 73,474 deletions.
diff --git a/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs b/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs
@@ -117,7 +117,7 @@ protected void CleanupResourceGroups()
                 {
                     try
                     {
-                        _cleanupClient.GetManagementGroupOperations(mgmtGroupId).StartDelete();
+                        _cleanupClient.GetManagementGroup(mgmtGroupId).StartDelete();
                     }
                     catch (RequestFailedException e) when (e.Status == 404 || e.Status == 403)
                     {
@@ -206,7 +206,7 @@ public void OneTimeCleanupResourceGroups()
                 });
                 Parallel.ForEach(OneTimeManagementGroupCleanupPolicy.ManagementGroupsCreated, mgmtGroupId =>
                 {
-                    _cleanupClient.GetManagementGroupOperations(mgmtGroupId).StartDelete();
+                    _cleanupClient.GetManagementGroup(mgmtGroupId).StartDelete();
                 });
             }
 

diff --git a/common/Perf/Azure.Test.Perf/PerfOptions.cs b/common/Perf/Azure.Test.Perf/PerfOptions.cs
@@ -11,9 +11,6 @@ public class PerfOptions
         [Option('d', "duration", Default = 10, HelpText = "Duration of test in seconds")]
         public int Duration { get; set; }
 
-        [Option("host", HelpText = "Host to redirect HTTP requests")]
-        public string Host { get; set; }
-
         [Option("insecure", HelpText = "Allow untrusted SSL certs")]
         public bool Insecure { get; set; }
 
@@ -44,9 +41,6 @@ public class PerfOptions
         [Option('p', "parallel", Default = 1, HelpText = "Number of operations to execute in parallel")]
         public int Parallel { get; set; }
 
-        [Option("port", HelpText = "Port to redirect HTTP requests")]
-        public int? Port { get; set; }
-
         [Option('r', "rate", HelpText = "Target throughput (ops/sec)")]
         public int? Rate { get; set; }
 

diff --git a/eng/CredScanSuppression.json b/eng/CredScanSuppression.json
@@ -4,6 +4,7 @@
         {
             "placeholder": [
                 "Sanitized",
+                "%2BLsuqDlN8Us5lp%2FGdyEUMnU1XA4HdXx%2BJUdtkRNr7qI%3D",
                 "fake",
                 "Test12345",
                 "default",
@@ -51,6 +52,7 @@
             "file":[
                 "sdk/identity/Azure.Identity/tests/Data/cert.pfx",
                 "sdk/identity/Azure.Identity/tests/Data/cert-invalid-data.pem",
+                "sdk/identity/Azure.Identity/tests/Data/cert-password-protected.pfx",
                 "sdk/identity/Azure.Identity/tests/Data/cert.pem",
                 "sdk/identity/Azure.Identity/tests/Data/mock-arc-mi-key.key",
                 "sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/tests/cert.pem"

diff --git a/eng/Directory.Build.Common.props b/eng/Directory.Build.Common.props
@@ -126,7 +126,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Core" VersionOverride="1.18.0-alpha.20210810.5"/>
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -12,7 +12,7 @@
   -->
   <ItemGroup Condition="'$(IsClientLibrary)' != 'true'">
     <PackageReference Update="Microsoft.Azure.Amqp" Version="2.4.11" />
-    <PackageReference Update="Microsoft.Azure.Batch" Version="14.0.0" />
+    <PackageReference Update="Microsoft.Azure.Batch" Version="15.0.0" />
     <PackageReference Update="Microsoft.Azure.Devices.Client" Version="1.23.2" />
     <PackageReference Update="Microsoft.Azure.Devices" Version="1.19.0" />
     <PackageReference Update="Microsoft.Azure.KeyVault.Core" Version="3.0.3" />
@@ -79,7 +79,7 @@
     <PackageReference Update="Azure.Core" Version="1.17.0" />
     <PackageReference Update="Azure.Core.Amqp" Version="1.2.0" />
     <PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.14" />
-    <PackageReference Update="Azure.Messaging.EventHubs" Version="5.5.0" />
+    <PackageReference Update="Azure.Messaging.EventHubs" Version="5.6.0" />
     <PackageReference Update="Azure.Messaging.EventGrid" Version="4.5.0" />
     <PackageReference Update="Azure.Messaging.ServiceBus" Version="7.2.1" />
     <PackageReference Update="Azure.Messaging.WebPubSub" Version="1.0.0-beta.2" />
@@ -122,7 +122,7 @@
   <!-- Packages intended for Extensions libraries only -->
   <ItemGroup Condition="'$(IsExtensionClientLibrary)' == 'true'">
     <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.1.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.1.22" />
     <PackageReference Update="Microsoft.Extensions.Azure" Version="1.1.0" />
     <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
     <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.0" />
@@ -173,8 +173,10 @@
     <PackageReference Update="FluentAssertions" Version="5.10.3" />
     <PackageReference Update="FsCheck.Xunit" Version="2.14.0" />
     <PackageReference Update="Microsoft.Azure.ApplicationInsights.Query" Version="1.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore" Version="2.2.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
     <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.WebListener" Version="1.0.2" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.WebListener" Version="1.0.6" />
     <PackageReference Update="Microsoft.Azure.Core.Spatial" Version="1.0.0" />
     <PackageReference Update="Microsoft.Azure.Core.NewtonsoftJson" Version="1.0.0" />
     <PackageReference Update="Microsoft.Azure.Devices" Version="1.19.0" />

diff --git a/eng/common/scripts/stress-testing/deploy-stress-tests.ps1 b/eng/common/scripts/stress-testing/deploy-stress-tests.ps1
@@ -116,10 +116,15 @@ function DeployStressPackage(
         exit 1
     }
 
-    if ($pushImages) {
-        Run helm dependency update $pkg.Directory
-        if ($LASTEXITCODE) { return $LASTEXITCODE }
+    Run helm dependency update $pkg.Directory
+    if ($LASTEXITCODE) { return }
+
+    if (Test-Path "$($pkg.Directory)/test-resources.bicep") {
+        Run az bicep build -f "$($pkg.Directory)/test-resources.bicep"
+        if ($LASTEXITCODE) { return }
+    }
 
+    if ($pushImages) {
         $dockerFiles = Get-ChildItem "$($pkg.Directory)/Dockerfile*"
         foreach ($dockerFile in $dockerFiles) {
             # Infer docker image name from parent directory name, if file is named `Dockerfile`
@@ -131,13 +136,13 @@ function DeployStressPackage(
             $imageTag = "${registry}.azurecr.io/$($repository.ToLower())/$($imageName):$deployId"
             Write-Host "Building and pushing stress test docker image '$imageTag'"
             Run docker build -t $imageTag -f $dockerFile.FullName $dockerFile.DirectoryName
-            if ($LASTEXITCODE) { return $LASTEXITCODE }
+            if ($LASTEXITCODE) { return }
             Run docker push $imageTag
             if ($LASTEXITCODE) {
                 if ($PSCmdlet.ParameterSetName -ne 'DoLogin') {
                     Write-Warning "If docker push is failing due to authentication issues, try calling this script with '-Login'"
                 }
-                return $LASTEXITCODE
+                return
             }
         }
     }
@@ -157,7 +162,7 @@ function DeployStressPackage(
         # can be the result of cancelled `upgrade` operations (e.g. ctrl-c).
         # See https://github.com/helm/helm/issues/4558
         Write-Warning "The issue may be fixable by first running 'helm rollback -n $($pkg.Namespace) $($pkg.ReleaseName)'"
-        return $LASTEXITCODE
+        return
     }
 
     # Helm 3 stores release information in kubernetes secrets. The only way to add extra labels around

diff --git a/eng/mgmt/mgmtmetadata/containerinstance_resource-manager.txt b/eng/mgmt/mgmtmetadata/containerinstance_resource-manager.txt
@@ -3,12 +3,12 @@ AutoRest installed successfully.
 Commencing code generation
 Generating CSharp code
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/containerinstance/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\Users\nochangi\DEV\azure-sdk-for-net\sdk
-2020-06-21 05:01:44 UTC
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/containerinstance/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\Users\josephporter\source\azure-sdk-for-net\sdk
+2021-08-03 18:23:56 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      ae8d69cc6c78331c24b13951979bf171bf132d26
+Commit:      c25e3a8c81feb4e965d65e8584262fea42b5da0a
 AutoRest information
 Requested version: v2
 Bootstrapper version:    autorest@2.0.4413
diff --git a/eng/mgmt/mgmtmetadata/sql_resource-manager.txt b/eng/mgmt/mgmtmetadata/sql_resource-manager.txt
@@ -3,13 +3,13 @@ AutoRest installed successfully.
 Commencing code generation
 Generating CSharp code
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/sql/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\azure-sdk-for-net\sdk
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/sql/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\azure-sdk-for-net\sdk
 Autorest CSharp Version: 2.3.82
-2021-06-22 17:21:35 UTC
+2021-08-05 17:02:22 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      78c2a3fb24bfd4cd3372520bb9df203561c71487
+Commit:      111fbceeeb7c2c4905b80fe2ab760e5564b3458a
 AutoRest information
 Requested version: v2
 Bootstrapper version:    autorest@2.0.4413
diff --git a/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj b/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.9" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />
     <PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />
 
     <PackageReference Include="OpenTelemetry" Version="0.2.0-alpha.5" />

diff --git a/samples/linecounter/LineCounter.csproj b/samples/linecounter/LineCounter.csproj
@@ -8,11 +8,11 @@
     <PackageReference Include="Azure.Messaging.EventHubs" Version="5.4.1" />
     <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.4.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.8.4" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.18.0" />
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
     <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Connected Services\" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/CHANGELOG.md b/sdk/appconfiguration/Azure.Data.AppConfiguration/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.2.0-beta.1 (Unreleased)
+## 1.2.0-beta.2 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,12 @@
 
 ### Other Changes
 
+## 1.2.0-beta.1 (2021-08-10)
+
+### Features Added
+
+- Added a `ConfigurationSetting` constructor parameter to set an `ETag`.
+
 ## 1.1.0 (2021-07-06)
 
 ### Breaking Changes

diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Azure.Data.AppConfiguration.csproj b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Azure.Data.AppConfiguration.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>This is the Microsoft Azure Application Configuration Service client library</Description>
     <AssemblyTitle>Microsoft Azure.Data.AppConfiguration client library</AssemblyTitle>
-    <Version>1.2.0-beta.1</Version>
+    <Version>1.2.0-beta.2</Version>
     <!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
     <ApiCompatVersion>1.1.0</ApiCompatVersion>
     <PackageTags>Microsoft Azure Application Configuration;Data;AppConfig;$(PackageCommonTags)</PackageTags>

diff --git a/sdk/batch/Microsoft.Azure.Batch/CHANGELOG.md b/sdk/batch/Microsoft.Azure.Batch/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 15.1.0-beta.1 (Unreleased)
+## 15.1.0 (2021-08-10)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added an identity reference argument to various constructors and utility functions to make identities easier to use.
 
 ## 15.0.0 (2021-07-30)
 

diff --git a/...oft.Azure.Batch/Tools/ObjectModelCodeGenerator/Spec/AzureBlobFileSystemConfiguration.json b/...oft.Azure.Batch/Tools/ObjectModelCodeGenerator/Spec/AzureBlobFileSystemConfiguration.json
@@ -87,7 +87,8 @@
         "SummaryComment": "The reference to the user assigned identity to use to access containerName",
         "RemarksComment": "This property is mutually exclusive with both accountKey and sasKey; exactly one must be specified.",
         "BoundAccess": "read",
-        "UnboundAccess": "read,write"
+        "UnboundAccess": "read,write",
+        "ConstructorArgumentType": "Optional"
       },
       "Value": null
     }

diff --git a/sdk/batch/Microsoft.Azure.Batch/Tools/ObjectModelCodeGenerator/Spec/ContainerRegistry.json b/sdk/batch/Microsoft.Azure.Batch/Tools/ObjectModelCodeGenerator/Spec/ContainerRegistry.json
@@ -13,7 +13,7 @@
         "RemarksComment": null,
         "BoundAccess": "read",
         "UnboundAccess": "read,write",
-        "ConstructorArgumentType": "Required",
+        "ConstructorArgumentType": "Optional",
         "HideSetter": true
       },
       "Value": null

diff --git a/sdk/batch/Microsoft.Azure.Batch/src/AzureBlobFileSystemConfiguration.cs b/sdk/batch/Microsoft.Azure.Batch/src/AzureBlobFileSystemConfiguration.cs
@@ -25,5 +25,23 @@ public AzureBlobFileSystemConfiguration(
             SasKey = key.SasKey;
             AccountKey = key.AccountKey;
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AzureBlobFileSystemConfiguration"/> class.
+        /// </summary>
+        /// <param name='accountName'>The Azure Storage account name.</param>
+        /// <param name='containerName'>The Azure Blob Storage Container name.</param>
+        /// <param name='relativeMountPath'>The relative path on the compute node where the file system will be mounted.</param>
+        /// <param name='identityReference'>The managed identity to use to authenticate with Azure Storage.</param>
+        /// <param name='blobfuseOptions'>Additional command line options to pass to the mount command.</param>
+        public AzureBlobFileSystemConfiguration(
+            string accountName,
+            string containerName,
+            string relativeMountPath,
+            ComputeNodeIdentityReference identityReference,
+            string blobfuseOptions = default(string)) : this(accountName, containerName, relativeMountPath, blobfuseOptions: blobfuseOptions)
+        {
+            IdentityReference = identityReference;
+        }
     }
 }