diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml index 8504df3fa41d..ca12314b811c 100755 --- a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml +++ b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -356,7 +356,6 @@ the main ServiceBusClientBuilder. --> - diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index b0d301c1dec3..e05d4d4479a8 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -214,17 +214,17 @@ com.azure azure-security-keyvault-certificates - 4.2.0-beta.1 + 4.1.5 com.azure azure-security-keyvault-keys - 4.3.0-beta.1 + 4.2.5 com.azure azure-security-keyvault-secrets - 4.3.0-beta.1 + 4.2.5 com.azure diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 18e7b04b306e..a4f523f93827 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -181,8 +181,6 @@ jobs: name: ${{ parameters.LinuxPool }} steps: - - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml - - pwsh: | $(Build.SourcesDirectory)/eng/versioning/pom_file_version_scanner.ps1 displayName: "Verify versions in POM files" diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 3e93151057d5..8bd6a8ed39e5 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -87,9 +87,9 @@ com.azure:azure-quantum-jobs;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-search-documents;11.2.0;11.3.0-beta.1 com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0-beta.2 -com.azure:azure-security-keyvault-certificates;4.1.3;4.1.4 -com.azure:azure-security-keyvault-keys;4.2.3;4.2.4 -com.azure:azure-security-keyvault-secrets;4.2.3;4.2.4 +com.azure:azure-security-keyvault-certificates;4.1.4;4.1.5 +com.azure:azure-security-keyvault-keys;4.2.4;4.2.5 +com.azure:azure-security-keyvault-secrets;4.2.4;4.2.5 com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.16 com.azure:azure-spring-data-cosmos;3.4.0;3.5.0-beta.1 com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml deleted file mode 100644 index 0046ce0ab356..000000000000 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - com.azure - azure-client-sdk-parent - 1.7.0 - ../../parents/azure-client-sdk-parent - - 4.0.0 - - com.azure.spring - azure-spring-cloud-appconfiguration-config - 1.2.8-beta.1 - Azure Spring Cloud App Configuration Config - Integration of Spring Cloud Config and Azure App Configuration Service - - - - org.springframework.boot - spring-boot-autoconfigure-processor - 2.3.5.RELEASE - - - org.springframework.boot - spring-boot-autoconfigure - 2.3.5.RELEASE - - - org.springframework.boot - spring-boot-configuration-processor - 2.3.5.RELEASE - true - - - org.springframework.cloud - spring-cloud-context - 2.2.5.RELEASE - - - com.fasterxml.jackson.core - jackson-annotations - 2.11.3 - - - com.fasterxml.jackson.core - jackson-databind - 2.11.3 - - - org.springframework - spring-web - 5.2.10.RELEASE - - - - com.azure - azure-core - 1.12.0 - - - com.azure - azure-data-appconfiguration - 1.2.0-beta.1 - - - com.azure - azure-identity - 1.2.2 - - - com.azure - azure-security-keyvault-secrets - 4.2.4 - - - com.azure - azure-core-http-netty - 1.7.1 - - - org.hibernate.validator - hibernate-validator - 6.1.6.Final - - - org.apache.commons - commons-lang3 - 3.10 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.springframework.boot - spring-boot-actuator-autoconfigure - 2.3.5.RELEASE - - - junit - junit - 4.13.1 - test - - - org.mockito - mockito-core - 3.3.3 - test - - - org.springframework.boot - spring-boot-starter-test - 2.3.5.RELEASE - test - - - org.powermock - powermock-module-junit4 - 2.0.2 - test - - - org.powermock - powermock-api-mockito2 - 2.0.2 - test - - - - com.google.code.findbugs - jsr305 - 3.0.2 - provided - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - - - com.fasterxml.jackson.core:jackson-annotations:[2.11.3] - com.fasterxml.jackson.core:jackson-databind:[2.11.3] - javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.10] - org.apache.httpcomponents:httpclient:[4.5.13] - org.hibernate.validator:hibernate-validator:[6.1.6.Final] - org.springframework.boot:spring-boot-autoconfigure-processor:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-autoconfigure:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.cloud:spring-cloud-context:[2.2.5.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - true - true - - - - - - - diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index ebd2029d5392..6482549a9662 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -38,17 +38,17 @@ com.azure azure-security-keyvault-keys - 4.3.0-beta.1 + 4.2.5 com.azure azure-security-keyvault-secrets - 4.3.0-beta.1 + 4.2.5 com.azure azure-security-keyvault-certificates - 4.2.0-beta.1 + 4.1.5 org.slf4j diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md index b84b82aeabe8..41ab9e533aa8 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md @@ -1,7 +1,12 @@ # Release History -## 4.2.0-beta.1 (Unreleased) +## 4.1.5 (2021-02-11) +### Dependency Updates +- Upgraded `azure-core` dependency to `1.13.0` +- Upgraded `azure-core-http-netty` dependency to `1.8.0` +- Upgraded `azure-core-http-okhttp` dependency to `1.5.0` +- Upgraded `azure-identity` dependency to `1.2.3` ## 4.1.4 (2021-01-15) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/README.md b/sdk/keyvault/azure-security-keyvault-certificates/README.md index 7a6e348e67bf..8f1e5ce582d5 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/README.md +++ b/sdk/keyvault/azure-security-keyvault-certificates/README.md @@ -14,7 +14,7 @@ Maven dependency for the Azure Key Vault Certificate client library. Add it to y com.azure azure-security-keyvault-certificates - 4.1.4 + 4.1.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 022fdc990753..182be434cbb1 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -12,7 +12,7 @@ com.azure azure-security-keyvault-certificates - 4.2.0-beta.1 + 4.1.5 Microsoft Azure client library for KeyVault Certificates This module contains client library for Microsoft Azure KeyVault Certificates. diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateAsyncClient.java b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateAsyncClient.java index 652fcf1e78ae..01651da32930 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateAsyncClient.java +++ b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateAsyncClient.java @@ -130,6 +130,7 @@ Duration getDefaultPollingInterval() { * @throws ResourceModifiedException when invalid certificate policy configuration is provided. * @return A {@link PollerFlux} polling on the create certificate operation status. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginCreateCertificate(String certificateName, CertificatePolicy policy, Boolean isEnabled, Map tags) { return new PollerFlux<>(getDefaultPollingInterval(), activationOperation(certificateName, policy, isEnabled, tags), @@ -245,6 +246,7 @@ Mono> createCertificateWithResponse(String certif * @throws ResourceNotFoundException when a certificate operation for a certificate with {@code certificateName} doesn't exist. * @return A {@link PollerFlux} polling on the certificate operation status. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux getCertificateOperation(String certificateName) { return new PollerFlux<>(getDefaultPollingInterval(), (pollingContext) -> Mono.empty(), @@ -450,7 +452,7 @@ Mono> updateCertificatePropertiesWithResponse(Cert * @throws HttpResponseException when a certificate with {@code certificateName} is empty string. * @return A {@link PollerFlux} to poll on the {@link DeletedCertificate deleted certificate}. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginDeleteCertificate(String certificateName) { return new PollerFlux<>(getDefaultPollingInterval(), activationOperation(certificateName), @@ -631,7 +633,7 @@ Mono> purgeDeletedCertificateWithResponse(String certificateName, * @throws HttpResponseException when a certificate with {@code certificateName} is empty string. * @return A {@link PollerFlux} to poll on the {@link KeyVaultCertificate recovered certificate}. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginRecoverDeletedCertificate(String certificateName) { return new PollerFlux<>(getDefaultPollingInterval(), recoverActivationOperation(certificateName), diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClient.java b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClient.java index b088d44d305e..8ca184bf2982 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClient.java +++ b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/CertificateClient.java @@ -88,7 +88,7 @@ public String getVaultUrl() { * @throws ResourceModifiedException when invalid certificate policy configuration is provided. * @return A {@link SyncPoller} to poll on the create certificate operation status. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginCreateCertificate(String certificateName, CertificatePolicy policy, Boolean isEnabled, Map tags) { return client.beginCreateCertificate(certificateName, policy, isEnabled, tags).getSyncPoller(); } @@ -108,7 +108,7 @@ public SyncPoller beginCrea * @throws ResourceModifiedException when invalid certificate policy configuration is provided. * @return A {@link SyncPoller} to poll on the create certificate operation status. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginCreateCertificate(String certificateName, CertificatePolicy policy) { return client.beginCreateCertificate(certificateName, policy).getSyncPoller(); } @@ -126,7 +126,7 @@ public SyncPoller beginCrea * @throws ResourceNotFoundException when a certificate operation for a certificate with {@code certificateName} doesn't exist. * @return A {@link SyncPoller} to poll on the certificate operation status. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller getCertificateOperation(String certificateName) { return client.getCertificateOperation(certificateName).getSyncPoller(); } @@ -268,7 +268,7 @@ public Response updateCertificatePropertiesWithResponse(Cer * @throws HttpRequestException when a certificate with {@code certificateName} is empty string. * @return A {@link SyncPoller} to poll on and retrieve {@link DeletedCertificate deleted certificate}. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginDeleteCertificate(String certificateName) { return client.beginDeleteCertificate(certificateName).getSyncPoller(); } @@ -372,7 +372,7 @@ public Response purgeDeletedCertificateWithResponse(String certificateName * @throws HttpRequestException when a certificate with {@code certificateName} is empty string. * @return A {@link SyncPoller} to poll on and retrieve {@link KeyVaultCertificateWithPolicy recovered certificate}. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginRecoverDeletedCertificate(String certificateName) { return client.beginRecoverDeletedCertificate(certificateName).getSyncPoller(); } diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md index 9c3d5e74050d..e1b370849123 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md @@ -1,7 +1,15 @@ # Release History -## 4.3.0-beta.1 (Unreleased) +## 4.2.5 (2021-02-11) +### Bug Fixes +- Fixed issue where cryptographic operations would be attempted locally for symmetric keys that were missing their key material ('k' component). + +### Dependency Updates +- Upgraded `azure-core` dependency to `1.13.0` +- Upgraded `azure-core-http-netty` dependency to `1.8.0` +- Upgraded `azure-core-http-okhttp` dependency to `1.5.0` +- Upgraded `azure-identity` dependency to `1.2.3` ## 4.2.4 (2021-01-15) diff --git a/sdk/keyvault/azure-security-keyvault-keys/README.md b/sdk/keyvault/azure-security-keyvault-keys/README.md index 7d3dc22f5f30..de36b8084246 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/README.md +++ b/sdk/keyvault/azure-security-keyvault-keys/README.md @@ -14,7 +14,7 @@ Maven dependency for the Azure Key Vault Key client library. Add it to your proj com.azure azure-security-keyvault-keys - 4.2.4 + 4.2.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 96c5c9273d69..e35cd098e46e 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -14,7 +14,7 @@ com.azure azure-security-keyvault-keys - 4.3.0-beta.1 + 4.2.5 Microsoft Azure client library for KeyVault Keys This module contains client library for Microsoft Azure KeyVault Keys. diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java index bed0b99c1a2b..9581618a449f 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java @@ -689,7 +689,7 @@ Mono> updateKeyPropertiesWithResponse(KeyProperties keyPro * @throws ResourceNotFoundException when a key with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a key with {@code name} is empty string. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginDeleteKey(String name) { return new PollerFlux<>(getDefaultPollingInterval(), activationOperation(name), @@ -866,7 +866,7 @@ Mono> purgeDeletedKeyWithResponse(String name, Context context) { * @throws ResourceNotFoundException when a key with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a key with {@code name} is empty string. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginRecoverDeletedKey(String name) { return new PollerFlux<>(getDefaultPollingInterval(), recoverActivationOperation(name), diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java index cc011943414b..722c2bbaaaf2 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java @@ -3,6 +3,8 @@ package com.azure.security.keyvault.keys; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceMethod; import com.azure.core.exception.HttpResponseException; import com.azure.core.exception.ResourceModifiedException; import com.azure.core.exception.ResourceNotFoundException; @@ -444,6 +446,7 @@ public Response updateKeyPropertiesWithResponse(KeyProperties keyPr * @throws ResourceNotFoundException when a key with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a key with {@code name} is empty string. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginDeleteKey(String name) { return client.beginDeleteKey(name).getSyncPoller(); } @@ -540,6 +543,7 @@ public Response purgeDeletedKeyWithResponse(String name, Context context) * @throws ResourceNotFoundException when a key with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a key with {@code name} is empty string. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginRecoverDeletedKey(String name) { return client.beginRecoverDeletedKey(name).getSyncPoller(); } diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md index c9e104dbc7d1..cee96d2e0dd7 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md @@ -1,7 +1,12 @@ # Release History -## 4.3.0-beta.1 (Unreleased) +## 4.2.5 (2021-02-11) +### Dependency Updates +- Upgraded `azure-core` dependency to `1.13.0` +- Upgraded `azure-core-http-netty` dependency to `1.8.0` +- Upgraded `azure-core-http-okhttp` dependency to `1.5.0` +- Upgraded `azure-identity` dependency to `1.2.3` ## 4.2.4 (2021-01-15) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/README.md b/sdk/keyvault/azure-security-keyvault-secrets/README.md index d86dd6672a2c..573523bc5d0f 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/README.md +++ b/sdk/keyvault/azure-security-keyvault-secrets/README.md @@ -16,7 +16,7 @@ Maven dependency for the Azure Key Vault Secrets client library. Add it to your com.azure azure-security-keyvault-secrets - 4.2.4 + 4.2.5 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 7c3a65f4068f..52097a5decd4 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -11,7 +11,7 @@ com.azure azure-security-keyvault-secrets - 4.3.0-beta.1 + 4.2.5 Microsoft Azure client library for KeyVault Secrets This module contains client library for Microsoft Azure KeyVault Secrets. diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java index 29bc6fdc2f7a..1f5d749fcb10 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java +++ b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java @@ -395,7 +395,7 @@ Mono> updateSecretPropertiesWithResponse(SecretProper * @throws ResourceNotFoundException when a secret with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a secret with {@code name} is empty string. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginDeleteSecret(String name) { return new PollerFlux<>(getDefaultPollingInterval(), activationOperation(name), @@ -567,7 +567,7 @@ Mono> purgeDeletedSecretWithResponse(String name, Context context * @throws ResourceNotFoundException when a secret with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a secret with {@code name} is empty string. */ - @ServiceMethod(returns = ReturnType.SINGLE) + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public PollerFlux beginRecoverDeletedSecret(String name) { return new PollerFlux<>(getDefaultPollingInterval(), recoverActivationOperation(name), diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java index 4e3c0aca8202..e2c56b7d2aef 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java +++ b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java @@ -3,6 +3,8 @@ package com.azure.security.keyvault.secrets; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceMethod; import com.azure.core.exception.HttpResponseException; import com.azure.core.exception.ResourceModifiedException; import com.azure.core.exception.ResourceNotFoundException; @@ -238,6 +240,7 @@ public SecretProperties updateSecretProperties(SecretProperties secretProperties * @throws ResourceNotFoundException when a secret with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a secret with {@code name} is empty string. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginDeleteSecret(String name) { return client.beginDeleteSecret(name).getSyncPoller(); } @@ -331,6 +334,7 @@ public Response purgeDeletedSecretWithResponse(String name, Context contex * @throws ResourceNotFoundException when a secret with {@code name} doesn't exist in the key vault. * @throws HttpResponseException when a secret with {@code name} is empty string. */ + @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) public SyncPoller beginRecoverDeletedSecret(String name) { return client.beginRecoverDeletedSecret(name).getSyncPoller(); } diff --git a/sdk/keyvault/pom.xml b/sdk/keyvault/pom.xml index 3138b87c93b1..3d978d10f8d6 100644 --- a/sdk/keyvault/pom.xml +++ b/sdk/keyvault/pom.xml @@ -21,17 +21,17 @@ com.azure azure-security-keyvault-certificates - 4.2.0-beta.1 + 4.1.5 com.azure azure-security-keyvault-keys - 4.3.0-beta.1 + 4.2.5 com.azure azure-security-keyvault-secrets - 4.3.0-beta.1 + 4.2.5