Add Active Directory to Cloud SQL #5988

priyam1011 · 2022-04-27T16:53:30Z

Fixes: hashicorp/terraform-provider-google#9561

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 `active_directory_config` field in `google_sql_database_instance`

modular-magician · 2022-04-27T16:53:44Z

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.

modular-magician · 2022-04-27T16:54:27Z

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

I've detected that you're a community contributor. @c2thorn, 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.

modular-magician · 2022-04-27T17:51:49Z

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.

c2thorn · 2022-04-27T19:05:10Z

/gcbrun

c2thorn · 2022-04-28T16:07:05Z

Still getting an error with go.mod. It suggests using go mod tidy. I would do that in your local provider repo after making the changes and check if it has made a diff

modular-magician · 2022-04-28T19:36:51Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 291 insertions(+), 118 deletions(-))
Terraform Beta: Diff ( 5 files changed, 291 insertions(+), 118 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-28T19:38:10Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2022-04-28T20:05:00Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 291 insertions(+), 118 deletions(-))
Terraform Beta: Diff ( 5 files changed, 291 insertions(+), 118 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-28T20:34:57Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 289 insertions(+), 118 deletions(-))
Terraform Beta: Diff ( 5 files changed, 289 insertions(+), 118 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

c2thorn · 2022-04-28T21:09:25Z

mmv1/third_party/terraform/go.mod.erb

+  cloud.google.com/go/iam v0.1.1 // indirect
+  github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0
+  github.com/apparentlymart/go-cidr v1.1.0
+  github.com/client9/misspell v0.3.4
+  github.com/davecgh/go-spew v1.1.1
+  github.com/dnaeon/go-vcr v1.0.1
+  github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 // indirect
+  github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92
+  github.com/golangci/golangci-lint v1.40.1
+  github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+  github.com/hashicorp/errwrap v1.0.0
+  github.com/hashicorp/go-cleanhttp v0.5.2
+  github.com/hashicorp/go-multierror v1.1.1
+  github.com/hashicorp/go-version v1.3.0
+  github.com/hashicorp/hcl/v2 v2.6.0 // indirect
+  github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
+  github.com/mitchellh/go-homedir v1.1.0
+  github.com/mitchellh/hashstructure v1.1.0
+  github.com/sirupsen/logrus v1.8.1
+  github.com/spf13/afero v1.2.2 // indirect
+  golang.org/x/mod v0.5.0 // indirect
+  golang.org/x/net v0.0.0-20220412020605-290c469a71a5
+  golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
+  google.golang.org/api v0.76.0
+  google.golang.org/grpc v1.45.0


Suggested change

cloud.google.com/go/iam v0.1.1 // indirect

github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0

github.com/apparentlymart/go-cidr v1.1.0

github.com/client9/misspell v0.3.4

github.com/davecgh/go-spew v1.1.1

github.com/dnaeon/go-vcr v1.0.1

github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 // indirect

github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92

github.com/golangci/golangci-lint v1.40.1

github.com/grpc-ecosystem/go-grpc-middleware v1.3.0

github.com/hashicorp/errwrap v1.0.0

github.com/hashicorp/go-cleanhttp v0.5.2

github.com/hashicorp/go-multierror v1.1.1

github.com/hashicorp/go-version v1.3.0

github.com/hashicorp/hcl/v2 v2.6.0 // indirect

github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1

github.com/mitchellh/go-homedir v1.1.0

github.com/mitchellh/hashstructure v1.1.0

github.com/sirupsen/logrus v1.8.1

github.com/spf13/afero v1.2.2 // indirect

golang.org/x/mod v0.5.0 // indirect

golang.org/x/net v0.0.0-20220412020605-290c469a71a5

golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5

google.golang.org/api v0.76.0

google.golang.org/grpc v1.45.0

cloud.google.com/go/iam v0.1.1 // indirect

github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0

github.com/apparentlymart/go-cidr v1.1.0

github.com/client9/misspell v0.3.4

github.com/davecgh/go-spew v1.1.1

github.com/dnaeon/go-vcr v1.0.1

github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 // indirect

github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92

github.com/golangci/golangci-lint v1.40.1

github.com/grpc-ecosystem/go-grpc-middleware v1.3.0

github.com/hashicorp/errwrap v1.0.0

github.com/hashicorp/go-cleanhttp v0.5.2

github.com/hashicorp/go-multierror v1.1.1

github.com/hashicorp/go-version v1.3.0

github.com/hashicorp/hcl/v2 v2.6.0 // indirect

github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1

github.com/mitchellh/go-homedir v1.1.0

github.com/mitchellh/hashstructure v1.1.0

github.com/sirupsen/logrus v1.8.1

github.com/spf13/afero v1.2.2 // indirect

golang.org/x/mod v0.5.0 // indirect

golang.org/x/net v0.0.0-20220412020605-290c469a71a5

golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5

google.golang.org/api v0.76.0

google.golang.org/grpc v1.45.0

minor whitespace discrepancy when copying over

modular-magician · 2022-04-28T21:46:55Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 286 insertions(+), 118 deletions(-))
Terraform Beta: Diff ( 5 files changed, 286 insertions(+), 118 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-28T22:22:22Z

Tests analytics

Total tests: 1997
Passed tests 1753
Skipped tests: 241
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccSqlDatabaseInstance_SqlServerAuditConfig|TestAccSqlDatabaseInstance_ActiveDirectory|TestAccFirebaserulesRelease_BasicRelease

modular-magician · 2022-04-28T22:22:48Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccSqlDatabaseInstance_SqlServerAuditConfig[view]
TestAccSqlDatabaseInstance_ActiveDirectory[view]

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

modular-magician · 2022-04-29T18:37:26Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 296 insertions(+), 97 deletions(-))
Terraform Beta: Diff ( 5 files changed, 296 insertions(+), 97 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-29T18:39:26Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2022-04-29T18:54:26Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 296 insertions(+), 97 deletions(-))
Terraform Beta: Diff ( 5 files changed, 296 insertions(+), 97 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-29T19:34:44Z

Tests analytics

Total tests: 1997
Passed tests 1753
Skipped tests: 241
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccSqlDatabaseInstance_SqlServerAuditConfig|TestAccSqlDatabaseInstance_ActiveDirectory

modular-magician · 2022-04-29T19:36:22Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccSqlDatabaseInstance_SqlServerAuditConfig[view]
TestAccSqlDatabaseInstance_ActiveDirectory[view]

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

modular-magician · 2022-04-29T22:55:31Z

Tests analytics

Total tests: 1997
Passed tests 1753
Skipped tests: 241
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccBigQueryDataTable_bigtable|TestAccSqlDatabaseInstance_SqlServerAuditConfig|TestAccSqlDatabaseInstance_ActiveDirectory

modular-magician · 2022-04-29T22:57:50Z

Tests passed during RECORDING mode:
TestAccBigQueryDataTable_bigtable[view]

Tests failed during RECORDING mode:
TestAccSqlDatabaseInstance_SqlServerAuditConfig[view]
TestAccSqlDatabaseInstance_ActiveDirectory[view]

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

modular-magician · 2022-04-30T03:29:17Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 295 insertions(+), 97 deletions(-))
Terraform Beta: Diff ( 5 files changed, 295 insertions(+), 97 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

modular-magician · 2022-04-30T04:07:25Z

Tests analytics

Total tests: 1997
Passed tests 1753
Skipped tests: 241
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccSqlDatabaseInstance_ActiveDirectory|TestAccSqlDatabaseInstance_SqlServerAuditConfig

modular-magician · 2022-04-30T04:09:12Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccSqlDatabaseInstance_SqlServerAuditConfig[view]
TestAccSqlDatabaseInstance_ActiveDirectory[view]

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

modular-magician · 2022-04-30T22:45:27Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 180 insertions(+), 97 deletions(-))
Terraform Beta: Diff ( 5 files changed, 180 insertions(+), 97 deletions(-))
TF Validator: Diff ( 2 files changed, 43 insertions(+), 17 deletions(-))

