Skip to content

Commit 0d10c48

Browse files
igorbernstein2igorbernstein2
authored
---
yaml --- r: 13823 b: refs/heads/autosynth-logging c: 9902978 h: refs/heads/master i: 13821: 2aac186 13819: a023b41 13815: e06ad7e 13807: 6a67ecd 13791: e27d584 13759: 6c535ae 13695: dc76dea 13567: 2805c74 13311: c328764
1 parent cd48a93 commit 0d10c48

5 files changed

Lines changed: 77 additions & 4 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
105105
refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
106106
refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
107107
refs/heads/autosynth-dlp: 90e4efe3be392e89dc36bce22afab981a905b1bc
108-
refs/heads/autosynth-logging: e6cf8d32987d8ef72a2f8be3116f8db7e02bab6d
108+
refs/heads/autosynth-logging: 990297839d0ddd1d2b1be08b6fe01cc54e8a2933
109109
refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
110110
refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
111111
refs/tags/v0.64.0: 456e8fbd129deced3ca025f239a2d8a82bde1d0a

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.google.cloud.bigtable.admin.v2;
1717

18+
import com.google.api.gax.core.CredentialsProvider;
1819
import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStubSettings;
1920
import com.google.common.base.Preconditions;
2021
import com.google.common.base.Verify;
@@ -60,6 +61,11 @@ public String getProjectId() {
6061
return projectId;
6162
}
6263

