Fix Adding Unexpected Conditions #9547

kautikdk · 2023-11-30T11:52:57Z

Fixes hashicorp/terraform-provider-google#14044

storage: fixed unexpected `lifecycle_rule` conditions being added for `google_storage_bucket`

* Adds no_age field

modular-magician · 2023-11-30T11:54:37Z

Hello! I am a robot. It looks like you are a: ~~Community Contributor~~ Googler ~~Core Contributor~~. Tests will run automatically.

@roaks3, 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.

modular-magician · 2023-11-30T12:04:15Z

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.

Terraform GA: Diff ( 3 files changed, 157 insertions(+), 17 deletions(-))
Terraform Beta: Diff ( 3 files changed, 157 insertions(+), 17 deletions(-))

modular-magician · 2023-11-30T13:17:13Z

Tests analytics

Total tests: 3247
Passed tests 2912
Skipped tests: 331
Affected tests: 4

Action taken

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

TestAccDataSourceGoogleServiceAccountAccessToken_basic|TestAccDataSourceGoogleServiceAccountIdToken_impersonation|TestAccStorageBucket_lifecycleRuleStateArchived|TestAccStorageBucket_lifecycleRulesNoAge

Get to know how VCR tests work

modular-magician · 2023-11-30T13:26:27Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccDataSourceGoogleServiceAccountAccessToken_basic[Debug log]
TestAccDataSourceGoogleServiceAccountIdToken_impersonation[Debug log]
TestAccStorageBucket_lifecycleRuleStateArchived[Debug log]
TestAccStorageBucket_lifecycleRulesNoAge[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{red}{\textsf{Tests failed when rerunning REPLAYING mode:}}$
TestAccDataSourceGoogleServiceAccountIdToken_impersonation[Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.

$\textcolor{red}{\textsf{Errors occurred during RECORDING mode. Please fix them to complete your PR.}}$
View the build log or the debug log for each test

kautikdk · 2023-11-30T14:02:03Z

@roaks3 I don't know why this test failed. When i tried running it locally, It passed. It's unrelated to my PR.

Adds relevant comments.

modular-magician · 2023-12-01T06:55:50Z

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

Breaking Change Detection Failed

The breaking change detector crashed during execution. This is usually due to the downstream provider(s) failing to compile. Please investigate or follow up with your reviewer.

Diff report

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

Terraform GA: Diff ( 3 files changed, 175 insertions(+), 31 deletions(-))
Terraform Beta: Diff ( 3 files changed, 175 insertions(+), 31 deletions(-))

modular-magician · 2023-12-01T08:02:26Z

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.

Terraform GA: Diff ( 3 files changed, 161 insertions(+), 17 deletions(-))
Terraform Beta: Diff ( 3 files changed, 161 insertions(+), 17 deletions(-))

modular-magician · 2023-12-01T09:15:26Z

Tests analytics

Total tests: 3255
Passed tests 2921
Skipped tests: 331
Affected tests: 3

Action taken

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

TestAccGKEHub2Fleet_gkehubFleetBasicExample_update|TestAccLoggingProjectSink_updatePreservesCustomWriter|TestAccDataSourceGoogleServiceAccountIdToken_impersonation

Get to know how VCR tests work

modular-magician · 2023-12-01T09:28:13Z

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

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{red}{\textsf{Tests failed when rerunning REPLAYING mode:}}$
TestAccGKEHub2Fleet_gkehubFleetBasicExample_update[Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccLoggingProjectSink_updatePreservesCustomWriter[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

kautikdk · 2023-12-01T09:46:19Z

@roaks3 Please review this PR.I don't know why this tests are failing.

kautikdk · 2023-12-02T19:53:09Z

@roaks3 Please Review this PR.

roaks3

I have some initial spacing nits and questions, but overall the logic here seems good to me, and the tests are great.

The behavior here is something I'm a little unsure about, and the solution doesn't appear to match an existing pattern (although, if you've found a pre-existing pattern could you please share?). It seems that the resource does not behave intuitively at the moment (in that it sends an explicit age of 0 even when not set), and with this change that would continue to be true, but with a workaround where the user can add the no-age field. I'd like to discuss with my team to make sure there isn't a better way of handling this where the initial problem is fixed to behave as the user would expect.

mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.erb

roaks3 · 2023-12-04T16:06:18Z

mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.erb

-		transformed.ForceSendFields = append(transformed.ForceSendFields, "Age")
+	// Setting high precedence of no_age over age when both used together.
+	// Only sets age value to transformed when no_age has false value
+	if v, ok := condition["no_age"]; ok && !(v.(bool)) {


I'm wondering about the case where no-age is not set. It appears to be covered properly in your tests, but I was expecting to see the age being set even if ok is false.

no_age attribute behavior is similar to age attribute behavior. It is always getting false value because nil value for boolean is false and this attribute is also inside of TypeSet. Removal of ok from if condition won't cause issue now but if in future, this issue of getting value every time even when not set, gets properly handle by terraform team then provider starts breaking because of this. We are using v.bool value as condition and suddenly we are not getting no_age from condition which will cause more problems. Your suggestion are welcome.

I'm having a little bit of trouble following on this point. Do you happen to have a link to the Terraform bug you're referencing?

It seems to me you're talking about the treatment of zero-values (ie. an unset no_age evaluates to false). Is that correct? If so, then we rely on that behavior heavily in the provider, and I wouldn't worry about that changing (it might in the future, if we switch to the plugin framework, but it would be a large change across the entire provider). I believe the case where no_age is not set will behave properly either way here, but accounting for the !ok case would help make sure we are covering all branches, and is hypothetically more resilient to things like fields moving.

Okay! In that case i will modify condition like this !ok || !(v.(bool)) which check that no_age is not found or if it is found then it has false value.

mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb

kautikdk · 2023-12-04T17:56:39Z

@roaks3 Thanks for the review. I am looking into the space issue and i don't know why this is happening because it's clearly aligned in my editor. Regarding the solution pattern, I am following this suggested solution here : #9512

modular-magician · 2023-12-04T19:28:31Z

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.

Terraform GA: Diff ( 3 files changed, 600 insertions(+), 453 deletions(-))
Terraform Beta: Diff ( 3 files changed, 600 insertions(+), 453 deletions(-))

modular-magician · 2023-12-04T19:47:52Z

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.

Terraform GA: Diff ( 3 files changed, 161 insertions(+), 17 deletions(-))
Terraform Beta: Diff ( 3 files changed, 161 insertions(+), 17 deletions(-))

roaks3 · 2023-12-04T20:10:32Z

@kautikdk oh thanks, that sounds reasonable regarding the approach, thanks for clarifying where this solution came from.

Regarding whitespace, it is a bit weird because we have Go code wrapped in ruby templates a lot of the time. And on top of that, some Terraform HCL is written within Go for the test templates. So basically, editors have trouble automatically spacing things properly, and I've sometimes found that I need to manually force sections to be spaces or tabs (depending on the context).

modular-magician · 2023-12-04T21:07:28Z

Tests analytics

Total tests: 3259
Passed tests 2925
Skipped tests: 331
Affected tests: 3

Action taken

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

TestAccDataprocClusterIamPolicy|TestAccGKEHub2Fleet_gkehubFleetBasicExample_update|TestAccLoggingProjectSink_updatePreservesCustomWriter

Get to know how VCR tests work

modular-magician · 2023-12-04T21:27:52Z

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

Rerun these tests in REPLAYING mode to catch issues

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

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccLoggingProjectSink_updatePreservesCustomWriter[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

modular-magician · 2023-12-05T12:41:26Z

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.

Terraform GA: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))

modular-magician · 2023-12-05T12:56:18Z

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.

Terraform GA: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))

modular-magician · 2023-12-05T14:08:42Z

Tests analytics

Total tests: 3262
Passed tests 2927
Skipped tests: 332
Affected tests: 3

Action taken

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

TestAccDataprocClusterIamPolicy|TestAccGKEHub2Fleet_gkehubFleetBasicExample_update|TestAccHealthcareDatasetIamPolicy

Get to know how VCR tests work

modular-magician · 2023-12-05T14:29:56Z

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

Rerun these tests in REPLAYING mode to catch issues

$\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

…file.

roaks3

Code LGTM, will just wait on tests one last time before merge

modular-magician · 2023-12-05T19:39:45Z

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.

Terraform GA: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 3 files changed, 159 insertions(+), 11 deletions(-))

modular-magician · 2023-12-05T20:53:05Z

Tests analytics

Total tests: 3262
Passed tests 2930
Skipped tests: 332
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

roaks3 · 2023-12-05T21:26:11Z

Note: tweaked the release note

* Fix Adding Unexpected Conditions * Adds no_age field * Modify no_age description and variables name. Adds relevant comments. * Fixes Build Failure * Fixes indent issues and removes unnecessary condition. * Modified condition to include case when no_age is not present in the file.

Fix Adding Unexpected Conditions

6fd6be8

* Adds no_age field

modular-magician requested a review from roaks3 November 30, 2023 11:54

modular-magician added the service/storage label Nov 30, 2023

Modify no_age description and variables name.

64bf48e

Adds relevant comments.

Fixes Build Failure

1347867

roaks3 reviewed Dec 4, 2023

View reviewed changes

modular-magician requested a review from roaks3 December 4, 2023 19:19

kautikdk force-pushed the tf-14044-storage-bucket-no-age branch from aba1526 to 1347867 Compare December 4, 2023 19:36

Fixes indent issues and removes unnecessary condition.

85029ca

kautikdk force-pushed the tf-14044-storage-bucket-no-age branch from d4d079b to 85029ca Compare December 5, 2023 12:45

Modified condition to include case when no_age is not present in the …

d02619f

…file.

roaks3 approved these changes Dec 5, 2023

View reviewed changes

roaks3 merged commit cc5606e into GoogleCloudPlatform:main Dec 5, 2023
13 checks passed

This was referenced Dec 5, 2023

Fix Adding Unexpected Conditions hashicorp/terraform-provider-google-beta#6711

Merged

Fix Adding Unexpected Conditions hashicorp/terraform-provider-google#16683

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Adding Unexpected Conditions #9547

Fix Adding Unexpected Conditions #9547

kautikdk commented Nov 30, 2023 •

edited by roaks3

Loading

modular-magician commented Nov 30, 2023

modular-magician commented Nov 30, 2023

modular-magician commented Nov 30, 2023

modular-magician commented Nov 30, 2023

kautikdk commented Nov 30, 2023

modular-magician commented Dec 1, 2023

modular-magician commented Dec 1, 2023

modular-magician commented Dec 1, 2023

modular-magician commented Dec 1, 2023

kautikdk commented Dec 1, 2023

kautikdk commented Dec 2, 2023

roaks3 left a comment

roaks3 Dec 4, 2023

kautikdk Dec 4, 2023 •

edited

Loading

roaks3 Dec 5, 2023

kautikdk Dec 5, 2023 •

edited

Loading

kautikdk commented Dec 4, 2023

modular-magician commented Dec 4, 2023

modular-magician commented Dec 4, 2023

roaks3 commented Dec 4, 2023

modular-magician commented Dec 4, 2023

modular-magician commented Dec 4, 2023

modular-magician commented Dec 5, 2023

modular-magician commented Dec 5, 2023

modular-magician commented Dec 5, 2023

modular-magician commented Dec 5, 2023

roaks3 left a comment

modular-magician commented Dec 5, 2023

modular-magician commented Dec 5, 2023

roaks3 commented Dec 5, 2023

Fix Adding Unexpected Conditions #9547

Fix Adding Unexpected Conditions #9547

Conversation

kautikdk commented Nov 30, 2023 • edited by roaks3 Loading

modular-magician commented Nov 30, 2023

modular-magician commented Nov 30, 2023

Diff report

modular-magician commented Nov 30, 2023

Tests analytics

Action taken

modular-magician commented Nov 30, 2023

Rerun these tests in REPLAYING mode to catch issues

kautikdk commented Nov 30, 2023

modular-magician commented Dec 1, 2023

Breaking Change Detection Failed

Diff report

modular-magician commented Dec 1, 2023

Diff report

modular-magician commented Dec 1, 2023

Tests analytics

Action taken

modular-magician commented Dec 1, 2023

Rerun these tests in REPLAYING mode to catch issues

kautikdk commented Dec 1, 2023

kautikdk commented Dec 2, 2023

roaks3 left a comment

Choose a reason for hiding this comment

roaks3 Dec 4, 2023

Choose a reason for hiding this comment

kautikdk Dec 4, 2023 • edited Loading

Choose a reason for hiding this comment

roaks3 Dec 5, 2023

Choose a reason for hiding this comment

kautikdk Dec 5, 2023 • edited Loading

Choose a reason for hiding this comment

kautikdk commented Dec 4, 2023

modular-magician commented Dec 4, 2023

Diff report

modular-magician commented Dec 4, 2023

Diff report

roaks3 commented Dec 4, 2023

modular-magician commented Dec 4, 2023

Tests analytics

Action taken

modular-magician commented Dec 4, 2023

Rerun these tests in REPLAYING mode to catch issues

modular-magician commented Dec 5, 2023

Diff report

modular-magician commented Dec 5, 2023

Diff report

modular-magician commented Dec 5, 2023

Tests analytics

Action taken

modular-magician commented Dec 5, 2023

Rerun these tests in REPLAYING mode to catch issues

roaks3 left a comment

Choose a reason for hiding this comment

modular-magician commented Dec 5, 2023

Diff report

modular-magician commented Dec 5, 2023

Tests analytics

roaks3 commented Dec 5, 2023

kautikdk commented Nov 30, 2023 •

edited by roaks3

Loading

kautikdk Dec 4, 2023 •

edited

Loading

kautikdk Dec 5, 2023 •

edited

Loading