Skip to content

Commit 3e30a8c

Browse files
vcolin7vcolin7
authored
Fixed live tests for keys without a Key Rotation Policy explicitly set. (Azure#24928)
* Fixed tests for keys without a Key rotation policy explicitly set. * Re-recorded tests. * Removed unused imports.
1 parent a980583 commit 3e30a8c

File tree

4 files changed

+40
-32
lines changed

4 files changed

+40
-32
lines changed

‎sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.azure.security.keyvault.keys.models.CreateRsaKeyOptions;
2121
import com.azure.security.keyvault.keys.models.DeletedKey;
2222
import com.azure.security.keyvault.keys.models.KeyProperties;
23+
import com.azure.security.keyvault.keys.models.KeyRotationPolicyAction;
2324
import com.azure.security.keyvault.keys.models.KeyType;
2425
import com.azure.security.keyvault.keys.models.KeyVaultKey;
2526
import org.junit.jupiter.api.Assertions;
@@ -577,7 +578,10 @@ public void getKeyRotationPolicyWithNoPolicySet(HttpClient httpClient, KeyServic
577578
assertNull(keyRotationPolicy.getCreatedOn());
578579
assertNull(keyRotationPolicy.getUpdatedOn());
579580
assertNull(keyRotationPolicy.getExpiryTime());
580-
assertNull(keyRotationPolicy.getLifetimeActions());
581+
assertEquals(1, keyRotationPolicy.getLifetimeActions().size());
582+
assertEquals(KeyRotationPolicyAction.NOTIFY, keyRotationPolicy.getLifetimeActions().get(0).getType());
583+
assertEquals("P30D", keyRotationPolicy.getLifetimeActions().get(0).getTimeBeforeExpiry());
584+
assertNull(keyRotationPolicy.getLifetimeActions().get(0).getTimeAfterCreate());
581585
})
582586
.verifyComplete();
583587
}

‎sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.azure.security.keyvault.keys.models.DeletedKey;
1818
import com.azure.security.keyvault.keys.models.KeyProperties;
1919
import com.azure.security.keyvault.keys.models.KeyRotationPolicy;
20+
import com.azure.security.keyvault.keys.models.KeyRotationPolicyAction;
2021
import com.azure.security.keyvault.keys.models.KeyType;
2122
import com.azure.security.keyvault.keys.models.KeyVaultKey;
2223
import com.azure.security.keyvault.keys.models.ReleaseKeyResult;
@@ -542,7 +543,10 @@ public void getKeyRotationPolicyWithNoPolicySet(HttpClient httpClient, KeyServic
542543
assertNull(keyRotationPolicy.getCreatedOn());
543544
assertNull(keyRotationPolicy.getUpdatedOn());
544545
assertNull(keyRotationPolicy.getExpiryTime());
545-
assertNull(keyRotationPolicy.getLifetimeActions());
546+
assertEquals(1, keyRotationPolicy.getLifetimeActions().size());
547+
assertEquals(KeyRotationPolicyAction.NOTIFY, keyRotationPolicy.getLifetimeActions().get(0).getType());
548+
assertEquals("P30D", keyRotationPolicy.getLifetimeActions().get(0).getTimeBeforeExpiry());
549+
assertNull(keyRotationPolicy.getLifetimeActions().get(0).getTimeAfterCreate());
546550
}
547551

