|
22 | 22 | import static com.google.cloud.storage.it.runner.registry.RegistryApplicabilityPredicate.transportAndBackendAre; |
23 | 23 |
|
24 | 24 | import com.google.api.gax.core.NoCredentialsProvider; |
| 25 | +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; |
25 | 26 | import com.google.cloud.NoCredentials; |
26 | 27 | import com.google.cloud.storage.BucketInfo; |
27 | 28 | import com.google.cloud.storage.BucketInfo.CustomPlacementConfig; |
|
41 | 42 | import com.google.storage.control.v2.StorageControlClient; |
42 | 43 | import com.google.storage.control.v2.StorageControlSettings; |
43 | 44 | import com.google.storage.control.v2.stub.StorageControlStubSettings; |
| 45 | +import io.grpc.ManagedChannelBuilder; |
44 | 46 | import java.io.IOException; |
45 | 47 | import java.net.URI; |
46 | 48 | import java.util.Locale; |
@@ -148,19 +150,23 @@ static BackendResources of( |
148 | 150 | StorageControlSettings.Builder builder; |
149 | 151 | switch (backend) { |
150 | 152 | case TEST_BENCH: |
151 | | - String baseUri = Registry.getInstance().testBench().getBaseUri(); |
| 153 | + String baseUri = Registry.getInstance().testBench().getGRPCBaseUri(); |
152 | 154 | URI uri = URI.create(baseUri); |
153 | 155 | 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(); |
154 | 165 | builder = |
155 | 166 | StorageControlSettings.newBuilder() |
156 | 167 | .setCredentialsProvider(NoCredentialsProvider.create()) |
157 | 168 | .setEndpoint(endpoint) |
158 | | - .setTransportChannelProvider( |
159 | | - StorageControlStubSettings.defaultGrpcTransportProviderBuilder() |
160 | | - .setInterceptorProvider( |
161 | | - GrpcPlainRequestLoggingInterceptor.getInterceptorProvider()) |
162 | | - .setEndpoint(endpoint) |
163 | | - .build()); |
| 169 | + .setTransportChannelProvider(instantiatingGrpcChannelProvider); |
164 | 170 | break; |
165 | 171 | default: // PROD, java8 doesn't have exhaustive checking for enum switch |
166 | 172 | builder = |
|
0 commit comments