master_ipv4_cidr_block should be in line with documentation by stankiewicz · Pull Request #4732 · GoogleCloudPlatform/magic-modules

stankiewicz · 2021-04-26T11:52:06Z

As per https://cloud.google.com/composer/docs/reference/rest/v1beta1/projects.locations.environments#PrivateClusterConfig masterIpv4CidrBlock is Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of '172.16.0.0/23' is used. Suggesting change default value to be in line with docs or remove it so it's assigned/computed by API.

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)

composer: changed master_ipv4_cidr_block to draw default from the API

As per https://cloud.google.com/composer/docs/reference/rest/v1beta1/projects.locations.environments#PrivateClusterConfig masterIpv4CidrBlock is Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of '172.16.0.0/23' is used. Suggesting change default value to be in line with docs or remove it so it's assigned/computed by API.

modular-magician · 2021-04-26T11:53:27Z

Hello! I am a robot who works on Magic Modules PRs.

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@rileykarson, please review this PR or find an appropriate assignee.

modular-magician · 2021-04-26T12:01:40Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))
Terraform Beta: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))

modular-magician · 2021-04-26T12:01:52Z

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

modular-magician · 2021-04-26T12:04:46Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

stankiewicz · 2021-04-26T12:51:24Z

updated release notes.

rileykarson · 2021-04-26T15:36:41Z

Changing this value will be a breaking change, which we can't do outside of a major version. Do you happen to know if this was an old API default, or has it always been /23?

modular-magician · 2021-04-26T16:52:28Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))
Terraform Beta: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))

modular-magician · 2021-04-26T16:52:50Z

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

modular-magician · 2021-04-26T16:53:21Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))
Terraform Beta: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))

modular-magician · 2021-04-26T16:53:38Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 1 insertion(+), 1 deletion(-))
Terraform Beta: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))

modular-magician · 2021-04-26T16:53:41Z

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

modular-magician · 2021-04-26T16:53:59Z

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

stankiewicz · 2021-04-26T17:06:41Z

Need to update docs as well

modular-magician · 2021-04-26T17:22:37Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 4 files changed, 5 insertions(+), 4 deletions(-))

modular-magician · 2021-04-26T17:22:45Z

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

modular-magician · 2021-04-26T19:08:52Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccBillingBudget_billingBudgetUpdateRemoveFilter|TestAccBillingBudget_billingBudgetLastperiodExample|TestAccBillingBudget_billingBudgetBasicExample|TestAccBillingBudget_billingBudgetFilterExample|TestAccBillingBudget_billingBudgetNotifyExample|TestAccComposerEnvironment_private|TestAccComputeBackendService_internalLoadBalancing You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184318"

modular-magician · 2021-04-26T19:08:55Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccBillingBudget_billingBudgetUpdateRemoveFilter|TestAccBillingBudget_billingBudgetLastperiodExample|TestAccBillingBudget_billingBudgetBasicExample|TestAccBillingBudget_billingBudgetFilterExample|TestAccBillingBudget_billingBudgetNotifyExample|TestAccComposerEnvironment_private|TestAccComputeBackendService_internalLoadBalancing You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184319"

modular-magician · 2021-04-26T19:09:03Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccBillingBudget_billingBudgetUpdateRemoveFilter|TestAccBillingBudget_billingBudgetLastperiodExample|TestAccBillingBudget_billingBudgetBasicExample|TestAccBillingBudget_billingBudgetFilterExample|TestAccBillingBudget_billingBudgetNotifyExample|TestAccComposerEnvironment_private|TestAccComputeBackendService_internalLoadBalancing You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184320"

modular-magician · 2021-04-26T19:09:07Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccBillingBudget_billingBudgetUpdateRemoveFilter|TestAccBillingBudget_billingBudgetLastperiodExample|TestAccBillingBudget_billingBudgetBasicExample|TestAccBillingBudget_billingBudgetFilterExample|TestAccBillingBudget_billingBudgetNotifyExample|TestAccComposerEnvironment_private|TestAccComputeBackendService_internalLoadBalancing You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184320"

