Adding support for SQL Server Timezones #6635

Kevin-X-Wang · 2022-10-03T20:09:55Z

Fixes: hashicorp/terraform-provider-google#12705

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)

sql: added `time_zone` field in `google_sql_database_instance`

This reverts commit 0b0dcf6.

modular-magician · 2022-10-03T20:10:12Z

Oops! It looks like no changelog entry is attached to this PR. Please include a release note block in the PR body, as described in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md:

```release-note:TYPE
Release note
```

modular-magician · 2022-10-03T20:10:53Z

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

I've detected that you're a community contributor. @melinath, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

Ensuring it's backwards compatible, covers common error cases, etc.
Summarizing the change into a user-facing changelog note.
Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.

Kevin-X-Wang · 2022-10-03T20:16:16Z

This test is dependent on having google.golang.org/api version > 0.97, but it seems this version will break the tests for another resource that I didn't touch.

melinath

@Kevin-X-Wang you'll need to do that upgrade and resolve the broken test. I'd recommend doing the upgrade in a separate PR for easier review and then rebasing this PR on the main branch afterwards - but since this PR is pretty short you could do both at once.

modular-magician · 2022-10-04T19:18:51Z

Oops! It looks like no changelog entry is attached to this PR. Please include a release note block in the PR body, as described in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md:

```release-note:TYPE
Release note
```

Kevin-X-Wang · 2022-10-04T19:37:02Z

I added those updates and fixed the tests.

modular-magician · 2022-10-04T20:02:46Z

Oops! It looks like no changelog entry is attached to this PR. Please include a release note block in the PR body, as described in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md:

```release-note:TYPE
Release note
```

melinath

Please update the release note as described above.

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

melinath · 2022-10-05T16:35:09Z

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

