zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 07:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update cloudkms_java with the non-beta version

Browse source 
Changed [] to use v1 instead of v1beta1, and replaced v1beta1 with v1 in all the java files.

If there is special build rules for open-source etc. that also need to be updated, or non "TAP-able" tests that need to be run, please check and see if they are OK.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=157895888
This commit is contained in:
guyben 2017-06-02 17:43:44 -07:00 • committed by Ben McIlwain
parent 3bbf356497
commit 75bb1aacdc
8 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/config/RegistryConfig.java
View file

@ -872,7 +872,7 @@ public final class RegistryConfig {
* The name to use for the Cloud KMS KeyRing containing encryption keys for Nomulus secrets. * The name to use for the Cloud KMS KeyRing containing encryption keys for Nomulus secrets.
* *
* @see <a * @see <a
* href="https://cloud.google.com/kms/docs/reference/rest/v1beta1/projects.locations.keyRings#KeyRing">projects.locations.keyRings</a> * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings#KeyRing">projects.locations.keyRings</a>
*/ */
@Provides @Provides
@Config("cloudKmsKeyRing") @Config("cloudKmsKeyRing")

2
java/google/registry/keyring/kms/EncryptResponse.java
View file

@ -25,7 +25,7 @@ import com.google.common.annotations.VisibleForTesting;
abstract class EncryptResponse { abstract class EncryptResponse {
static EncryptResponse create( 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( return new AutoValue_EncryptResponse(
cloudKmsEncryptResponse.getCiphertext(), cloudKmsEncryptResponse.getName()); cloudKmsEncryptResponse.getCiphertext(), cloudKmsEncryptResponse.getName());
} }

2
java/google/registry/keyring/kms/KmsConnection.java
View file

@ -23,7 +23,7 @@ interface KmsConnection {
* The maximum allowable secret size, as set by Cloud KMS. * The maximum allowable secret size, as set by Cloud KMS.
* *
* @see <a * @see <a
* href="https://cloud.google.com/kms/docs/reference/rest/v1beta1/projects.locations.keyRings.cryptoKeys/encrypt#request-body">projects.locations.keyRings.cryptoKeys.encrypt</a> * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys/encrypt#request-body">projects.locations.keyRings.cryptoKeys.encrypt</a>
*/ */
int MAX_SECRET_SIZE_BYTES = 64 * 1024; int MAX_SECRET_SIZE_BYTES = 64 * 1024;

14
java/google/registry/keyring/kms/KmsConnectionImpl.java
View file

@ -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.googleapis.json.GoogleJsonResponseException;
import com.google.api.client.http.HttpStatusCodes; import com.google.api.client.http.HttpStatusCodes;
import com.google.api.services.cloudkms.v1beta1.CloudKMS; import com.google.api.services.cloudkms.v1.CloudKMS;
import com.google.api.services.cloudkms.v1beta1.model.CryptoKey; import com.google.api.services.cloudkms.v1.model.CryptoKey;
import com.google.api.services.cloudkms.v1beta1.model.CryptoKeyVersion; import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion;
import com.google.api.services.cloudkms.v1beta1.model.DecryptRequest; import com.google.api.services.cloudkms.v1.model.DecryptRequest;
import com.google.api.services.cloudkms.v1beta1.model.EncryptRequest; import com.google.api.services.cloudkms.v1.model.EncryptRequest;
import com.google.api.services.cloudkms.v1beta1.model.KeyRing; import com.google.api.services.cloudkms.v1.model.KeyRing;
import com.google.api.services.cloudkms.v1beta1.model.UpdateCryptoKeyPrimaryVersionRequest; import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest;
import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.Config;
import google.registry.keyring.api.KeyringException; import google.registry.keyring.api.KeyringException;
import google.registry.util.Retrier; import google.registry.util.Retrier;

4
java/google/registry/keyring/kms/KmsModule.java
View file

@ -17,8 +17,8 @@ package google.registry.keyring.kms;
import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpTransport; import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.JsonFactory; import com.google.api.client.json.JsonFactory;
import com.google.api.services.cloudkms.v1beta1.CloudKMS; import com.google.api.services.cloudkms.v1.CloudKMS;
import com.google.api.services.cloudkms.v1beta1.CloudKMSScopes; import com.google.api.services.cloudkms.v1.CloudKMSScopes;
import com.google.common.base.Function; import com.google.common.base.Function;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;

4
java/google/registry/model/server/KmsSecretRevision.java
View file

@ -62,7 +62,7 @@ public class KmsSecretRevision extends ImmutableObject {
* The name of the {@code cryptoKeyVersion} associated with this {@link KmsSecretRevision}. * The name of the {@code cryptoKeyVersion} associated with this {@link KmsSecretRevision}.
* *
* @see <a * @see <a
* href="https://cloud.google.com/kms/docs/reference/rest/v1beta1/projects.locations.keyRings.cryptoKeys.cryptoKeyVersions">projects.locations.keyRings.cryptoKeys.cryptoKeyVersions</a> * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys.cryptoKeyVersions">projects.locations.keyRings.cryptoKeys.cryptoKeyVersions</a>
*/ */
String kmsCryptoKeyVersionName; String kmsCryptoKeyVersionName;
@ -71,7 +71,7 @@ public class KmsSecretRevision extends ImmutableObject {
* KMS API. * KMS API.
* *
* @see <a * @see <a
* href="https://cloud.google.com/kms/docs/reference/rest/v1beta1/projects.locations.keyRings.cryptoKeys/encrypt">projects.locations.keyRings.cryptoKeys.encrypt</a> * href="https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys/encrypt">projects.locations.keyRings.cryptoKeys.encrypt</a>
*/ */
String encryptedValue; String encryptedValue;

6
java/google/registry/repositories.bzl
View file

@ -431,10 +431,10 @@ def com_google_apis_google_api_services_cloudkms():
java_import_external( java_import_external(
name = "com_google_apis_google_api_services_cloudkms", name = "com_google_apis_google_api_services_cloudkms",
licenses = ["notice"], # The Apache Software License, Version 2.0 licenses = ["notice"], # The Apache Software License, Version 2.0
jar_sha256 = "82e5995e9dd248d24edfeace90261c1be0e905ecbae0b2c5ee19bb06a3e7dfdf", jar_sha256 = "c73854bdbd67c26f030eda346c65fc68e5b252a54f662af1a041caea77333ba4",
jar_urls = [ 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://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/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/v1-rev12-1.22.0/google-api-services-cloudkms-v1-rev12-1.22.0.jar",
], ],
deps = ["@com_google_api_client"], deps = ["@com_google_api_client"],
) )

18
javatests/google/registry/keyring/kms/KmsConnectionImplTest.java
View file

@ -25,15 +25,15 @@ import static org.mockito.Mockito.when;
import com.google.api.client.googleapis.json.GoogleJsonResponseException; import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.client.http.HttpResponse; import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpResponseException; import com.google.api.client.http.HttpResponseException;
import com.google.api.services.cloudkms.v1beta1.CloudKMS; import com.google.api.services.cloudkms.v1.CloudKMS;
import com.google.api.services.cloudkms.v1beta1.model.CryptoKey; import com.google.api.services.cloudkms.v1.model.CryptoKey;
import com.google.api.services.cloudkms.v1beta1.model.CryptoKeyVersion; import com.google.api.services.cloudkms.v1.model.CryptoKeyVersion;
import com.google.api.services.cloudkms.v1beta1.model.DecryptRequest; import com.google.api.services.cloudkms.v1.model.DecryptRequest;
import com.google.api.services.cloudkms.v1beta1.model.DecryptResponse; import com.google.api.services.cloudkms.v1.model.DecryptResponse;
import com.google.api.services.cloudkms.v1beta1.model.EncryptRequest; import com.google.api.services.cloudkms.v1.model.EncryptRequest;
import com.google.api.services.cloudkms.v1beta1.model.EncryptResponse; import com.google.api.services.cloudkms.v1.model.EncryptResponse;
import com.google.api.services.cloudkms.v1beta1.model.KeyRing; import com.google.api.services.cloudkms.v1.model.KeyRing;
import com.google.api.services.cloudkms.v1beta1.model.UpdateCryptoKeyPrimaryVersionRequest; import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest;
import google.registry.testing.FakeClock; import google.registry.testing.FakeClock;
import google.registry.testing.FakeSleeper; import google.registry.testing.FakeSleeper;
import google.registry.util.Retrier; import google.registry.util.Retrier;