-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Fixes https://github.com/hashicorp/terraform-cdk/issues/3695 https://github.com/hashicorp/terraform-provider-google/issues/15456 #11401
Conversation
Signed-off-by: Erik Ahrend <kire317@gmail.com>
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. |
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. |
Hi there, I'm the Modular magician. I've detected the following information about your changes: Diff reportYour PR generated some diffs in downstreams - here they are.
Missing test reportYour PR includes resource fields which are not covered by any test. Resource: resource "google_composer_environment" "primary" {
config {
node_config {
ip_allocation_policy {
cluster_secondary_range_name = # value needed
services_secondary_range_name = # value needed
}
}
}
}
|
Tests analyticsTotal tests: 51 Click here to see the affected service packages
View the build log |
Add tests for named alias ranges for ip allocation policy Signed-off-by: Erik Ahrend <kire317@gmail.com>
Added test case with named alias ranges for ip_allocation_policy |
Hi there, I'm the Modular magician. I've detected the following information about your changes: Diff reportYour PR generated some diffs in downstreams - here they are.
|
Tests analyticsTotal tests: 52 Click here to see the affected service packages
Action takenFound 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
|
|
@shuyama1 can I get a review on this please? |
@shuyama1 This PR has been waiting for review for 3 weekdays. Please take a look! Use the label |
@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. |
@GoogleCloudPlatform/terraform-team @shuyama1 This PR has been waiting for review for 1 week. Please take a look! Use the label |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the late review. Left some comments and I'll also need to look into the issue a bit.
@@ -338,39 +338,34 @@ func ResourceComposerEnvironment() *schema.Resource { | |||
Optional: true, | |||
Computed: true, | |||
ForceNew: true, | |||
ConfigMode: schema.SchemaConfigModeAttr, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll need to double check if removing it will be a breaking check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh nice, hopefully it will fix this. We can keep this open and once 6.0.0 drops I'll re-test this.
mmv1/third_party/terraform/services/composer/resource_composer_environment.go.erb
Show resolved
Hide resolved
@shuyama1 just checking in on this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@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.
@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! |
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)