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

Subnet logconfig prepare for 3.0.0 #2572

Merged
merged 10 commits into from
Nov 4, 2019
Merged

Subnet logconfig prepare for 3.0.0 #2572

merged 10 commits into from
Nov 4, 2019

Conversation

slevenick
Copy link
Contributor

@slevenick slevenick commented Oct 31, 2019 •
edited
Loading

This moves log_config to GA, deprecates enable_flow_logs, infers that enable_flow_logs is true if log_config is present and enable_flow_logs is unspecified. Also allows for log_config to be updated without recreating the subnetwork resource.

Prepares to remove enable_flow_logs in 3.0.0 in favor of inferring log_config.enable

Release Note Template for Downstream PRs (will be copied)

`compute`: `log_config` is now available in GA for `google_compute_subnetwork`

`compute`: deprecated `enable_flow_logs` on `google_compute_subnetwork`. The presence of the `log_config` block signals that flow logs are enabled for a subnetwork

@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, 732e1f2.

Pull request statuses

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#1320
depends: GoogleCloudPlatform/terraform-google-conversion#244
depends: hashicorp/terraform-provider-google#4791
depends: ansible-collections/google.cloud#42

@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, 1e78691.

Pull request statuses

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

New Pull Requests

I didn't open any new pull requests because of this PR.

@slevenick slevenick requested a review from rileykarson October 31, 2019 22:03
rileykarson
rileykarson approved these changes Oct 31, 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.

LGTM other than the unrelated BackendService change

products/compute/terraform.yaml Outdated
@@ -244,8 +244,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
sensitive: true
id: !ruby/object:Overrides::Terraform::PropertyOverride
exclude: true
logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
Copy link
Member

Choose a reason for hiding this comment

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

This seems unrelated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops! Must have searched on logConfig and gotten mixed up!

products/compute/terraform.yaml
@@ -1677,8 +1680,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
input: false
default_from_api: true
custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
Copy link
Member

Choose a reason for hiding this comment

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

Are we able to keep the field O+C? I'm a little hesitant to start catching drift out of the blue, especially on our last 2.X release. However, it's beta-only so it's allowed imo.

@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, 024da80.

Pull request statuses

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

New Pull Requests

I didn't open any new pull requests because of this PR.

@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, 04fb694.

Pull request statuses

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

New Pull Requests

I didn't open any new pull requests because of this PR.

slevenick and others added 10 commits November 4, 2019 17:40
@modular-magician modular-magician merged commit 73e2010 into GoogleCloudPlatform:master Nov 4, 2019
@modular-magician modular-magician mentioned this pull request Nov 4, 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
ansible automerged cla: yes downstream-generated terraform-google-conversion terraform-provider-google terraform-provider-google-beta
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@slevenick @modular-magician @rileykarson @googlebot