64+
/** Gets the CredentialsProvider to use for getting the credentials to make calls with. */
65+
public CredentialsProvider getCredentialsProvider() {
66+
return stubSettings.getCredentialsProvider();
67+
}
68+
6369
/** Gets the underlying RPC settings. */
6470
@Nonnull
6571
public BigtableInstanceAdminStubSettings getStubSettings() {
@@ -103,6 +109,18 @@ public String getProjectId() {
103109
return projectId;
104110
}
105111

112+
/** Sets the CredentialsProvider to use for getting the credentials to make calls with. */
113+
public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
114+
stubSettings.setCredentialsProvider(credentialsProvider);
115+
116+
return this;
117+
}
118+
119+
/** Gets the CredentialsProvider to use for getting the credentials to make calls with. */
120+
public CredentialsProvider getCredentialsProvider() {
121+
return stubSettings.getCredentialsProvider();
122+
}
123+
106124
/**
107125
* Returns the builder for the settings used for all RPCs.
108126
*

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.google.cloud.bigtable.admin.v2;
1717

1818
import com.google.api.core.ApiFunction;
19+
import com.google.api.gax.core.CredentialsProvider;
1920
import com.google.api.gax.core.NoCredentialsProvider;
2021
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2122
import com.google.cloud.bigtable.admin.v2.stub.BigtableTableAdminStubSettings;
@@ -68,6 +69,11 @@ public String getInstanceId() {
6869
return instanceId;
6970
}
7071

72+
/** Gets the CredentialsProvider to use for getting the credentials to make calls with. */
73+
public CredentialsProvider getCredentialsProvider() {
74+
return stubSettings.getCredentialsProvider();
75+
}
76+
7177
/** Gets the underlying RPC settings. */
7278
public BigtableTableAdminStubSettings getStubSettings() {
7379
return stubSettings;
@@ -148,6 +154,17 @@ public String getInstanceId() {
148154
return instanceId;
149155
}
150156

157+
/** Sets the CredentialsProvider to use for getting the credentials to make calls with. */
158+
public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
159+
stubSettings.setCredentialsProvider(credentialsProvider);
160+
return this;
161+
}
162+
163+
/** Gets the CredentialsProvider to use for getting the credentials to make calls with. */
164+
public CredentialsProvider getCredentialsProvider() {
165+
return stubSettings.getCredentialsProvider();
166+
}
167+
151168
/**
152169
* Returns the builder for the settings used for all RPCs.
153170
*

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717

1818
import static com.google.common.truth.Truth.assertThat;
1919

20+
import com.google.api.gax.core.CredentialsProvider;
2021
import com.google.api.gax.rpc.StatusCode.Code;
21-
import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminSettings.Builder;
2222
import java.io.IOException;
2323
import org.junit.Test;
24+
import org.mockito.Mockito;
2425

2526
public class BigtableInstanceAdminSettingsTest {
2627
@Test
2728
public void testProjectName() throws Exception {
2829
String projectId = "my-project";
29-
Builder builder = BigtableInstanceAdminSettings.newBuilder().setProjectId(projectId);
30+
BigtableInstanceAdminSettings.Builder builder =
31+
BigtableInstanceAdminSettings.newBuilder().setProjectId(projectId);
3032

3133
assertThat(builder.getProjectId()).isEqualTo(projectId);
3234
assertThat(builder.build().getProjectId()).isEqualTo(projectId);
@@ -37,7 +39,8 @@ public void testProjectName() throws Exception {
3739
public void testMissingProjectName() {
3840
Exception actualException = null;
3941

40-
Builder settingsBuilder = BigtableInstanceAdminSettings.newBuilder();
42+
BigtableInstanceAdminSettings.Builder settingsBuilder =
43+
BigtableInstanceAdminSettings.newBuilder();
4144
assertThat(settingsBuilder.getProjectId()).isNull();
4245

4346
try {
@@ -49,6 +52,22 @@ public void testMissingProjectName() {
4952
assertThat(actualException).isInstanceOf(NullPointerException.class);
5053
}
5154

55+
@Test
56+
public void testCredentials() throws IOException {
57+
CredentialsProvider credentialsProvider = Mockito.mock(CredentialsProvider.class);
58+
59+
BigtableInstanceAdminSettings settings =
60+
BigtableInstanceAdminSettings.newBuilder()
61+
.setProjectId("my-project")
62+
.setCredentialsProvider(credentialsProvider)
63+
.build();
64+
65+
assertThat(settings.getCredentialsProvider()).isSameAs(credentialsProvider);
66+
assertThat(settings.getStubSettings().getCredentialsProvider()).isSameAs(credentialsProvider);
67+
assertThat(settings.toBuilder().getCredentialsProvider()).isSameAs(credentialsProvider);
68+
assertThat(settings.toBuilder().build().getCredentialsProvider()).isSameAs(credentialsProvider);
69+
}
70+
5271
@Test
5372
public void testStubSettings() throws IOException {
5473
String projectId = "my-project";

‎branches/autosynth-logging/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import static com.google.common.truth.Truth.assertThat;
1919

20+
import com.google.api.gax.core.CredentialsProvider;
2021
import com.google.api.gax.rpc.StatusCode.Code;
2122
import java.io.IOException;
2223
import org.junit.Test;
24+
import org.mockito.Mockito;
2325

2426
public class BigtableTableAdminSettingsTest {
2527

@@ -51,6 +53,23 @@ public void testMissingInstanceName() {
5153
assertThat(actualException).isInstanceOf(NullPointerException.class);
5254
}
5355

56+
@Test
57+
public void testCredentials() throws IOException {
58+
CredentialsProvider credentialsProvider = Mockito.mock(CredentialsProvider.class);
59+
60+
BigtableTableAdminSettings settings =
61+
BigtableTableAdminSettings.newBuilder()
62+
.setProjectId("my-project")
63+
.setInstanceId("my-instance")
64+
.setCredentialsProvider(credentialsProvider)
65+
.build();
66+
67+
assertThat(settings.getCredentialsProvider()).isSameAs(credentialsProvider);
68+
assertThat(settings.getStubSettings().getCredentialsProvider()).isSameAs(credentialsProvider);
69+
assertThat(settings.toBuilder().getCredentialsProvider()).isSameAs(credentialsProvider);
70+
assertThat(settings.toBuilder().build().getCredentialsProvider()).isSameAs(credentialsProvider);
71+
}
72+
5473
@Test
5574
public void testStubSettings() throws IOException {
5675
BigtableTableAdminSettings.Builder builder =

0 commit comments

Comments
 (0)