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 Spanner Emulator triggering default credentials creation #457

Merged
merged 2 commits into from
May 5, 2021
Merged

Fix Spanner Emulator triggering default credentials creation #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e8216
Fix Spanner Emulator triggering default credentials creation
meltsufin May 4, 2021
098222f
checkstyle
meltsufin May 4, 2021
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
20 changes: 17 additions & 3 deletions ...va/com/google/cloud/spring/autoconfigure/spanner/GcpSpannerEmulatorAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@

package com.google.cloud.spring.autoconfigure.spanner;

import java.io.IOException;

import com.google.api.gax.core.CredentialsProvider;
import com.google.cloud.NoCredentials;
import com.google.cloud.spanner.SpannerOptions;
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
import com.google.cloud.spring.core.GcpProjectIdProvider;

import org.springframework.boot.autoconfigure.AutoConfigureBefore;
Expand All @@ -36,7 +40,7 @@
* @since 1.2.3
*/
@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(GcpSpannerAutoConfiguration.class)
@AutoConfigureBefore({ GcpSpannerAutoConfiguration.class, GcpContextAutoConfiguration.class })
@EnableConfigurationProperties(GcpSpannerProperties.class)
@ConditionalOnProperty(prefix = "spring.cloud.gcp.spanner.emulator", name = "enabled", havingValue = "true")
public class GcpSpannerEmulatorAutoConfiguration {
Expand All @@ -45,6 +49,8 @@ public class GcpSpannerEmulatorAutoConfiguration {

private final String projectId;

private final CredentialsProvider credentialsProvider;

public GcpSpannerEmulatorAutoConfiguration(GcpSpannerProperties properties,
GcpProjectIdProvider projectIdProvider) {

Expand All @@ -53,15 +59,23 @@ public GcpSpannerEmulatorAutoConfiguration(GcpSpannerProperties properties,
: projectIdProvider.getProjectId();

this.properties = properties;

this.credentialsProvider = NoCredentials::getInstance;
}

@Bean
@ConditionalOnMissingBean
public CredentialsProvider credentialsProvider() {
return this.credentialsProvider;
}

@Bean
@ConditionalOnMissingBean
public SpannerOptions spannerOptions() {
public SpannerOptions spannerOptions() throws IOException {
Assert.notNull(this.properties.getEmulatorHost(), "`spring.cloud.gcp.spanner.emulator-host` must be set.");
return SpannerOptions.newBuilder()
.setProjectId(this.projectId)
.setCredentials(NoCredentials.getInstance())
.setCredentials(this.credentialsProvider.getCredentials())
.setEmulatorHost(this.properties.getEmulatorHost()).build();
}
}
5 changes: 5 additions & 0 deletions ...oud/spring/autoconfigure/spanner/GcpSpannerEmulatorAutoConfigurationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.cloud.spring.autoconfigure.spanner;

import com.google.api.gax.core.CredentialsProvider;
import com.google.cloud.NoCredentials;
import com.google.cloud.spanner.SpannerOptions;
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -52,6 +54,9 @@ public void testEmulatorAutoConfigurationEnabled() {
.run(context -> {
SpannerOptions spannerOptions = context.getBean(SpannerOptions.class);
assertThat(spannerOptions.getEndpoint()).isEqualTo("localhost:9010");

assertThat(context.getBean(CredentialsProvider.class).getCredentials())
.isEqualTo(NoCredentials.getInstance());
});
}

Expand Down