Fixing Key Vault live tests. (#24142)

* Updated platform-matrix.json and tests.yml to ensure Code Coverage for Key Vault Administration is only checked when running against an HSM endpoint. * Applied PR feedback. * Fixed matrix importing issue with platform-matrix.json * Fixed path to platform-matrix.json * Fixed failing Keys tests for Managed HSM. * Removed unused imports.
Azure · Sep 16, 2021 · 71c3575 · 71c3575
1 parent 932b715
commit 71c3575
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 27 deletions.
diff --git a/...rity-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java b/...rity-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java
@@ -3,7 +3,6 @@
 
 package com.azure.security.keyvault.keys;
 
-import com.azure.core.exception.HttpResponseException;
 import com.azure.core.exception.ResourceModifiedException;
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.HttpClient;
@@ -89,21 +88,18 @@ public void createRsaKey(HttpClient httpClient, KeyServiceVersion serviceVersion
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("getTestParameters")
     public void setKeyEmptyName(HttpClient httpClient, KeyServiceVersion serviceVersion) {
-        if (isManagedHsmTest && interceptorManager.isPlaybackMode()) {
-            // Setting a key with an empty name returns 500 in MHSM, we don't currently produce a recording for that the
-            // way things are set.
-            return;
+        createKeyAsyncClient(httpClient, serviceVersion);
+
+        final KeyType keyType;
+
+        if (isManagedHsmTest) {
+            keyType = KeyType.RSA_HSM;
+        } else {
+            keyType = KeyType.RSA;
         }
 
-        createKeyAsyncClient(httpClient, serviceVersion);
-        StepVerifier.create(client.createKey("", KeyType.RSA))
-            .verifyErrorSatisfies(ex -> {
-                if (isManagedHsmTest) {
-                    assertRestException(ex, HttpResponseException.class, HttpURLConnection.HTTP_SERVER_ERROR);
-                } else {
-                    assertRestException(ex, ResourceModifiedException.class, HttpURLConnection.HTTP_BAD_REQUEST);
-                }
-            });
+        StepVerifier.create(client.createKey("", keyType)).verifyErrorSatisfies(ex ->
+            assertRestException(ex, ResourceModifiedException.class, HttpURLConnection.HTTP_BAD_REQUEST));
     }
 
     /**

diff --git a/...-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java b/...-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java
@@ -3,7 +3,6 @@
 
 package com.azure.security.keyvault.keys;
 
-import com.azure.core.exception.HttpResponseException;
 import com.azure.core.exception.ResourceModifiedException;
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.HttpClient;
@@ -90,13 +89,16 @@ public void createRsaKey(HttpClient httpClient, KeyServiceVersion serviceVersion
     public void setKeyEmptyName(HttpClient httpClient, KeyServiceVersion serviceVersion) {
         createKeyClient(httpClient, serviceVersion);
 
+        final KeyType keyType;
+
         if (isManagedHsmTest) {
-            assertRestException(() -> client.createKey("", KeyType.RSA_HSM), HttpResponseException.class,
-                HttpURLConnection.HTTP_SERVER_ERROR);
+            keyType = KeyType.RSA_HSM;
         } else {
-            assertRestException(() -> client.createKey("", KeyType.RSA), ResourceModifiedException.class,
-                HttpURLConnection.HTTP_BAD_REQUEST);
+            keyType = KeyType.RSA;
         }
+
+        assertRestException(() -> client.createKey("", keyType), ResourceModifiedException.class,
+            HttpURLConnection.HTTP_BAD_REQUEST);
     }
 
     /**

diff --git a/sdk/keyvault/platform-matrix.json b/sdk/keyvault/platform-matrix.json
@@ -2,18 +2,37 @@
   "displayNames": {
     "@{ enableHsm = $true }": "HSM"
   },
+  "matrix": {
+    "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json"
+  },
+  "exclude": [
+    {
+      "TestFromSource": true
+    },
+    {
+      "TestGoals": "verify"
+    }
+  ],
   "include": [
     {
       "Agent": {
-        "ubuntu-20.04": {
+        "ubuntu-20.04_TestFromSource": {
           "OSVmImage": "MMSUbuntu20.04",
-          "Pool": "azsdk-pool-mms-ubuntu-2004-general"
+          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+          "TestGoals": "surefire:test",
+          "TestFromSource": true
         },
-        "JavaTestVersion": "1.11",
-        "AZURE_TEST_HTTP_CLIENTS": "netty",
-        "TestGoals": "surefire:test"
+        "windows-2019_am_verify": {
+          "OSVmImage": "MMS2019",
+          "Pool": "azsdk-pool-mms-win-2019-general",
+          "AdditionalOptions": "-am",
+          "TestGoals": "verify"
+        }
       },
-      "ArmTemplateParameters": "@{ enableHsm = $true }"
+      "ArmTemplateParameters": "@{ enableHsm = $true }",
+      "AZURE_TEST_HTTP_CLIENTS": "netty",
+      "JavaTestVersion": "1.11",
+      "TestOptions": ""
     }
   ]
 }
diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
@@ -24,8 +24,8 @@ stages:
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           MatrixFilters:
             - ArmTemplateParameters=^(?!.*enableHsm.*true)
-      AdditionalMatrixConfigs:
-        - Name: keyvault_test_matrix_addons
+      MatrixConfigs:
+        - Name: Key_Vault_live_test
           Path: sdk/keyvault/platform-matrix.json
           Selection: sparse
           GenerateVMJobs: true