[AutoPR sdk/eventhubs/mgmt-v2018_01_01_preview] Eventhub: Added PrivateEndpointConnection API

.github/CODEOWNERS

@@ -16,7 +16,7 @@
 ####
 # Service teams
 ####
-# PRLabel: %AzConfig
+# PRLabel: %App Configuration
 /sdk/appconfiguration/                              @mssfang @alzimmermsft
 /sdk/appconfiguration/spring-cloud-azure-*/         @mrm9084 @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai
 
@@ -37,7 +37,10 @@
 /sdk/cosmos/azure-spring-data-2-3-cosmos/           @kushagraThapar @saragluna @yiliuTo @chenrujun @zhoufenqin @jialindai @mbhaskar
 
 # PRLabel: %DigitalTwins
-/sdk/digitaltwins/                                  @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @prmathur-microsoft @bikamani @barustum
+/sdk/digitaltwins/                                  @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @bikamani @barustum
+
+# PRLabel: %Event Grid
+/sdk/eventgrid/                                     @srnagar @yijunxiems
 
 # PRLabel: %Event Hubs
 /sdk/eventhubs/                                     @conniey @srnagar @mssfang @yijunxiems
@@ -85,7 +88,7 @@
 /eng/code-quality-reports/                          @mssfang @JonathanGiles
 /eng/jacoco-test-coverage/                          @srnagar @JonathanGiles
 /eng/spotbugs-aggregate-report/                     @srnagar @JonathanGiles
-/eng/versioning/                                    @JimSuplizio @mitchdenny @weshaggard @danieljurek @alzimmermsft @samvaity
+/eng/versioning/                                    @JimSuplizio @mitchdenny @danieljurek @alzimmermsft @samvaity
 /parent/                                            @JimSuplizio @alzimmermsft
 
 /**/tests.yml                                       @danieljurek

.gitignore

