Fixes https://github.com/hashicorp/terraform-cdk/issues/3695 https://github.com/hashicorp/terraform-provider-google/issues/15456

[eahrend]

When creating terraform compliant JSON, the IP Allocation policy block in the composer resource will incorrectly state that all attributes are required.

This PR removes the ConfigMode of the ip_allocation_policy, and removes the atleastoneof fields from the elements in the ip_allocation_policy field. This brings it more in line with the container engine resource, and has the benefit of allowing terraform compliant JSON to work the same as HCL

Release Note Template for Downstream PRs (will be copied)

composer: removed ConfigMode: SchemaConfigModeAttr ip_allocation_policy and AtLeastOneOf fields from ip_allocation_policy sub fields

[github-actions]

Hello! I am a robot. Tests will require approval from a repository maintainer to run.

@shuyama1, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

[eahrend]

Ran tests locally that confirm the existing terraform configurations still work, so this shouldn't break any existing terraform code. Also built a local version of the provider and confirmed the terraform compliant JSON that was failing before is working as intended.

[modular-magician]

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 1 file changed, 4 insertions(+), 10 deletions(-))
google-beta provider: Diff ( 1 file changed, 4 insertions(+), 10 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_composer_environment (112 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_composer_environment" "primary" {
  config {
    node_config {
      ip_allocation_policy {
        cluster_secondary_range_name  = # value needed
        services_secondary_range_name = # value needed
      }
    }
  }
}

[modular-magician]

Tests analytics

Total tests: 51
Passed tests: 51
Skipped tests: 0
Affected tests: 0

Click here to see the affected service packages

• composer

$\textcolor{green}{\textsf{All tests passed!}}$

View the build log

[eahrend]

Added test case with named alias ranges for ip_allocation_policy

[modular-magician]

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 95 insertions(+), 10 deletions(-))
google-beta provider: Diff ( 2 files changed, 95 insertions(+), 10 deletions(-))

[modular-magician]

Tests analytics

Total tests: 52
Passed tests: 51
Skipped tests: 0
Affected tests: 1

Click here to see the affected service packages

• composer

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

• TestAccComposerEnvironmentComposer2_privateWithRangeNames

Get to know how VCR tests work

[modular-magician]

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccComposerEnvironmentComposer2_privateWithRangeNames[Debug log]

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

---

$\textcolor{green}{\textsf{All tests passed!}}$

View the build log or the debug log for each test

[eahrend]

@shuyama1 can I get a review on this please?

[github-actions]

@shuyama1 This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

[eahrend]

@shuyama1 apologies if this is coming off rude or pestering, just a small reminder if I can get a review on this

[shuyama1]

@shuyama1 apologies if this is coming off rude or pestering, just a small reminder if I can get a review on this

Apologies for the delay on the reviews, and thank you for the reminder. I'm working through my review list today and will get to this PR shortly.

[github-actions]

@GoogleCloudPlatform/terraform-team @shuyama1 This PR has been waiting for review for 1 week. Please take a look! Use the label disable-review-reminders to disable these notifications.

[shuyama1]

Sorry for the late review. Left some comments and I'll also need to look into the issue a bit.

[shuyama1]

I'll need to double check if removing it will be a breaking check.

[eahrend]

No worries, I ran some of the existing tests as well when doing a bit of local development and at least confirmed from my end that the tests were still valid before creating this PR

[shuyama1]

Removing SchemaConfigModeAttr is indeed a breaking change and can't be included in a minor release. We're currently at phase of working on 6.0.0 major release, and SchemaConfigModeAttr will be removed from all the resources. This work has already been done and 6.0.0 should be out in the next few weeks.

[eahrend]

Oh nice, hopefully it will fix this. We can keep this open and once 6.0.0 drops I'll re-test this.

[eahrend]

@shuyama1 no worries on the late review, saw the github outage on wednesday and figured that would impact the ETA for this to get reviewed.

[eahrend]

@shuyama1 just checking in on this

[shuyama1]

@shuyama1 just checking in on this

Thanks for the ping. I just replied in #11401 (comment). Let's wait until the 6.0.0 is out to continue with the following work/ evaluate if further changes are needed, as I wonder if 6.0.0 will resolve your issues.

[eahrend]

@shuyama1 any chance we can keep this open or prevent the stale bot from closing this until 6.0.0 drops or should I just keep a comment open until it does?

[shuyama1]

@shuyama1 any chance we can keep this open or prevent the stale bot from closing this until 6.0.0 drops or should I just keep a comment open until it does?

Sorry for the noise!
Sure, I added the label to disable the reminders from the bot and I'll also convert this PR to draft, but feel free to convert it back you'd like to continue working on it. Thank you!