Skip to content
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

fix(kms): to honor kms credentials when present. #1272

Merged
merged 6 commits into from
Oct 5, 2022
+96 −20
Merged

fix(kms): to honor kms credentials when present. #1272

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b2554e
fix to honor kms credentials when present.
zhumin8 Sep 28, 2022
69dabe6
remove mock client in test to test on auto-configured client.
zhumin8 Sep 29, 2022
ad85218
fix GcpKmsAutoConfiguration.java to take core project id. Revamp test…
zhumin8 Sep 30, 2022
6f9b5b6
fix style-check.
zhumin8 Sep 30, 2022
620b192
revert unnecessary style change.
zhumin8 Oct 3, 2022
cfd3cfc
making fake key less real.
zhumin8 Oct 3, 2022
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
16 changes: 9 additions & 7 deletions ...gure/src/main/java/com/google/cloud/spring/autoconfigure/kms/GcpKmsAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,20 @@
public class GcpKmsAutoConfiguration {

private final GcpProjectIdProvider gcpProjectIdProvider;
private final CredentialsProvider credentialsProvider;

public GcpKmsAutoConfiguration(GcpKmsProperties properties) {
public GcpKmsAutoConfiguration(GcpKmsProperties properties,
CredentialsProvider credentialsProvider)
throws IOException {
this.gcpProjectIdProvider =
properties.getProjectId() != null
? properties::getProjectId
: new DefaultGcpProjectIdProvider();
}

@Bean
@ConditionalOnMissingBean
public CredentialsProvider googleCredentials(GcpKmsProperties kmsProperties) throws IOException {
return new DefaultCredentialsProvider(kmsProperties);
this.credentialsProvider =
properties.getCredentials().hasKey()
? new DefaultCredentialsProvider(properties)
: credentialsProvider;
}

@Bean
Expand All @@ -60,7 +62,7 @@ public KeyManagementServiceClient keyManagementClient(CredentialsProvider google
throws IOException {
KeyManagementServiceSettings settings =
KeyManagementServiceSettings.newBuilder()
.setCredentialsProvider(googleCredentials)
.setCredentialsProvider(this.credentialsProvider)
.setHeaderProvider(new UserAgentHeaderProvider(GcpKmsAutoConfiguration.class))
.build();

Expand Down
6 changes: 0 additions & 6 deletions ...re/src/test/java/com/google/cloud/spring/autoconfigure/kms/KmsAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ void testKmsTemplateCreated() {
@Configuration
static class TestBootstrapConfiguration {

@Bean
public static KeyManagementServiceClient keyManagementClient() {
KeyManagementServiceClient client = mock(KeyManagementServiceClient.class);
return client;
}

@Bean
public static CredentialsProvider googleCredentials() {
return () -> mock(Credentials.class);
Expand Down