Skip to content

Commit c3592bc

Browse files
authored
test: update TEST_BENCH backend Storage control boostrapping to set the plain text format (#3263)
1 parent b52eac5 commit c3592bc

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/BackendResources.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static com.google.cloud.storage.it.runner.registry.RegistryApplicabilityPredicate.transportAndBackendAre;
2323

2424
import com.google.api.gax.core.NoCredentialsProvider;
25+
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2526
import com.google.cloud.NoCredentials;
2627
import com.google.cloud.storage.BucketInfo;
2728
import com.google.cloud.storage.BucketInfo.CustomPlacementConfig;
@@ -41,6 +42,7 @@
4142
import com.google.storage.control.v2.StorageControlClient;
4243
import com.google.storage.control.v2.StorageControlSettings;
4344
import com.google.storage.control.v2.stub.StorageControlStubSettings;
45+
import io.grpc.ManagedChannelBuilder;
4446
import java.io.IOException;
4547
import java.net.URI;
4648
import java.util.Locale;
@@ -148,19 +150,23 @@ static BackendResources of(
148150
StorageControlSettings.Builder builder;
149151
switch (backend) {
150152
case TEST_BENCH:
151-
String baseUri = Registry.getInstance().testBench().getBaseUri();
153+
String baseUri = Registry.getInstance().testBench().getGRPCBaseUri();
152154
URI uri = URI.create(baseUri);
153155
String endpoint = String.format(Locale.US, "%s:%d", uri.getHost(), uri.getPort());
156+
InstantiatingGrpcChannelProvider.Builder b =
157+
StorageControlStubSettings.defaultGrpcTransportProviderBuilder()
158+
.setInterceptorProvider(
159+
GrpcPlainRequestLoggingInterceptor.getInterceptorProvider())
160+
.setEndpoint(endpoint);
161+
if (uri.getScheme().equals("http")) {
162+
b.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
163+
}
164+
InstantiatingGrpcChannelProvider instantiatingGrpcChannelProvider = b.build();
154165
builder =
155166
StorageControlSettings.newBuilder()
156167
.setCredentialsProvider(NoCredentialsProvider.create())
157168
.setEndpoint(endpoint)
158-
.setTransportChannelProvider(
159-
StorageControlStubSettings.defaultGrpcTransportProviderBuilder()
160-
.setInterceptorProvider(
161-
GrpcPlainRequestLoggingInterceptor.getInterceptorProvider())
162-
.setEndpoint(endpoint)
163-
.build());
169+
.setTransportChannelProvider(instantiatingGrpcChannelProvider);
164170
break;
165171
default: // PROD, java8 doesn't have exhaustive checking for enum switch
166172
builder =

0 commit comments

Comments
 (0)