diff --git a/google-cloud-kms/pom.xml b/google-cloud-kms/pom.xml index dc747378..033ec36f 100644 --- a/google-cloud-kms/pom.xml +++ b/google-cloud-kms/pom.xml @@ -17,17 +17,30 @@ google-cloud-kms + + io.grpc + grpc-core + 1.37.0 + + + io.grpc + grpc-netty-shaded + 1.37.0 + io.grpc grpc-api + 1.37.0 io.grpc grpc-stub + 1.37.0 io.grpc grpc-protobuf + 1.37.0 com.google.api @@ -53,10 +66,12 @@ com.google.api gax + 1.64.1-SNAPSHOT com.google.api gax-grpc + 1.64.1-SNAPSHOT org.threeten @@ -69,6 +84,7 @@ io.grpc grpc-auth + 1.37.0 com.google.api.grpc @@ -105,6 +121,7 @@ com.google.api gax-grpc + 1.64.1-SNAPSHOT testlib test @@ -133,4 +150,4 @@ - \ No newline at end of file + diff --git a/google-cloud-kms/src/main/java/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java b/google-cloud-kms/src/main/java/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java index 2e60f128..60464c2b 100644 --- a/google-cloud-kms/src/main/java/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java +++ b/google-cloud-kms/src/main/java/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java @@ -351,6 +351,11 @@ public static String getDefaultEndpoint() { return "cloudkms.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "cloudkms.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -852,6 +857,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/sampleTest.java b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/sampleTest.java new file mode 100644 index 00000000..284f0c17 --- /dev/null +++ b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/sampleTest.java @@ -0,0 +1,38 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.kms.v1; + +import static com.google.cloud.kms.v1.KeyManagementServiceClient.ListKeyRingsPagedResponse; + +import com.google.common.collect.Lists; + +import java.util.List; +import org.junit.Test; + +public class sampleTest { + + @Test + public void myTest() throws Exception { + KeyManagementServiceSettings settings = KeyManagementServiceSettings.newBuilder().build(); + KeyManagementServiceClient client = KeyManagementServiceClient.create(settings); + String project = "projects/sijunliu-dca-test/locations/global"; + + ListKeyRingsPagedResponse resp = client.listKeyRings(project); + List resources = Lists.newArrayList(resp.iterateAll()); + System.out.println(resources); + } +}