@@ -1004,7 +1004,7 @@ func flattenBucketLifecycleRuleAction(action *storage.BucketLifecycleRuleAction)

 func flattenBucketLifecycleRuleCondition(condition *storage.BucketLifecycleRuleCondition) map[string]interface{} {
 	ruleCondition := map[string]interface{}{
-		"age":                        int(condition.Age),
+		"age":                        int(*condition.Age),


It looks like this is causing the downstream provider is failing to compile:

/go/pkg/mod/cloud.google.com/go/storage@v1.22.1/bucket.go:1504:30: cannot use r.Condition.AgeInDays (variable of type int64) as type *int64 in struct literal /go/pkg/mod/cloud.google.com/go/storage@v1.22.1/bucket.go:1592:30: cannot use rr.Condition.Age (variable of type *int64) as type int64 in struct literal

This is because resource_storage_bucket uses google.golang.org/api/storage/v1

Please make sure the downstream provider can compile and that tests pass locally - steps 5 & 6 of General Contributing Steps

…tance.go.erb Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>

modular-magician · 2022-10-05T16:53:52Z

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

TYPE

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

merging online changes

modular-magician · 2022-10-05T17:11:36Z

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

TYPE

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

Kevin-X-Wang · 2022-10-05T17:19:02Z

Please update the release note as described above.

done

modular-magician · 2022-10-05T19:45:44Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 117 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 6 files changed, 117 insertions(+), 11 deletions(-))
TF Validator: Diff ( 3 files changed, 43 insertions(+), 33 deletions(-))

modular-magician · 2022-10-05T20:34:53Z

Tests analytics

Total tests: 2208
Passed tests 1962
Skipped tests: 240
Failed tests: 6

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample|TestAccIapWebTypeAppEngineIamBindingGenerated|TestAccIapWebTypeComputeIamPolicyGenerated|TestAccIapWebIamBindingGenerated_withCondition|TestAccSqlDatabaseInstance_Timezone

modular-magician · 2022-10-05T20:44:16Z

Tests passed during RECORDING mode:
TestAccIapWebTypeAppEngineIamBindingGenerated[Debug log]
TestAccIapWebTypeComputeIamPolicyGenerated[Debug log]
TestAccIapWebIamBindingGenerated_withCondition[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]
TestAccSqlDatabaseInstance_Timezone[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

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

mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb

modular-magician · 2022-10-05T21:15:56Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 109 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 6 files changed, 109 insertions(+), 11 deletions(-))
TF Validator: Diff ( 3 files changed, 43 insertions(+), 33 deletions(-))

modular-magician · 2022-10-05T22:08:35Z

Tests analytics

Total tests: 2208
Passed tests 1965
Skipped tests: 240
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccComputeInstance_soleTenantNodeAffinities|TestAccSqlDatabaseInstance_Timezone|TestAccCGCSnippet_eventarcWorkflowsExample

modular-magician · 2022-10-05T22:17:24Z

Tests passed during RECORDING mode:
TestAccSqlDatabaseInstance_Timezone[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

melinath

tested in GA locally, seems to work fine. LGTM.

Kevin Wang and others added 7 commits September 8, 2022 20:42

Adding timezone field to Terraform

8f01c26

Change timezone name and add to tests

6fff236

adding timezone field

0b0dcf6

Revert "adding timezone field"

e5b385a

This reverts commit 0b0dcf6.

Merge branch 'GoogleCloudPlatform:main' into main

9024054

renamed TimeZone field

b3cfdca

removing output log

de5d279

modular-magician requested a review from melinath October 3, 2022 20:10

melinath requested changes Oct 3, 2022

View reviewed changes

updated api version

35e4674

modular-magician requested a review from melinath October 4, 2022 19:19

adding update

e0c2da8

melinath requested changes Oct 5, 2022

View reviewed changes

Update mmv1/third_party/terraform/resources/resource_sql_database_ins…

8cb9baf

…tance.go.erb Co-authored-by: Stephen Lewis (Burrows) <stephen.r.burrows@gmail.com>

modular-magician requested a review from melinath October 5, 2022 16:54

Kevin Wang added 2 commits October 5, 2022 17:09

update storage version

613ba02

Merge branch 'main' of https://github.com/Kevin-X-Wang/magic-modules

368cf41

merging online changes

Kevin-X-Wang closed this Oct 5, 2022

Kevin-X-Wang reopened this Oct 5, 2022

Kevin Wang added 2 commits October 5, 2022 17:50

use storage 1.27

04dfe64

fixed requirements

ea6940b

changing into to pointer for storage_bucket.go

ab9ca91

melinath requested changes Oct 5, 2022

View reviewed changes

mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb Show resolved Hide resolved

mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb Show resolved Hide resolved

remove update test and add ForceNew tag

0e1fbd7

modular-magician requested a review from melinath October 5, 2022 21:02

melinath approved these changes Oct 11, 2022

View reviewed changes

melinath merged commit e3fed09 into GoogleCloudPlatform:main Oct 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding support for SQL Server Timezones #6635

Adding support for SQL Server Timezones #6635

Kevin-X-Wang commented Oct 3, 2022 •

edited

modular-magician commented Oct 3, 2022

modular-magician commented Oct 3, 2022

Kevin-X-Wang commented Oct 3, 2022

melinath left a comment

modular-magician commented Oct 4, 2022

Kevin-X-Wang commented Oct 4, 2022

modular-magician commented Oct 4, 2022

melinath left a comment

melinath Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

Kevin-X-Wang commented Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

melinath left a comment

Adding support for SQL Server Timezones #6635

Adding support for SQL Server Timezones #6635

Conversation

Kevin-X-Wang commented Oct 3, 2022 • edited

modular-magician commented Oct 3, 2022

modular-magician commented Oct 3, 2022

Kevin-X-Wang commented Oct 3, 2022

melinath left a comment

Choose a reason for hiding this comment

modular-magician commented Oct 4, 2022

Kevin-X-Wang commented Oct 4, 2022

modular-magician commented Oct 4, 2022

melinath left a comment

Choose a reason for hiding this comment

melinath Oct 5, 2022

Choose a reason for hiding this comment

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

Kevin-X-Wang commented Oct 5, 2022

modular-magician commented Oct 5, 2022

Diff report:

modular-magician commented Oct 5, 2022

Tests analytics

Action taken

modular-magician commented Oct 5, 2022

modular-magician commented Oct 5, 2022

Diff report:

modular-magician commented Oct 5, 2022

Tests analytics

Action taken

modular-magician commented Oct 5, 2022

melinath left a comment

Choose a reason for hiding this comment

Kevin-X-Wang commented Oct 3, 2022 •

edited