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.

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

Add cmek to spanner database #4699

Merged
merged 5 commits into from
Apr 21, 2021

Conversation

slevenick
Copy link
Contributor

@slevenick slevenick commented Apr 14, 2021

Fixes: hashicorp/terraform-provider-google#8822

Also bumps the default request timeout to 2 minutes from 30 seconds. This should fix intermittent request cancelled errors which were showing up fairly frequently on this test

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

spanner: added support for setting a CMEK on `google_spanner_database`
all: changed default HTTP request timeout from 30 seconds to 120 seconds

@google-cla google-cla bot added the cla: yes label Apr 14, 2021
@slevenick
Copy link
Contributor Author

/gcbrun

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 226 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 226 insertions(+), 2 deletions(-))
Ansible: Diff ( 2 files changed, 70 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 29 insertions(+))
TF OiCS: Diff ( 4 files changed, 153 insertions(+))
Inspec: Diff ( 5 files changed, 44 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=182336"

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 4 files changed, 227 insertions(+), 3 deletions(-))
Terraform Beta: Diff ( 5 files changed, 228 insertions(+), 4 deletions(-))
Ansible: Diff ( 2 files changed, 70 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 2 files changed, 30 insertions(+), 1 deletion(-))
TF OiCS: Diff ( 4 files changed, 153 insertions(+))
Inspec: Diff ( 5 files changed, 44 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=182349"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccCloudRunDomainMapping_foregroundDeletion|TestAccComputeRouterPeer_advertiseMode You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=182441"

@slevenick slevenick requested review from a team and melinath and removed request for a team April 17, 2021 00:02
@melinath
Copy link
Member

melinath commented Apr 19, 2021

It looks like this is a skip-VCR test; I started a non-VCR test run for the new test here: https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloud_ProviderGoogleCloudMmUpstream/183041

Copy link
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming the test passes

Copy link
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the test currently requires google_project_service_identity (beta only) but the field is currently marked as GA.

@slevenick
Copy link
Contributor Author

It looks like the test currently requires google_project_service_identity (beta only) but the field is currently marked as GA.

Ah yeah, that's correct. I just marked the test as beta to avoid this issue in tests. Spanner only has a v1 API so it wouldn't be correct to mark it as beta. I think the right action here is to mark the test as beta but keep the field as GA

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 4 files changed, 227 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 6 files changed, 229 insertions(+), 4 deletions(-))
Ansible: Diff ( 2 files changed, 70 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 2 files changed, 30 insertions(+), 1 deletion(-))
TF OiCS: Diff ( 4 files changed, 157 insertions(+))
Inspec: Diff ( 5 files changed, 44 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=183178"

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 80 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 4 files changed, 168 insertions(+), 1 deletion(-))
Ansible: Diff ( 2 files changed, 70 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 2 files changed, 30 insertions(+), 1 deletion(-))
Inspec: Diff ( 5 files changed, 44 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=183245"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccCloudRunDomainMapping_foregroundDeletion|TestAccComputeBackendService_internalLoadBalancing|TestAccTags You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=183249"

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode: TestAccCloudRunDomainMapping_foregroundDeletion Please fix these to complete your PR

@melinath
Copy link
Member

Copy link
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming test passes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Spanner CMEK to beta provider
3 participants