…directory

This reverts commit 3bc8982579299de3e5824845115bd82fc880403b.

This reverts commit f029dd20a97253b8ebfab262a6b9adaa05563ebd.

…from previous run

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

…tance.go.erb

modular-magician · 2022-05-10T20:00:27Z

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

Diff report:

Terraform GA: Diff ( 7 files changed, 181 insertions(+), 26 deletions(-))
Terraform Beta: Diff ( 7 files changed, 181 insertions(+), 26 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

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

Tests analytics

Total tests: 2014
Passed tests 1781
Skipped tests: 231
Failed tests: 2

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample

modular-magician · 2022-05-10T20:37:10Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample[view]

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

modular-magician requested a review from c2thorn April 27, 2022 16:54

c2thorn marked this pull request as ready for review April 27, 2022 19:05

priyam1011 force-pushed the sql-active-directory branch from 46c94c8 to afa4749 Compare April 28, 2022 19:22

This comment was marked as outdated.

Sign in to view

c2thorn reviewed Apr 28, 2022

View reviewed changes

priyam1011 force-pushed the sql-active-directory branch from 69f6440 to 9a4a17a Compare April 29, 2022 22:02

priyam1011 added 18 commits May 10, 2022 15:36

Fix lint errors

4c502b0

Add AD domain resource creation in test & revert to tf created network

ad4e87c

Fix lint error

96af952

Remove unused variables

888aab3

Fix reserved_ip_range field error

1d6c085

Add authorized network to AD domain

03246ec

Revert go.sum & go.mod.erb changes as they are not needed for active …

b7eb04b

…directory

Fix authorized_networks field in AD domain

88e707b

Test run with existing AD ad.domain.com

cce507f

Fix addressRangeName field

be9bb85

Add AD bootstrap logic & use separate network

89f4be7

Add newline to rerun failing generate-diff step

75e9499

Revert "Add newline to rerun failing generate-diff step"

79c1980

This reverts commit 3bc8982579299de3e5824845115bd82fc880403b.

Revert "Add AD bootstrap logic & use separate network"

4131783

This reverts commit f029dd20a97253b8ebfab262a6b9adaa05563ebd.

Reapply AD bootstrap & test changes

9e35cde

AD bootstrap - Comment 60 min wait & rerun to test using existing AD …

30c7d69

…from previous run

Fix test ResourceName

90b69b2

Fixed formatting

c9b1146

priyam1011 force-pushed the sql-active-directory branch from 5d98764 to c9b1146 Compare May 10, 2022 19:37

c2thorn reviewed May 10, 2022

View reviewed changes

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

c2thorn and others added 2 commits May 10, 2022 14:40

Update mmv1/third_party/terraform/resources/resource_sql_database_ins…

d1f4e2c

…tance.go.erb

Add missing comma in active directory block

e93449c

c2thorn approved these changes May 10, 2022

View reviewed changes

c2thorn merged commit fc25e5c into GoogleCloudPlatform:main May 10, 2022

This was referenced May 10, 2022

Add Active Directory to Cloud SQL hashicorp/terraform-provider-google#11678

Merged

Add Active Directory to Cloud SQL hashicorp/terraform-provider-google-beta#4298

Merged

modular-magician mentioned this pull request May 10, 2022

Add Active Directory to Cloud SQL GoogleCloudPlatform/terraform-validator#692

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Active Directory to Cloud SQL #5988

Add Active Directory to Cloud SQL #5988

priyam1011 commented Apr 27, 2022 •

edited

Loading

modular-magician commented Apr 27, 2022

modular-magician commented Apr 27, 2022

modular-magician commented Apr 27, 2022

c2thorn commented Apr 27, 2022

c2thorn commented Apr 28, 2022

modular-magician commented Apr 28, 2022

modular-magician commented Apr 28, 2022

modular-magician commented Apr 28, 2022

This comment was marked as outdated.

modular-magician commented Apr 28, 2022

This comment was marked as outdated.

c2thorn Apr 28, 2022

modular-magician commented Apr 28, 2022

modular-magician commented Apr 28, 2022

modular-magician commented Apr 28, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 30, 2022

modular-magician commented Apr 30, 2022

modular-magician commented Apr 30, 2022

modular-magician commented Apr 30, 2022

modular-magician commented May 10, 2022

modular-magician commented May 10, 2022

modular-magician commented May 10, 2022

Add Active Directory to Cloud SQL #5988

Add Active Directory to Cloud SQL #5988

Conversation

priyam1011 commented Apr 27, 2022 • edited Loading

modular-magician commented Apr 27, 2022

modular-magician commented Apr 27, 2022

modular-magician commented Apr 27, 2022

c2thorn commented Apr 27, 2022

c2thorn commented Apr 28, 2022

modular-magician commented Apr 28, 2022

Diff report:

modular-magician commented Apr 28, 2022

Tests analytics

modular-magician commented Apr 28, 2022

Diff report:

This comment was marked as outdated.

modular-magician commented Apr 28, 2022

Diff report:

This comment was marked as outdated.

c2thorn Apr 28, 2022

Choose a reason for hiding this comment

modular-magician commented Apr 28, 2022

Diff report:

modular-magician commented Apr 28, 2022

Tests analytics

Action taken

modular-magician commented Apr 28, 2022

modular-magician commented Apr 29, 2022

Diff report:

modular-magician commented Apr 29, 2022

Tests analytics

modular-magician commented Apr 29, 2022

Diff report:

modular-magician commented Apr 29, 2022

Tests analytics

Action taken

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

Tests analytics

Action taken

modular-magician commented Apr 29, 2022

modular-magician commented Apr 30, 2022

Diff report:

modular-magician commented Apr 30, 2022

Tests analytics

Action taken

modular-magician commented Apr 30, 2022

modular-magician commented Apr 30, 2022

Diff report:

modular-magician commented May 10, 2022

Diff report:

modular-magician commented May 10, 2022

Tests analytics

Action taken

modular-magician commented May 10, 2022

priyam1011 commented Apr 27, 2022 •

edited

Loading