@@ -9,6 +9,9 @@ temp/
 # Spring
 **/*packageOutputDirectory*
 
+# Sensitive files
+*.json.env
+
 #javadoc overview files generated from README.md
 readme_overview.html
 **/javadocTemp/**

common/perf-test-core/pom.xml

@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.5.4</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.6.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
   </dependencies>
 </project>

common/smoke-tests/pom.xml

@@ -126,13 +126,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.0.3</version>
+      <version>1.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.1.0</version>
+      <version>4.2.0</version>
     </dependency>
 
     <dependency>

common/smoke-tests/src/main/java/com/azure/KeyVaultSecrets.java

@@ -2,10 +2,11 @@
 // Licensed under the MIT License.
 package com.azure;
 
+import com.azure.identity.AzureAuthorityHosts;
 import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.identity.KnownAuthorityHosts;
 import com.azure.security.keyvault.secrets.SecretClient;
 import com.azure.security.keyvault.secrets.SecretClientBuilder;
+import com.azure.security.keyvault.secrets.SecretServiceVersion;
 import com.azure.security.keyvault.secrets.models.DeletedSecret;
 import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
 import com.azure.core.util.polling.SyncPoller;
@@ -24,10 +25,18 @@ public class KeyVaultSecrets {
     private static final Logger LOGGER = LoggerFactory.getLogger(KeyVaultSecrets.class);
 
     private static HashMap<String, String> AUTHORITY_HOST_MAP = new HashMap<String, String>() {{
-        put("AzureCloud", KnownAuthorityHosts.AZURE_CLOUD);
-        put("AzureChinaCloud", KnownAuthorityHosts.AZURE_CHINA_CLOUD);
-        put("AzureGermanCloud", KnownAuthorityHosts.AZURE_GERMAN_CLOUD);
-        put("AzureUSGovernment", KnownAuthorityHosts.AZURE_US_GOVERNMENT);
+        put("AzureCloud", AzureAuthorityHosts.AZURE_PUBLIC_CLOUD);
+        put("AzureChinaCloud", AzureAuthorityHosts.AZURE_CHINA);
+        put("AzureGermanCloud", AzureAuthorityHosts.AZURE_GERMANY);
+        put("AzureUSGovernment", AzureAuthorityHosts.AZURE_GOVERNMENT);
+    }};
+
+    private static HashMap<String, SecretServiceVersion> AUTHORITY_HOST_SERVICE_VERSION_MAP =
+        new HashMap<String, SecretServiceVersion>() {{
+        put("AzureCloud", SecretServiceVersion.V7_1);
+        put("AzureChinaCloud", SecretServiceVersion.V7_0);
+        put("AzureGermanCloud", SecretServiceVersion.V7_0);
+        put("AzureUSGovernment", SecretServiceVersion.V7_0);
     }};
 
     private static void setSecret() {
@@ -59,7 +68,10 @@ public static void main(String[] args) {
         // Configure authority host from AZURE_CLOUD
         String azureCloud = System.getenv("AZURE_CLOUD");
         String authorityHost = AUTHORITY_HOST_MAP.getOrDefault(
-            azureCloud, KnownAuthorityHosts.AZURE_CLOUD);
+            azureCloud, AzureAuthorityHosts.AZURE_PUBLIC_CLOUD);
+
+        SecretServiceVersion serviceVersion =
+            AUTHORITY_HOST_SERVICE_VERSION_MAP.getOrDefault(azureCloud, SecretServiceVersion.getLatest());
 
 
         /* DefaultAzureCredentialBuilder() is expecting the following environment variables:
@@ -72,8 +84,9 @@ public static void main(String[] args) {
             .credential(
                 new DefaultAzureCredentialBuilder()
                     .authorityHost(authorityHost)
-                    .build()
-            ).buildClient();
+                    .build())
+            .serviceVersion(serviceVersion)
+            .buildClient();
         try {
             setSecret();
             getSecret();

eng/.docsettings.yml

@@ -52,6 +52,7 @@ known_presence_issues:
   - ['sdk/core/azure-core-auth', '#2847']
   - ['sdk/core/azure-core-management', '#2847']
   - ['sdk/e2e', '#2847']
+  - ['sdk/eventgrid/azure-messaging-eventgrid', '#2847']
   - ['sdk/eventhubs/microsoft-azure-eventhubs-extensions', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault-core', '#2847']
@@ -93,6 +94,7 @@ known_presence_issues:
   - ['sdk/cosmos/azure-cosmos-examples/CHANGELOG.md', '#2847']
   - ['sdk/cosmos/azure-cosmos-benchmark/CHANGELOG.md', '#2847']
   - ['sdk/cosmos/CHANGELOG.md', '#2847']
+  - ['sdk/eventgrid/azure-messaging-eventgrid/CHANGELOG.md', '#2847']
   - ['sdk/eventgrid/microsoft-azure-eventgrid/CHANGELOG.md', '#2847']
   - ['sdk/eventhubs/microsoft-azure-eventhubs/CHANGELOG.md', '#2847']
   - ['sdk/eventhubs/microsoft-azure-eventhubs-eph/CHANGELOG.md', '#2847']
@@ -128,11 +130,13 @@ known_content_issues:
   - ['sdk/cosmos/azure-cosmos/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-encryption/README.md', '#3113']
   - ['sdk/e2e/README.md', '#3113']
+  - ['sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md', '#3113']
   - ['sdk/eventgrid/microsoft-azure-eventgrid/README.md', '#3113']
   - ['sdk/eventhubs/microsoft-azure-eventhubs-eph/README.md', '#3113']
   - ['sdk/eventhubs/README.md', '#3113']
   - ['sdk/formrecognizer/azure-ai-formrecognizer/swagger/README.md', '#3113']
   - ['sdk/keyvault/README.md', '#3113']
+  - ['sdk/keyvault/azure-security-keyvault-administration/README.md', '#3113']
   - ['sdk/loganalytics/microsoft-azure-loganalytics/README.md', '#3113']
   - ['sdk/parents/azure-client-sdk-parent/README.md', '#3113']
   - ['sdk/search/azure-search-documents/swagger/readme.md', '#3113']

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -299,6 +299,10 @@
 
   <!-- Public API already exposed: Common vocabulary errors, refer to Java Spec: https://azure.github.io/azure-sdk/java_introduction.html,
   issue link: https://github.com/Azure/azure-sdk-for-java/issues/5145 -->
+  <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
+            files="com.azure.security.keyvault.administration.KeyVaultBackupAsyncClient"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
+            files="com.azure.security.keyvault.administration.KeyVaultBackupClient"/>
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
             files="com.azure.security.keyvault.secrets.SecretAsyncClient.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck"
@@ -359,9 +363,10 @@
   <!-- Allows the HttpPipelinePolicy derived class in Implementation folder -->
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.messaging.servicebus.implementation.ServiceBusTokenCredentialHttpPolicy.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.storage.common.implementation.policy.SasTokenCredentialPolicy.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.security.keyvault.secrets.implementation.KeyVaultCredentialPolicy.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.security.keyvault.administration.implementation.KeyVaultCredentialPolicy.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.security.keyvault.certificates.implementation.KeyVaultCredentialPolicy.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.security.keyvault.keys.implementation.KeyVaultCredentialPolicy.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.HttpPipelinePolicy" files="com.azure.security.keyvault.secrets.implementation.KeyVaultCredentialPolicy.java"/>
 
   <!-- Empty while loop waiting for Reactor stream completion -->
   <suppress checks="EmptyBlock" files="com.azure.storage.blob.batch.BlobBatch.java"/>
@@ -420,6 +425,8 @@
   <suppress checks="LineLength" files="com.azure.ai.formrecognizer.Transforms.java"/>
 
   <suppress checks="Indentation" files="com.azure.ai.formrecognizer.implementation.FormRecognizerClientImpl" />
+  <suppress checks="Indentation" files="com.azure.security.keyvault.administration.implementation.RoleAssignmentsImpl" />
+  <suppress checks="Indentation" files="com.azure.security.keyvault.administration.implementation.RoleDefinitionsImpl" />
 
   <suppress checks="GoodLoggingCheck" files="com.azure.ai.formrecognizer.models.FieldValueType.java" />
 
@@ -525,6 +532,7 @@
   <!-- False positive as the methods are implemented in an anonymous class that is not exposed publicly. EntityHelper's
     accessor classes are not visible. -->
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.QueueProperties.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.RuleProperties.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.SubscriptionProperties.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.messaging.servicebus.administration.models.TopicProperties.java"/>
 

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -633,7 +633,6 @@
           name="com.azure.data.appconfiguration.credentials.ConfigurationClientCredentials$AuthorizationHeaderProvider"/>
       <Class name="com.azure.messaging.eventhubs.EventData$SystemProperties"/>
       <Class name="com.azure.messaging.eventhubs.implementation.ReactorSender$WeightedDeliveryTag"/>
-      <Class name="com.azure.identity.implementation.AuthorizationCodeListener"/>
     </Or>
     <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
   </Match>

eng/common/README.md

@@ -19,5 +19,7 @@ The 'Sync eng/common directory' PRs will be created in the language repositories
 2. `azure-sdk-tools - sync - eng-common` is run automatically. It creates **Sync PRs** in each of the connected language repositories using the format `Sync eng/common directory with azure-sdk-tools for PR {Tools PR Number}`. Each **Sync PR** will contain a link back to the **Tools PR** that triggered it.
 3. More changes pushed to the **Tools PR**, will automatically triggered new pipeline runs in the respective **Sync PRs**. The **Sync PRs** are used to make sure the changes would not break any of the connected pipelines.
 4. Once satisfied with the changes;
-    - First merge all the **Sync PRs**. The **Tools PR** contains links to all the **Sync PRs**
-    - Finally merge the **Tools PR**. Each **Sync PR** contains the link to the corresponding **Tools PR**. 
+    - First make sure all checks in the **Sync PRs** are green and approved. The **Tools PR** contains links to all the **Sync PRs**. If for some reason the PRs is blocked by a CI gate get someone with permission to override and manually merge the PR.
+    - To test the state of all the **Sync PRs**, you can download the `PRsCreated.txt` artifact from your `azure-sdk-tools - sync - eng-common` pipeline, then run `./eng/scripts/Verify-And-Merge.ps1 <path to PRsCreated.txt>` which will output the status of each associated PR.
+    - Next approve the `VerifyAndMerge` job for the `azure-sdk-tools - sync - eng-common` pipeline triggered by your **Tools PR** which will automatically merge all the **Sync PRs**. You need `azure-sdk` devops contributor permissions to reach the `azure-sdk-tools - sync - eng-common` pipeline.
+    - Finally merge the **Tools PR**. 

eng/common/Update-Change-Log.ps1

@@ -1,4 +1,4 @@
-# Note: This script will add or replace version title in change log
+# Note: This script will add or replace version title in change log
 
 # Parameter description
 # Version : Version to add or replace in change log
@@ -12,7 +12,8 @@ param (
   [Parameter(Mandatory = $true)]
   [String]$ChangeLogPath,
   [String]$Unreleased = $True,
-  [String]$ReplaceVersion = $False
+  [String]$ReplaceVersion = $False,
+  [String]$ReleaseDate
 )
 
 
@@ -46,8 +47,12 @@ function Get-VersionTitle($Version, $Unreleased)
    # Generate version title
    $newVersionTitle = "## $Version $UNRELEASED_TAG"
    if ($Unreleased -eq $False) {
-      $releaseDate = Get-Date -Format "(yyyy-MM-dd)"
-      $newVersionTitle = "## $Version $releaseDate"
+      $actualReleaseDate = $ReleaseDate;
+
+      if (!$actualReleaseDate) {
+         $actualReleaseDate = Get-Date -Format "yyyy-MM-dd"
+      }
+      $newVersionTitle = "## $Version ($actualReleaseDate)"
    }
    return $newVersionTitle
 }
@@ -95,7 +100,7 @@ function Get-NewChangeLog( [System.Collections.ArrayList]$ChangelogLines, $Versi
       exit(0)
    }
 
-   if (($ReplaceVersion -eq $True) -and ($Unreleased -eq $False) -and $CurrentTitle.Contains($version) -and (-not $CurrentTitle.Contains($UNRELEASED_TAG))) {
+   if (($ReplaceVersion -eq $True) -and ($Unreleased -eq $False) -and $CurrentTitle.Contains($version) -and (-not $CurrentTitle.Contains($UNRELEASED_TAG)) -and (-not $ReleaseDate)) {
       Write-Host "Version is already present in change log with a release date."
       exit(0)
    }

eng/common/pipelines/templates/steps/get-pr-owners.yml

@@ -6,30 +6,19 @@ steps:
   - pwsh: |
       git clone https://github.com/Azure/azure-sdk-tools.git $(Build.SourcesDirectory)/tools_repo
       cd $(Build.SourcesDirectory)/tools_repo
-      git checkout 564ad63ae72d18422533fa1da9d396e7703c1cb5
+      git checkout 35ad98f821913eb0e8872f861ee60589b563c865
     displayName: Setup Identity Resolver
 
   - pwsh: |
-      $result = dotnet run -v q -- `
+      dotnet run -v q -- `
         --aad-app-id-var APP_ID `
         --aad-app-secret-var APP_SECRET `
         --aad-tenant-var AAD_TENANT `
         --kusto-url-var KUSTO_URL `
         --kusto-database-var KUSTO_DB `
         --kusto-table-var KUSTO_TABLE `
-        --identity "$(Build.QueuedBy)"
-
-      $resolvedIdentity = ""
-      try { $resolvedIdentity = $result[-1] | ConvertFrom-Json } catch {}
-
-      if($resolvedIdentity) {
-        Write-Host $resolvedIdentity
-
-        Write-Host "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$($resolvedIdentity.GithubUserName)"
-      }
-      else {
-        Write-Host "Unable to locate a github user for identity $(Build.QueuedBy)"
-      }
+        --identity "$(Build.QueuedBy)" `
+        --targetvar "${{ parameters.TargetVariable }}"
     displayName: 'Resolving Queuing User'
     continueOnError: true
     workingDirectory: $(Build.SourcesDirectory)/tools_repo/tools/notification-configuration/identity-resolver
@@ -45,10 +34,12 @@ steps:
       Remove-Item -Force -Recurse $(Build.SourcesDirectory)/tools_repo
     displayName: Clean Up Cloned Tools Repo
 
-  - pwsh: |
-      $originalValue = "$(${{ parameters.TargetVariable }})"
-      $result = $(Build.SourcesDirectory)/eng/common/scripts/get-codeowners.ps1 -TargetDirectory /sdk/${{ parameters.ServiceDirectory }}/ -RootDirectory $(Build.SourcesDirectory)
-      if ($result) {
-        Write-Host "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$originalValue,$result"
-      }
-    displayName: Add CodeOwners if Present
+  - task: PowerShell@2
+    displayName: Add CodeOwners if Present
+    inputs:
+      pwsh: true
+      filePath: $(Build.SourcesDirectory)/eng/common/scripts/get-codeowners.ps1
+      arguments: >
+        -TargetDirectory "/sdk/${{ parameters.ServiceDirectory }}/"
+        -RootDirectory "$(Build.SourcesDirectory)"
+        -VsoVariable "${{ parameters.TargetVariable }}"

eng/common/pipelines/templates/steps/publish-blobs.yml

@@ -4,6 +4,8 @@ parameters:
   TargetLanguage: ''
   BlobName: ''
   ScriptPath: ''
+  ArtifactLocation: ''
+  RepoId: $(Build.Repository.Name)
 
 steps:
 - pwsh: |
@@ -21,6 +23,8 @@ steps:
       -SASKey "${{ parameters.BlobSASKey }}"
       -Language "${{ parameters.TargetLanguage }}"
       -BlobName "${{ parameters.BlobName }}"
+      -PublicArtifactLocation "${{ parameters.ArtifactLocation }}"
+      -RepoReplaceRegex "(https://github.com/${{ parameters.RepoId }}/(?:blob|tree)/)master"
     pwsh: true
     workingDirectory: $(Pipeline.Workspace)
   displayName: Copy Docs to Blob

eng/common/pipelines/templates/steps/verify-changelog.yml

@@ -5,6 +5,9 @@ parameters:
 - name: ServiceName
   type: string
   default: 'not-specified'
+- name: ServiceDirectory
+  type: string
+  default: ''
 - name: ForRelease
   type: boolean
   default: false
@@ -15,9 +18,7 @@ steps:
       filePath: $(Build.SourcesDirectory)/eng/common/scripts/Verify-ChangeLog.ps1
       arguments: >
         -PackageName ${{ parameters.PackageName }}
-        -ServiceName ${{ parameters.ServiceName }}
-        -RepoRoot $(Build.SourcesDirectory)
-        -RepoName $(Build.Repository.Name)
+        -ServiceDirectory ${{ coalesce(parameters.ServiceDirectory, parameters.ServiceName) }}
         -ForRelease $${{ parameters.ForRelease }}
       pwsh: true
       workingDirectory: $(Pipeline.Workspace)