Merge branch 'master' into feature/storage/stg77

.github/CODEOWNERS

@@ -10,18 +10,18 @@
 
 # BOM
 # PRLabel: %Azure.Core
-/sdk/boms/azure-sdk-bom/                            @alzimmermsft @jonathangiles @srnagar @hemanttanwar @anuchandy
+/sdk/boms/azure-sdk-bom/                            @alzimmermsft @jonathangiles @srnagar @hemanttanwar @anuchandy @pallavit
 # PRLabel: %azure-spring
-/sdk/boms/azure-spring-boot-bom/                    @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @stliu
+/sdk/boms/azure-spring-boot-bom/                    @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
 
 ####
 # Service teams
 ####
 # PRLabel: %App Configuration
 /sdk/appconfiguration/                              @mssfang @alzimmermsft
 # PRLabel: %azure-spring
-/sdk/appconfiguration/azure-spring-cloud-*/         @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @stliu
-/sdk/appconfiguration/spring-cloud-azure-*/         @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @stliu
+/sdk/appconfiguration/azure-spring-cloud-*/         @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
+/sdk/appconfiguration/spring-cloud-azure-*/         @mrm9084 @zhenlan @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
 
 # PRLabel: %Batch
 /sdk/batch/                                         @xingwu1 @bgklein @matthchr
@@ -41,9 +41,9 @@
 # PRLabel: %Cosmos
 /sdk/cosmos/                                        @moderakh @kushagraThapar @FabianMeiswinkel @kirankumarkolli @mbhaskar @simplynaveen20 @xinlian12 @milismsft @aayush3011
 # PRLabel: %azure-spring
-/sdk/cosmos/azure-spring-data-cosmos/               @kushagraThapar @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @mbhaskar @stliu
+/sdk/cosmos/azure-spring-data-cosmos/               @kushagraThapar @saragluna @yiliuTo @chenrujun @backwind1233 @mbhaskar @stliu
 # PRLabel: %azure-spring
-/sdk/cosmos/azure-spring-data-cosmos-test/          @kushagraThapar @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @mbhaskar @stliu
+/sdk/cosmos/azure-spring-data-cosmos-test/          @kushagraThapar @saragluna @yiliuTo @chenrujun @backwind1233 @mbhaskar @stliu
 
 # PRLabel: %Digital Twins
 /sdk/digitaltwins/                                  @drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @bikamani @barustum
@@ -69,7 +69,7 @@
 # PRLabel: %KeyVault
 /sdk/keyvault/                                      @g2vinay @vcolin7 @samvaity
 # PRLabel: %azure-spring
-/sdk/keyvault/azure-security-keyvault-jca           @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @stliu
+/sdk/keyvault/azure-security-keyvault-jca           @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
 
 /sdk/loganalytics/microsoft-azure-loganalytics/     @divya-jay @geneh @alongafni
 
@@ -100,7 +100,7 @@
 /sdk/textanalytics/                                 @samvaity @mssfang
 
 # PRLabel: %azure-spring
-/sdk/spring/                                        @saragluna @yiliuTo @chenrujun @backwind1233 @jialindai @stliu
+/sdk/spring/                                        @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
 
 # end to end tests
 # PRLabel: %Azure.Identity

common/perf-test-core/CHANGELOG.md

@@ -1,3 +1,5 @@
 # Release History
 
 ## 1.0.0-beta.1 (Unreleased)
+
+

common/perf-test-core/pom.xml

@@ -56,7 +56,7 @@
                 <!-- special allowance for perf-test-core as it is not a shipping library: -->
                 <include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 
-                <include>io.projectreactor:reactor-core:[3.4.3]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
+                <include>io.projectreactor:reactor-core:[3.4.5]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
-      <version>3.4.3</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
+      <version>3.4.5</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
     </dependency>
   </dependencies>
 </project>

common/smoke-tests/pom.xml

@@ -148,7 +148,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.10.2</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.11.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <dependency>

common/smoke-tests/smoke-test-dependencies.yml

@@ -18,78 +18,81 @@ jobs:
       Matrix:
         Java 8 Windows (AzureCloud):
           JavaTestVersion: '1.8'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Windows (AzureCloud):
-          JavaTestVersion: '1.11'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 Linux (AzureCloud):
-          JavaTestVersion: '1.8'
-          OSVmImage: ubuntu-18.04
+          Pool: "azsdk-pool-mms-ubuntu-1804-general"
+          OSVmImage: "MMSUbuntu18.04"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Linux (AzureCloud):
-          JavaTestVersion: '1.11'
-          OSVmImage: ubuntu-18.04
+          Pool: "azsdk-pool-mms-ubuntu-1804-general"
+          OSVmImage: "MMSUbuntu18.04"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Linux (AzureCloud Canary):
-          JavaTestVersion: '1.11'
-          OSVmImage: ubuntu-18.04
+          Pool: "azsdk-pool-mms-ubuntu-1804-general"
+          OSVmImage: "MMSUbuntu18.04"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: 'eastus2euap'
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 MacOS (AzureCloud):
           JavaTestVersion: '1.8'