548552
/**

‎sdk/keyvault/azure-security-keyvault-keys/src/test/resources/session-records/KeyAsyncClientTest.getKeyRotationPolicyWithNoPolicySet[1].json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
22
"networkCallRecords" : [ {
33
"Method" : "POST",
4-
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey993655a8/create?api-version=7.3-preview",
4+
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey06005233/create?api-version=7.3-preview",
55
"Headers" : {
66
"User-Agent" : "azsdk-java-client_name/client_version (11.0.6; Windows 10; 10.0)",
77
"Content-Type" : "application/json"
88
},
99
"Response" : {
10-
"content-length" : "699",
10+
"content-length" : "688",
1111
"X-Content-Type-Options" : "nosniff",
1212
"Pragma" : "no-cache",
1313
"retry-after" : "0",
1414
"StatusCode" : "200",
15-
"Date" : "Tue, 05 Oct 2021 01:54:23 GMT",
15+
"Date" : "Wed, 20 Oct 2021 20:41:14 GMT",
1616
"Strict-Transport-Security" : "max-age=31536000;includeSubDomains",
1717
"Cache-Control" : "no-cache",
18-
"x-ms-keyvault-region" : "centralus",
18+
"x-ms-keyvault-region" : "westus",
1919
"x-ms-keyvault-network-info" : "conn_type=Ipv4;addr=174.127.169.154;act_addr_fam=InterNetwork;",
2020
"Expires" : "-1",
21-
"x-ms-request-id" : "298ea189-0257-4422-a879-6c9f83166b77",
22-
"x-ms-keyvault-service-version" : "1.9.132.3",
23-
"Body" : "{\"key\":{\"kid\":\"https://azure-kv-tests2.vault.azure.net/keys/rotatekey993655a8/d9f859688515440a8b6b5d1286b13847\",\"kty\":\"RSA\",\"key_ops\":[\"encrypt\",\"decrypt\",\"sign\",\"verify\",\"wrapKey\",\"unwrapKey\"],\"n\":\"sjesqksiraQBumLFnqPzwaYt5XhjNnQLXX4eoOrIvm0QvEyHTzWv_I_SRaICFZlzy5yN8XOOzv1NF1mShWpIvs_ApieiblzRN4gB83d_oCnHsrDyGEwP1flDWS01HJ_HnP0U-sXRKixSL2DRVM037EoSnoHR16zZucHJuYdgkC5CkP_RuhekQ2OZrXUk5FLTpDSJ-aUQbZOPUxeRceOBxvFosowV_ukTgOZNZPvJ9q2rAXEJqkgXlEr5YKX0r2yUbAM45vHJTntjRSpfpP4T7ZKR_xByxRefEhiIpVCNcHQBIlaZaaDxIVdAjePIgIk-cWv2I5V9qEbs9t-F53wx7Q\",\"e\":\"AQAB\"},\"attributes\":{\"enabled\":true,\"created\":1633398863,\"updated\":1633398863,\"recoveryLevel\":\"CustomizedRecoverable+Purgeable\",\"recoverableDays\":7}}",
21+
"x-ms-request-id" : "0a528332-6905-45a4-a13a-10e5e5ae804a",
22+
"x-ms-keyvault-service-version" : "1.9.150.1",
23+
"Body" : "{\"key\":{\"kid\":\"https://azure-kv-tests2.vault.azure.net/keys/rotatekey06005233/67d97629bc914d699e1fa214a2ca0f72\",\"kty\":\"RSA\",\"key_ops\":[\"encrypt\",\"decrypt\",\"sign\",\"verify\",\"wrapKey\",\"unwrapKey\"],\"n\":\"y1OLwlJEZ0vitZbVnMBNf0zCPz3vUeGUNSJgv1JaMG8OEVY9kxZHoDsteO7yGLbkjATUM5prmh1HPJJC-Lbv4ogDwN85eAPuzS77qBqMycgndvUm13l-yuLgOLTHzuxAerlVt0aU-G8USiFxIOybfRyO7qLZ_qsjXGNU1ORMSwxn-hMP1ZGFSjM68NWfKbpQCFVh2zsYTP4rVbdxhmtgIczzve_OkIMI25mbhUK4JRIqtPctRcWNtU9KCCgbKPi6nvqXKkiNLdDHa0a4ZSVrQyLZ04dqDAPqYscU-P14OQOwfGRCTpK_SUVxtXfj6Fecy2b_rnxXtrpmrQopbmA2DQ\",\"e\":\"AQAB\"},\"attributes\":{\"enabled\":true,\"created\":1634762473,\"updated\":1634762473,\"recoveryLevel\":\"Recoverable+Purgeable\",\"recoverableDays\":90}}",
2424
"Content-Type" : "application/json; charset=utf-8",
2525
"X-Powered-By" : "ASP.NET"
2626
},
2727
"Exception" : null
2828
}, {
2929
"Method" : "GET",
30-
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey993655a8/rotationpolicy?api-version=7.3-preview",
30+
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey06005233/rotationpolicy?api-version=7.3-preview",
3131
"Headers" : {
3232
"User-Agent" : "azsdk-java-client_name/client_version (11.0.6; Windows 10; 10.0)"
3333
},
3434
"Response" : {
35-
"content-length" : "42",
35+
"content-length" : "106",
3636
"X-Content-Type-Options" : "nosniff",
3737
"Pragma" : "no-cache",
3838
"retry-after" : "0",
3939
"StatusCode" : "200",
40-
"Date" : "Tue, 05 Oct 2021 01:54:23 GMT",
40+
"Date" : "Wed, 20 Oct 2021 20:41:14 GMT",
4141
"Strict-Transport-Security" : "max-age=31536000;includeSubDomains",
4242
"Cache-Control" : "no-cache",
43-
"x-ms-keyvault-region" : "centralus",
43+
"x-ms-keyvault-region" : "westus",
4444
"x-ms-keyvault-network-info" : "conn_type=Ipv4;addr=174.127.169.154;act_addr_fam=InterNetwork;",
4545
"Expires" : "-1",
46-
"x-ms-request-id" : "72f5e8d8-96eb-4adb-83c2-942755452cfe",
47-
"x-ms-keyvault-service-version" : "1.9.132.3",
48-
"Body" : "{\"lifetimeActions\":null,\"attributes\":null}",
46+
"x-ms-request-id" : "aeb63e2b-6f9d-4837-b1dc-77fb7a2be176",
47+
"x-ms-keyvault-service-version" : "1.9.150.1",
48+
"Body" : "{\"lifetimeActions\":[{\"trigger\":{\"timeBeforeExpiry\":\"P30D\"},\"action\":{\"type\":\"Notify\"}}],\"attributes\":null}",
4949
"Content-Type" : "application/json; charset=utf-8",
5050
"X-Powered-By" : "ASP.NET"
5151
},
5252
"Exception" : null
5353
} ],
54-
"variables" : [ "rotatekey993655a8" ]
54+
"variables" : [ "rotatekey06005233" ]
5555
}

‎sdk/keyvault/azure-security-keyvault-keys/src/test/resources/session-records/KeyClientTest.getKeyRotationPolicyWithNoPolicySet[1].json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
22
"networkCallRecords" : [ {
33
"Method" : "POST",
4-
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey50761673/create?api-version=7.3-preview",
4+
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey75289f67/create?api-version=7.3-preview",
55
"Headers" : {
66
"User-Agent" : "azsdk-java-client_name/client_version (11.0.6; Windows 10; 10.0)",
77
"Content-Type" : "application/json"
88
},
99
"Response" : {
10-
"content-length" : "699",
10+
"content-length" : "688",
1111
"X-Content-Type-Options" : "nosniff",
1212
"Pragma" : "no-cache",
1313
"retry-after" : "0",
1414
"StatusCode" : "200",
15-
"Date" : "Tue, 05 Oct 2021 01:42:29 GMT",
15+
"Date" : "Wed, 20 Oct 2021 20:41:37 GMT",
1616
"Strict-Transport-Security" : "max-age=31536000;includeSubDomains",
1717
"Cache-Control" : "no-cache",
18-
"x-ms-keyvault-region" : "centralus",
18+
"x-ms-keyvault-region" : "westus",
1919
"x-ms-keyvault-network-info" : "conn_type=Ipv4;addr=174.127.169.154;act_addr_fam=InterNetwork;",
2020
"Expires" : "-1",
21-
"x-ms-request-id" : "4bd05228-1e38-452c-aece-b3036c129131",
22-
"x-ms-keyvault-service-version" : "1.9.132.3",
23-
"Body" : "{\"key\":{\"kid\":\"https://azure-kv-tests2.vault.azure.net/keys/rotatekey50761673/a2694cda4af84db386989cdc6875abac\",\"kty\":\"RSA\",\"key_ops\":[\"encrypt\",\"decrypt\",\"sign\",\"verify\",\"wrapKey\",\"unwrapKey\"],\"n\":\"uor19r1Z192YEZL-PWi3kHJLCzXPi9tfjr3te9_cKgWkvXSC9LiodP0PhOwAVVTC_2vng0HyyZ2Hz0GTHNrd0Hkkxi0O5jxCH7CU7j7f2TGHYeTfp3_q4WoZd5L3qi72bDA0gNVx_SUkuXcnWEsBYUbUKpZwZuZmC9E13KoR5rilPjEKcJ4Z6XxnH7xOgsrjSaPWiGSrrCCKiBnYPJWc0RI8_NuWfmi9kquY5oQP2nrXnAXFZJ7aFdcA2AFRPBh2J9nnfsnW731uDAMf7uodniepM7jZckw4khfS049ykss2fazghz1EJ-KgGhXZZtfFSFzBEYqTNuFAe8UFiCqCMQ\",\"e\":\"AQAB\"},\"attributes\":{\"enabled\":true,\"created\":1633398149,\"updated\":1633398149,\"recoveryLevel\":\"CustomizedRecoverable+Purgeable\",\"recoverableDays\":7}}",
21+
"x-ms-request-id" : "1215d861-e6fe-4e72-a9cf-fe1773991562",
22+
"x-ms-keyvault-service-version" : "1.9.150.1",
23+
"Body" : "{\"key\":{\"kid\":\"https://azure-kv-tests2.vault.azure.net/keys/rotatekey75289f67/5cb8f2e87db44b68a5e05c6101b013ec\",\"kty\":\"RSA\",\"key_ops\":[\"encrypt\",\"decrypt\",\"sign\",\"verify\",\"wrapKey\",\"unwrapKey\"],\"n\":\"rslj1hJjpsE9B8Tl_1UwqZfQrgMWzfO3eHpdCBNBULnuMIvF5HQvq2HzuE_c85wQHGqW4asmQBpA00ER_bnV3KGCeUtjYA7h_B4s-Paht_Bgza7dxFVKhURBn9_teKXlzK3UNUgvzR_j_BsZKxU5ip2q40bcnzu3wtEQSqA6ToZqZtj55JfzYGDonHTGa76B4bwkc85z6pGz1tOh9rWoNp05uXm0fBGXRh0E0N2Rk7oo8NH_wNLCAV64x_1drP38bKh5QzDCntvVfoO6dF8bqQhbH6sksHdlSOf6ul8g2kL-IlPCj2NTSyANGyiFdHngKGZ9KnmUXvK9s6OBJagsMQ\",\"e\":\"AQAB\"},\"attributes\":{\"enabled\":true,\"created\":1634762497,\"updated\":1634762497,\"recoveryLevel\":\"Recoverable+Purgeable\",\"recoverableDays\":90}}",
2424
"Content-Type" : "application/json; charset=utf-8",
2525
"X-Powered-By" : "ASP.NET"
2626
},
2727
"Exception" : null
2828
}, {
2929
"Method" : "GET",
30-
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey50761673/rotationpolicy?api-version=7.3-preview",
30+
"Uri" : "https://REDACTED.vault.azure.net/keys/rotatekey75289f67/rotationpolicy?api-version=7.3-preview",
3131
"Headers" : {
3232
"User-Agent" : "azsdk-java-client_name/client_version (11.0.6; Windows 10; 10.0)"
3333
},
3434
"Response" : {
35-
"content-length" : "42",
35+
"content-length" : "106",
3636
"X-Content-Type-Options" : "nosniff",
3737
"Pragma" : "no-cache",
3838
"retry-after" : "0",
3939
"StatusCode" : "200",
40-
"Date" : "Tue, 05 Oct 2021 01:42:30 GMT",
40+
"Date" : "Wed, 20 Oct 2021 20:41:37 GMT",
4141
"Strict-Transport-Security" : "max-age=31536000;includeSubDomains",
4242
"Cache-Control" : "no-cache",
43-
"x-ms-keyvault-region" : "centralus",
43+
"x-ms-keyvault-region" : "westus",
4444
"x-ms-keyvault-network-info" : "conn_type=Ipv4;addr=174.127.169.154;act_addr_fam=InterNetwork;",
4545
"Expires" : "-1",
46-
"x-ms-request-id" : "196203e9-0201-435d-931b-2032ad3c1623",
47-
"x-ms-keyvault-service-version" : "1.9.132.3",
48-
"Body" : "{\"lifetimeActions\":null,\"attributes\":null}",
46+
"x-ms-request-id" : "bba0e397-587f-4d13-8a1d-4e6e6f1fe8cb",
47+
"x-ms-keyvault-service-version" : "1.9.150.1",
48+
"Body" : "{\"lifetimeActions\":[{\"trigger\":{\"timeBeforeExpiry\":\"P30D\"},\"action\":{\"type\":\"Notify\"}}],\"attributes\":null}",
4949
"Content-Type" : "application/json; charset=utf-8",
5050
"X-Powered-By" : "ASP.NET"
5151
},
5252
"Exception" : null
5353
} ],
54-
"variables" : [ "rotatekey50761673" ]
54+
"variables" : [ "rotatekey75289f67" ]
5555
}

0 commit comments

Comments
 (0)