diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 569d7f02f..6ee928584 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -872,7 +872,7 @@ public final class RegistryConfig { * The name to use for the Cloud KMS KeyRing containing encryption keys for Nomulus secrets. * * @see projects.locations.keyRings + * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings#KeyRing">projects.locations.keyRings */ @Provides @Config("cloudKmsKeyRing") diff --git a/java/google/registry/keyring/kms/EncryptResponse.java b/java/google/registry/keyring/kms/EncryptResponse.java index c67ae1b7d..a4dee2718 100644 --- a/java/google/registry/keyring/kms/EncryptResponse.java +++ b/java/google/registry/keyring/kms/EncryptResponse.java @@ -25,7 +25,7 @@ import com.google.common.annotations.VisibleForTesting; abstract class EncryptResponse { static EncryptResponse create( - com.google.api.services.cloudkms.v1beta1.model.EncryptResponse cloudKmsEncryptResponse) { + com.google.api.services.cloudkms.v1.model.EncryptResponse cloudKmsEncryptResponse) { return new AutoValue_EncryptResponse( cloudKmsEncryptResponse.getCiphertext(), cloudKmsEncryptResponse.getName()); } diff --git a/java/google/registry/keyring/kms/KmsConnection.java b/java/google/registry/keyring/kms/KmsConnection.java index b92e0e8f8..c508a8f3b 100644 --- a/java/google/registry/keyring/kms/KmsConnection.java +++ b/java/google/registry/keyring/kms/KmsConnection.java @@ -23,7 +23,7 @@ interface KmsConnection { * The maximum allowable secret size, as set by Cloud KMS. * * @see projects.locations.keyRings.cryptoKeys.encrypt + * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys/encrypt#request-body">projects.locations.keyRings.cryptoKeys.encrypt */ int MAX_SECRET_SIZE_BYTES = 64 * 1024; diff --git a/java/google/registry/keyring/kms/KmsConnectionImpl.java b/java/google/registry/keyring/kms/KmsConnectionImpl.java index 14a23625a..480e02ee1 100644 --- a/java/google/registry/keyring/kms/KmsConnectionImpl.java +++ b/java/google/registry/keyring/kms/KmsConnectionImpl.java @@ -18,13 +18,13 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.http.HttpStatusCodes; -import com.google.api.services.cloudkms.v1beta1.CloudKMS; -import com.google.api.services.cloudkms.v1beta1.model.CryptoKey; -import com.google.api.services.cloudkms.v1beta1.model.CryptoKeyVersion; -import com.google.api.services.cloudkms.v1beta1.model.DecryptRequest; -import com.google.api.services.cloudkms.v1beta1.model.EncryptRequest; -import com.google.api.services.cloudkms.v1beta1.model.KeyRing; -import com.google.api.services.cloudkms.v1beta1.model.UpdateCryptoKeyPrimaryVersionRequest; +import com.google.api.services.cloudkms.v1.CloudKMS; +import com.google.api.services.cloudkms.v1.model.CryptoKey; +import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion; +import com.google.api.services.cloudkms.v1.model.DecryptRequest; +import com.google.api.services.cloudkms.v1.model.EncryptRequest; +import com.google.api.services.cloudkms.v1.model.KeyRing; +import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest; import google.registry.config.RegistryConfig.Config; import google.registry.keyring.api.KeyringException; import google.registry.util.Retrier; diff --git a/java/google/registry/keyring/kms/KmsModule.java b/java/google/registry/keyring/kms/KmsModule.java index 17576b17d..ac6d548df 100644 --- a/java/google/registry/keyring/kms/KmsModule.java +++ b/java/google/registry/keyring/kms/KmsModule.java @@ -17,8 +17,8 @@ package google.registry.keyring.kms; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.services.cloudkms.v1beta1.CloudKMS; -import com.google.api.services.cloudkms.v1beta1.CloudKMSScopes; +import com.google.api.services.cloudkms.v1.CloudKMS; +import com.google.api.services.cloudkms.v1.CloudKMSScopes; import com.google.common.base.Function; import dagger.Module; import dagger.Provides; diff --git a/java/google/registry/model/server/KmsSecretRevision.java b/java/google/registry/model/server/KmsSecretRevision.java index 4043774e2..a0b4b3b14 100644 --- a/java/google/registry/model/server/KmsSecretRevision.java +++ b/java/google/registry/model/server/KmsSecretRevision.java @@ -62,7 +62,7 @@ public class KmsSecretRevision extends ImmutableObject { * The name of the {@code cryptoKeyVersion} associated with this {@link KmsSecretRevision}. * * @see projects.locations.keyRings.cryptoKeys.cryptoKeyVersions + * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys.cryptoKeyVersions">projects.locations.keyRings.cryptoKeys.cryptoKeyVersions */ String kmsCryptoKeyVersionName; @@ -71,7 +71,7 @@ public class KmsSecretRevision extends ImmutableObject { * KMS API. * * @see projects.locations.keyRings.cryptoKeys.encrypt + * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys/encrypt">projects.locations.keyRings.cryptoKeys.encrypt */ String encryptedValue; diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 39c3a1703..664d7c82c 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -431,10 +431,10 @@ def com_google_apis_google_api_services_cloudkms(): java_import_external( name = "com_google_apis_google_api_services_cloudkms", licenses = ["notice"], # The Apache Software License, Version 2.0 - jar_sha256 = "82e5995e9dd248d24edfeace90261c1be0e905ecbae0b2c5ee19bb06a3e7dfdf", + jar_sha256 = "c73854bdbd67c26f030eda346c65fc68e5b252a54f662af1a041caea77333ba4", jar_urls = [ - "http://domain-registry-maven.storage.googleapis.com/repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms/v1beta1-rev409-1.22.0/google-api-services-cloudkms-v1beta1-rev409-1.22.0.jar", - "http://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms/v1beta1-rev409-1.22.0/google-api-services-cloudkms-v1beta1-rev409-1.22.0.jar", + "http://domain-registry-maven.storage.googleapis.com/repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms/v1-rev12-1.22.0/google-api-services-cloudkms-v1-rev12-1.22.0.jar", + "http://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms/v1-rev12-1.22.0/google-api-services-cloudkms-v1-rev12-1.22.0.jar", ], deps = ["@com_google_api_client"], ) diff --git a/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java b/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java index 6f034e71a..c752ca6ed 100644 --- a/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java +++ b/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java @@ -25,15 +25,15 @@ import static org.mockito.Mockito.when; import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.http.HttpResponse; import com.google.api.client.http.HttpResponseException; -import com.google.api.services.cloudkms.v1beta1.CloudKMS; -import com.google.api.services.cloudkms.v1beta1.model.CryptoKey; -import com.google.api.services.cloudkms.v1beta1.model.CryptoKeyVersion; -import com.google.api.services.cloudkms.v1beta1.model.DecryptRequest; -import com.google.api.services.cloudkms.v1beta1.model.DecryptResponse; -import com.google.api.services.cloudkms.v1beta1.model.EncryptRequest; -import com.google.api.services.cloudkms.v1beta1.model.EncryptResponse; -import com.google.api.services.cloudkms.v1beta1.model.KeyRing; -import com.google.api.services.cloudkms.v1beta1.model.UpdateCryptoKeyPrimaryVersionRequest; +import com.google.api.services.cloudkms.v1.CloudKMS; +import com.google.api.services.cloudkms.v1.model.CryptoKey; +import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion; +import com.google.api.services.cloudkms.v1.model.DecryptRequest; +import com.google.api.services.cloudkms.v1.model.DecryptResponse; +import com.google.api.services.cloudkms.v1.model.EncryptRequest; +import com.google.api.services.cloudkms.v1.model.EncryptResponse; +import com.google.api.services.cloudkms.v1.model.KeyRing; +import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; import google.registry.util.Retrier;