+          Pool: Azure Pipelines
           OSVmImage: macOS-10.15
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS MacOS (AzureCloud):
           JavaTestVersion: '1.11'
+          Pool: Azure Pipelines
           OSVmImage: macOS-10.15
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 Windows (AzureUSGovernment):
-          JavaTestVersion: '1.8'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ArmTemplateParameters: $(azureUSGovernmentArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Windows (AzureUSGovernment):
-          JavaTestVersion: '1.11'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ArmTemplateParameters: $(azureUSGovernmentArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 Windows (AzureChinaCloud):
-          JavaTestVersion: '1.8'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           ArmTemplateParameters: $(azureChinaCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Windows (AzureChinaCloud):
-          JavaTestVersion: '1.11'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           ArmTemplateParameters: $(azureChinaCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml

common/smoke-tests/smoke-test-job.yml

@@ -20,6 +20,7 @@ jobs:
       matrix: ${{ parameters.Matrix }}
 
     pool:
+      name: $(Pool)
       vmImage: $(OSVmImage)
 
     variables:
@@ -29,6 +30,10 @@ jobs:
 
 
     steps:
+      - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
+        parameters:
+          AgentImage: $(OSVmImage)
+
       - task: Maven@3
         displayName: Use the latest package version from the dev feed
         inputs:

common/smoke-tests/smoke-test-samples.yml

@@ -21,7 +21,8 @@ jobs:
       Matrix:
         Service Bus:
           JavaTestVersion: '1.8'
-          OSVmImage: windows-2019
+          Pool: "azsdk-pool-mms-win-2019-general"
+          OSVmImage: "MMS2019"
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml

eng/.docsettings.yml

@@ -178,6 +178,8 @@ known_content_issues:
   - ['sdk/synapse/azure-analytics-synapse-monitoring/swagger/README.md', '#3113']
   - ['sdk/tables/azure-data-tables/swagger/README.md', '#3113']
   - ['sdk/textanalytics/azure-ai-textanalytics/swagger/README.md', '#3113']
+  - ['sdk/translation/azure-ai-documenttranslator/swagger/README.md', '#3113']
+  - ['sdk/webpubsub/azure-messaging-webpubsub/swagger/README.md', '#3113']
 
 package_indexing_exclusion_list:
   - azure-loganalytics-sample

eng/code-quality-reports/pom.xml

@@ -34,13 +34,13 @@
     <dependency>
       <groupId>com.puppycrawl.tools</groupId>
       <artifactId>checkstyle</artifactId>
-      <version>8.40</version> <!-- {x-version-update;com.puppycrawl.tools:checkstyle;external_dependency} -->
+      <version>8.42</version> <!-- {x-version-update;com.puppycrawl.tools:checkstyle;external_dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.puppycrawl.tools</groupId>
       <artifactId>checkstyle</artifactId>
-      <version>8.40</version> <!-- {x-version-update;com.puppycrawl.tools:checkstyle;external_dependency} -->
+      <version>8.42</version> <!-- {x-version-update;com.puppycrawl.tools:checkstyle;external_dependency} -->
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/BlacklistedWordsCheck.java

@@ -8,6 +8,7 @@
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
 import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
+import com.puppycrawl.tools.checkstyle.utils.ScopeUtil;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,9 +24,9 @@
  * blacklisted words.
  */
 public class BlacklistedWordsCheck extends AbstractCheck {
-    private final Set<String> blacklistedWords = new HashSet<>(Arrays.asList());
-    private final String ERROR_MESSAGE = "%s, All Public API Classes, Fields and Methods should follow " +
-        "Camelcase standards for the following words: %s.";
+    private final Set<String> blacklistedWords = new HashSet<>();
+    private static final String ERROR_MESSAGE = "%s, All Public API Classes, Fields and Methods should follow "
+        + "Camelcase standards for the following words: %s.";
 
     /**
      * Adds words that Classes, Methods and Variables that should follow Camelcasing standards
@@ -60,12 +61,22 @@ public void visitToken(DetailAST token) {
             case TokenTypes.CLASS_DEF:
             case TokenTypes.METHOD_DEF:
             case TokenTypes.VARIABLE_DEF:
-                if (isPublicApi(token)) {
-                    String tokenName = token.findFirstToken(TokenTypes.IDENT).getText();
-                    if (hasBlacklistedWords(tokenName)) {
-                        log(token, String.format(ERROR_MESSAGE, tokenName, this.blacklistedWords.stream().collect(Collectors.joining(", ", "", ""))));
-                    }
+                if (!isPublicApi(token)) {
+                    break;
                 }
+
+                final String tokenName = token.findFirstToken(TokenTypes.IDENT).getText();
+                if (!hasBlacklistedWords(tokenName)) {
+                    break;
+                }
+
+                // In an interface all the fields (variables) are by default public, static and final.
+                if (token.getType() == TokenTypes.VARIABLE_DEF && ScopeUtil.isInInterfaceBlock(token)) {
+                    break;
+                }
+
+                log(token, String.format(ERROR_MESSAGE, tokenName, String.join(", ", this.blacklistedWords)));
+
                 break;
             default:
                 // Checkstyle complains if there's no default block in switch
@@ -80,9 +91,8 @@ public void visitToken(DetailAST token) {
      * @return true if we should check such member.
      */
     private boolean isPublicApi(DetailAST token) {
-        final DetailAST modifiersAST =
-            token.findFirstToken(TokenTypes.MODIFIERS);
-        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(modifiersAST);
+        final DetailAST modifiersAST = token.findFirstToken(TokenTypes.MODIFIERS);
+        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(token);
         final boolean isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null;
         return (accessModifier.equals(AccessModifierOption.PUBLIC) || accessModifier.equals(AccessModifierOption.PROTECTED)) && !isStatic;
     }

eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ExternalDependencyExposedCheck.java

@@ -67,8 +67,7 @@ public void visitToken(DetailAST token) {
                 break;
             case TokenTypes.CLASS_DEF:
                 // CLASS_DEF always has MODIFIERS
-                final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(
-                    token.findFirstToken(TokenTypes.MODIFIERS));
+                final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(token);
                 isPublicClass =
                     accessModifier.equals(AccessModifierOption.PUBLIC) || accessModifier.equals(AccessModifierOption.PROTECTED);
                 break;
@@ -90,11 +89,9 @@ public void visitToken(DetailAST token) {
      * @param methodDefToken METHOD_DEF AST node
      */
     private void checkNoExternalDependencyExposed(DetailAST methodDefToken) {
-        final DetailAST modifiersToken = methodDefToken.findFirstToken(TokenTypes.MODIFIERS);
-
         // Getting the modifier of the method to determine if it is 'public' or 'protected'.
         // Ignore the check if it is neither of 'public' nor 'protected',
-        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(modifiersToken);
+        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(methodDefToken);
         if (!accessModifier.equals(AccessModifierOption.PUBLIC) && !accessModifier.equals(AccessModifierOption.PROTECTED)) {
             return;
         }

eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/HttpPipelinePolicyCheck.java

@@ -82,12 +82,11 @@ private void checkPublicNonImplementationPolicyClass(DetailAST classDefToken) {
             return;
         }
 
-        final DetailAST modifiersToken = classDefToken.findFirstToken(TokenTypes.MODIFIERS);
-        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(modifiersToken);
+        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(classDefToken);
         final String className = classDefToken.findFirstToken(TokenTypes.IDENT).getText();
         // Public class check
         if (!accessModifier.equals(AccessModifierOption.PUBLIC)) {
-            log(modifiersToken, String.format("Class ''%s'' implementing ''%s'' and should be a public class",
+            log(classDefToken, String.format("Class ''%s'' implementing ''%s'' and should be a public class",
                 className, HTTP_PIPELINE_POLICY));
         }
 

eng/code-quality-reports/src/main/java/com/azure/tools/checkstyle/checks/ServiceClientCheck.java

@@ -158,11 +158,10 @@ public void visitToken(DetailAST token) {
      * @param ctorToken the CTOR_DEF AST node
      */
     private void checkConstructor(DetailAST ctorToken) {
-        final DetailAST modifiersToken = ctorToken.findFirstToken(TokenTypes.MODIFIERS);
         // find constructor's modifier accessibility, no public or protected constructor
-        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(modifiersToken);
+        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(ctorToken);
         if (accessModifier.equals(AccessModifierOption.PUBLIC) || accessModifier.equals(AccessModifierOption.PROTECTED)) {
-            log(modifiersToken, "@ServiceClient class should not have any public or protected constructor.");
+            log(ctorToken, "@ServiceClient class should not have any public or protected constructor.");
         }
     }
 
@@ -178,10 +177,11 @@ private void checkMethodNameBuilder(DetailAST methodDefToken) {
         }
 
         final DetailAST modifiersToken = methodDefToken.findFirstToken(TokenTypes.MODIFIERS);
+
         // find method's modifier accessibility, should not have a public static method called 'builder'
-        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(modifiersToken);
+        final AccessModifierOption accessModifier = CheckUtil.getAccessModifierFromModifiersToken(methodDefToken);
         if (accessModifier.equals(AccessModifierOption.PUBLIC) && modifiersToken.branchContains(TokenTypes.LITERAL_STATIC)) {
-            log(modifiersToken, "@ServiceClient class should not have a public static method named ''builder''.");
+            log(methodDefToken, "@ServiceClient class should not have a public static method named ''builder''.");
         }
     }