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 support for google_project_default_service_accounts resource #4167

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

rileykarson
Copy link
Member

Upstreams hashicorp/terraform-provider-google#7541, Fixes hashicorp/terraform-provider-google#4135

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)

`google_project_default_service_accounts`

@google-cla
Copy link

google-cla bot commented Oct 29, 2020

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@rileykarson
Copy link
Member Author

This modifies third_party files where the CLA does not apply.

@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 ( 6 files changed, 529 insertions(+))
Terraform Beta: Diff ( 6 files changed, 529 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=155048"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceSpannerInstance_basic|TestAccBigqueryDataTransferConfig|TestAccResourceGoogleProjectDefaultServiceAccountsBasic|TestAccResourceGoogleProjectDefaultServiceAccountsDisable|TestAccResourceGoogleProjectDefaultServiceAccountsDelete|TestAccResourceGoogleProjectDefaultServiceAccountsDeprivilege You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=155050"

@thiagonache
Copy link
Contributor

@google-admin Please, do not merge it. there's a bug in the implementation.

@upodroid
Copy link
Contributor

It is probably worth having a note at the top of the docs that notes that there is a constraint that can deprivilege the default GCE/GAE service account.

@c2thorn
Copy link
Member

c2thorn commented Oct 30, 2020

Although I'm pretty much just here to rubberstamp, is this ready for review? Or are we expecting changes to the downstream

@rileykarson
Copy link
Member Author

rileykarson commented Oct 30, 2020

We're good! We worked out in the downstream that this is good as is. @thiagonache had a proposal that would have reduced the number of errors for REVERT restore_policy deletes, but I think we're in agreement that we're comfortable without including it.

@upodroid: I don't feel that strongly that we should include it- we don't enumerate what org policies conflict / apply to other resources- but feel free to PR it in after, though!

Copy link
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

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

This is the handwritten-est resource ever

@@ -947,3 +947,10 @@ func skipIfVcr(t *testing.T) {
t.Skipf("VCR enabled, skipping test: %s", t.Name())
}
}

func sleepInSecondsForTest(t int) resource.TestCheckFunc {
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll change the other one to use the new function as a followup.

@thiagonache
Copy link
Contributor

thiagonache commented Oct 30, 2020 via email

@rileykarson
Copy link
Member Author

@c2thorn: Agreed!

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.

Deleting service default service accounts when creating a new project
5 participants