modular-magician · 2021-04-26T20:11:19Z

Tests failed during RECORDING mode: TestAccComposerEnvironment_private|TestAccComposerEnvironment_privateWithWebServerControl Please fix these to complete your PR

rileykarson · 2021-04-27T15:37:54Z

mmv1/third_party/terraform/resources/resource_composer_environment.go.erb

 									"master_ipv4_cidr_block": {
 										Type:     schema.TypeString,
 										Optional: true,
+					     					Computed: true,


nit: This spacing looks off, seems like there's some spaces that snuck in.

rileykarson · 2021-04-27T15:39:31Z

Note: Not sure why the Magician insists the composer private test failed in recording mode, it succeeded in #4732 (comment)

modular-magician · 2021-04-27T15:56:12Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))

modular-magician · 2021-04-27T15:56:32Z

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

modular-magician · 2021-04-27T15:57:34Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))

modular-magician · 2021-04-27T15:57:54Z

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

modular-magician · 2021-04-27T16:16:23Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 2 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 4 files changed, 5 insertions(+), 4 deletions(-))

modular-magician · 2021-04-27T16:16:44Z

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

modular-magician · 2021-04-27T17:27:44Z

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

modular-magician · 2021-04-27T17:27:44Z

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

modular-magician · 2021-04-27T18:21:20Z

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

rileykarson

LGTM, thanks @stankiewicz!

rileykarson · 2021-04-28T16:24:02Z

mmv1/third_party/terraform/website/docs/r/composer_environment.html.markdown

  internal load balancer virtual IP. This range must not overlap with any other ranges
  in use within the cluster's network.
-  If left blank, the default value of '172.16.0.0/28' is used.
+  If left blank, the default value of is used. See [documentation](https://cloud.google.com/composer/docs/how-to/managing/configuring-private-ip#defaults) for default values per region. 


Defaults per region are a definite sign that O+C is appropriate!

google-cla bot added the cla: yes label Apr 26, 2021

modular-magician requested a review from rileykarson April 26, 2021 11:53

stankiewicz added 3 commits April 26, 2021 18:42

Update resource_composer_environment.go.erb

6870d87

Update resource_composer_environment.go.erb

265d634

Update resource_composer_environment.go.erb

087c509

Update composer_environment.html.markdown

29dcb9c

rileykarson reviewed Apr 27, 2021

View reviewed changes

fix tabs

eee38cf

fix tabs

3a1c967

align tf documentation with google cloud documentation

73aef40

rileykarson approved these changes Apr 28, 2021

View reviewed changes

rileykarson merged commit 5664a39 into GoogleCloudPlatform:master Apr 28, 2021

This was referenced Apr 28, 2021

master_ipv4_cidr_block should be in line with documentation hashicorp/terraform-provider-google-beta#3204

Merged

master_ipv4_cidr_block should be in line with documentation hashicorp/terraform-provider-google#9017

Merged

Conversation

stankiewicz commented Apr 26, 2021 • edited by rileykarson Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Diff report:

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

stankiewicz commented Apr 26, 2021

Uh oh!

rileykarson commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Diff report:

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Diff report:

Uh oh!

modular-magician commented Apr 26, 2021

Diff report:

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

stankiewicz commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Diff report:

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

modular-magician commented Apr 26, 2021

Uh oh!

rileykarson Apr 27, 2021

Choose a reason for hiding this comment

Uh oh!

stankiewicz Apr 27, 2021

Choose a reason for hiding this comment

Uh oh!

rileykarson commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Diff report:

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Diff report:

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Diff report:

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

modular-magician commented Apr 27, 2021

Uh oh!

rileykarson left a comment

Choose a reason for hiding this comment

stankiewicz commented Apr 26, 2021 •

edited by rileykarson

Loading