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

Jump to bottom

allow master authorized networks config to be removed #2312

Merged
merged 2 commits into from
Sep 16, 2019
Merged

allow master authorized networks config to be removed #2312

merged 2 commits into from
Sep 16, 2019

Conversation

megan07
Copy link
Contributor

@megan07 megan07 commented Sep 12, 2019

Fixes hashicorp/terraform-provider-google#3098

Fix error when master_authorized_networks_config is removed from the google_container_cluster configuration.

Release Note for Downstream PRs (will be copied)

Fix error when `master_authorized_networks_config` is removed from the `google_container_cluster` configuration.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
This PR seems not to have generated downstream PRs before, as of fba90b5.

Pull request statuses

No diff detected in terraform-google-conversion.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google-beta#1133
depends: hashicorp/terraform-provider-google#4446

This was referenced Sep 12, 2019
Closed
Closed
@megan07 megan07 requested a review from rileykarson September 12, 2019 23:05
@oswalya
Copy link

oswalya commented Sep 13, 2019

Thanks @megan07
I totally forgot in my PR the acceptance tests ( as I was not really aware of them ). Next one will include also testing. And thanks for adding them 👍

rileykarson
rileykarson approved these changes Sep 13, 2019
View reviewed changes
Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Just a couple formatting nitpicks, lgtm 👍

third_party/terraform/tests/resource_container_cluster_test.go.erb

return fmt.Sprintf(`
resource "google_container_cluster" "with_master_authorized_networks" {
name = "%s"
Copy link
Member

Choose a reason for hiding this comment

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

nit: spacing

third_party/terraform/tests/resource_container_cluster_test.go.erb Outdated
@@ -1968,6 +1977,16 @@ resource "google_container_cluster" "with_master_authorized_networks" {
}`, clusterName, cidrBlocks)
}

func testAccContainerCluster_removeMasterAuthorizedNetworksConfig(clusterName string) string {

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, b6be7a9.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: modular-magician/inspec-gcp#205

@megan07 megan07 force-pushed the megan_rm_master_authorized_networks_config branch from b6be7a9 to 72fe4a5 Compare September 16, 2019 16:49
@modular-magician modular-magician merged commit 35fe8c2 into GoogleCloudPlatform:master Sep 16, 2019
@megan07 megan07 mentioned this pull request Sep 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rileykarson rileykarson rileykarson approved these changes

Assignees
No one assigned
Labels
automerged cla: yes downstream-generated inspec terraform-provider-google terraform-provider-google-beta
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Removing the master_authorized_networks_config block on private clusters fails.
5 participants
@megan07 @modular-magician @oswalya @rileykarson @googlebot