Skip to content

Rename BigQueryProxyConfig properties names #17638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2023
Merged

Rename BigQueryProxyConfig properties names #17638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryProxyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public BigQueryProxyConfig setPassword(String password)
return Optional.ofNullable(keystorePath);
}

@Config("bigquery.rpc-proxy.key-store-path")
@Config("bigquery.rpc-proxy.keystore-path")
@ConfigDescription("Path to a Java keystore file")
public BigQueryProxyConfig setKeystorePath(File keystorePath)
{
Expand All @@ -100,7 +100,7 @@ public Optional<String> getKeystorePassword()
return Optional.ofNullable(keystorePassword);
}

@Config("bigquery.rpc-proxy.key-store-password")
@Config("bigquery.rpc-proxy.keystore-password")
@ConfigDescription("Password to a Java keystore file")
@ConfigSecuritySensitive
public BigQueryProxyConfig setKeystorePassword(String keystorePassword)
Expand All @@ -114,7 +114,7 @@ public BigQueryProxyConfig setKeystorePassword(String keystorePassword)
return Optional.ofNullable(truststorePath);
}

@Config("bigquery.rpc-proxy.trust-store-path")
@Config("bigquery.rpc-proxy.truststore-path")
@ConfigDescription("Path to a Java truststore file")
public BigQueryProxyConfig setTruststorePath(File truststorePath)
{
Expand All @@ -127,7 +127,7 @@ public Optional<String> getTruststorePassword()
return Optional.ofNullable(truststorePassword);
}

@Config("bigquery.rpc-proxy.trust-store-password")
@Config("bigquery.rpc-proxy.truststore-password")
@ConfigDescription("Password to a Java truststore file")
@ConfigSecuritySensitive
public BigQueryProxyConfig setTruststorePassword(String truststorePassword)
Expand Down
8 changes: 4 additions & 4 deletions plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/TestBigQueryProxyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public void testExplicitPropertyMappings()
.put("bigquery.rpc-proxy.uri", "http://localhost:8000")
.put("bigquery.rpc-proxy.username", "username")
.put("bigquery.rpc-proxy.password", "password")
.put("bigquery.rpc-proxy.trust-store-path", truststoreFile.toString())
.put("bigquery.rpc-proxy.trust-store-password", "password-truststore")
.put("bigquery.rpc-proxy.key-store-path", keystoreFile.toString())
.put("bigquery.rpc-proxy.key-store-password", "password-keystore")
.put("bigquery.rpc-proxy.truststore-path", truststoreFile.toString())
.put("bigquery.rpc-proxy.truststore-password", "password-truststore")
.put("bigquery.rpc-proxy.keystore-path", keystoreFile.toString())
.put("bigquery.rpc-proxy.keystore-password", "password-keystore")
.buildOrThrow();

BigQueryProxyConfig expected = new BigQueryProxyConfig()
Expand Down
4 changes: 2 additions & 2 deletions ...query/src/test/java/io/trino/plugin/bigquery/TestBigQueryWithProxyConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ protected QueryRunner createQueryRunner()
ImmutableMap.of(
"bigquery.rpc-proxy.enabled", "true",
"bigquery.rpc-proxy.uri", proxy.getProxyEndpoint(),
"bigquery.rpc-proxy.trust-store-path", fromResources("proxy/truststore.jks").getAbsolutePath(),
"bigquery.rpc-proxy.trust-store-password", "123456"),
"bigquery.rpc-proxy.truststore-path", fromResources("proxy/truststore.jks").getAbsolutePath(),
"bigquery.rpc-proxy.truststore-password", "123456"),
REQUIRED_TPCH_TABLES);

return queryRunner;
Expand Down