feat(spanner): add custom instance config to tests #4194
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
google-cla
bot
added
the
cla: yes
mohanli-ml
force-pushed
the
instance-config
branch
from
1c10413
to
f865c3b
Compare
hengfengli
reviewed
Jun 2, 2021
spanner/integration_test.go
Outdated
| @@ -63,6 +63,11 @@ var ( | |||
| // by setting the environment variable GCLOUD_TESTS_GOLANG_SPANNER_HOST | |||
| spannerHost = getSpannerHost() | |||
|
|
|||
| // instanceConfig specifies the instance config used to create a instance for testing. | |||
hengfengli
reviewed
Jun 2, 2021
| @@ -262,6 +271,10 @@ func initIntegrationTests() (cleanup func()) { | |||
| if err != nil { | |||
| log.Fatalf("Cannot get any instance configurations.\nPlease make sure the Cloud Spanner API is enabled for the test project.\nGet error: %v", err) | |||
| } | |||
| configName := config.Name | |||
| if instanceConfig != "" { | |||
There was a problem hiding this comment.
If instanceConfig is not empty, there is no need to call ListInstanceConfigs.
var configName string
if instanceConfig != "" {
configName = fmt.Sprintf("projects/%s/instanceConfigs/%s", testProjectID, instanceConfig)
} else {
configIterator := instanceAdmin.ListInstanceConfigs(ctx, &instancepb.ListInstanceConfigsRequest{
Parent: fmt.Sprintf("projects/%s", testProjectID),
})
config, err := configIterator.Next()
if err != nil {
log.Fatalf("Cannot get any instance configurations.\nPlease make sure the Cloud Spanner API is enabled for the test project.\nGet error: %v", err)
}
configName := config.Name
}There was a problem hiding this comment.
Added an if-else.
mohanli-ml
force-pushed
the
instance-config
branch
from
f865c3b
to
52501b5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In spanner integration tests, an instance will be created before the test. Currently, the instance is created with the first instance config. However, for staging environment the instance config is shared among GCP projects and can run out of resources. So this PR tries to solve this issue by allowing users to custom the instance config by adding an environment variable GCLOUD_TESTS_GOLANG_SPANNER_INSTANCE_CONFIG.