Support Query Insights #4464

itkq · 2021-02-04T09:41:31Z

Fixes hashicorp/terraform-provider-google#8328

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 `insights_config` block to `google_sql_database_instance` resource

google-cla · 2021-02-04T09:41:35Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

modular-magician · 2021-02-04T09:42:49Z

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

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@c2thorn, please review this PR or find an appropriate assignee.

modular-magician · 2021-02-04T09:50:13Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))

itkq · 2021-02-04T10:03:52Z

@googlebot I signed it!

modular-magician · 2021-02-04T10:10:22Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))

ve6yeq

LGTM

c2thorn · 2021-02-09T17:59:51Z

Sorry for the delay, I should be able to get to this over the next day or so

c2thorn · 2021-02-09T19:49:28Z

/gcbrun

modular-magician · 2021-02-09T19:49:42Z

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=171656"

modular-magician · 2021-02-09T19:57:33Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))

modular-magician · 2021-02-09T21:34:53Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccSqlDatabaseInstance_insights You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=171672"

modular-magician · 2021-02-09T21:49:08Z

Tests failed during RECORDING mode: TestAccSqlDatabaseInstance_insights Please fix these to complete your PR

c2thorn

Only a couple of small asks here, overall great! Tests also passing.

c2thorn · 2021-02-09T21:53:08Z

mmv1/third_party/terraform/website/docs/d/sql_database_instance.html.markdown

@@ -179,3 +179,13 @@ The `replica_configuration` block contains:
 * `server_ca_cert.0.expiration_time` - Expiration time of the CA Cert.

 * `server_ca_cert.0.sha1_fingerprint` - SHA Fingerprint of the CA Cert.
+
+The `settings.insights_config` subblock for instances declares [Query Insights](https://cloud.google.com/sql/docs/postgres/insights-overview) configuration. It contains:


Can we move this sub block just above the replica_configuration block (line 129)? To be closer with other settings blocks

Agreed 8464a20

c2thorn · 2021-02-09T21:57:26Z

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

@@ -1322,6 +1346,26 @@ resource "google_sql_database_instance" "instance" {
 }
 `

+var testGoogleSqlDatabaseInstance_insights = `
+resource "google_sql_database_instance" "instance" {
+  name   = "tf-lw-%d"


Suggested change

name = "tf-lw-%d"

name = "tf-test-%d"

Allows any hanging database instances to be swept (some other test configs in this file are outdated)

Fixed 42df0e2

modular-magician · 2021-02-10T00:28:02Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))

c2thorn · 2021-02-10T16:06:43Z

/gcbrun

modular-magician · 2021-02-10T16:06:59Z

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=171761"

modular-magician · 2021-02-10T16:15:03Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 139 insertions(+), 1 deletion(-))

modular-magician · 2021-02-10T17:18:43Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccEssentialContactsContact_essentialContactExample|TestAccSqlDatabaseInstance_insights You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=171763"

itkq · 2021-02-10T23:31:44Z

Thanks!

* Support Query Insights * Fix test instance name * Move doc of settings.insights_config closer with other settings blocks

google-cla bot added the cla: no label Feb 4, 2021

modular-magician requested a review from c2thorn February 4, 2021 09:42

Support Query Insights

0929d77

itkq force-pushed the sql-insights branch from b174f43 to 0929d77 Compare February 4, 2021 10:02

google-cla bot added cla: yes and removed cla: no labels Feb 4, 2021

ve6yeq approved these changes Feb 9, 2021

View reviewed changes

c2thorn requested changes Feb 9, 2021

View reviewed changes

itkq added 2 commits February 10, 2021 09:17

Fix test instance name

42df0e2

Move doc of settings.insights_config closer with other settings blocks

8464a20

c2thorn approved these changes Feb 10, 2021

View reviewed changes

c2thorn merged commit 7912445 into GoogleCloudPlatform:master Feb 10, 2021

This was referenced Feb 10, 2021

Support Query Insights hashicorp/terraform-provider-google#8434

Merged

Support Query Insights hashicorp/terraform-provider-google-beta#2944

Merged

itkq deleted the sql-insights branch February 10, 2021 23:07

venkykuberan pushed a commit to venkykuberan/magic-modules that referenced this pull request Feb 11, 2021

Support Query Insights (GoogleCloudPlatform#4464)

f3fe562

* Support Query Insights * Fix test instance name * Move doc of settings.insights_config closer with other settings blocks

Chupaka mentioned this pull request Feb 25, 2021

Support for Cloud SQL Query Insights hashicorp/terraform-provider-google#8449

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Query Insights #4464

Support Query Insights #4464

itkq commented Feb 4, 2021

google-cla bot commented Feb 4, 2021

modular-magician commented Feb 4, 2021

modular-magician commented Feb 4, 2021

itkq commented Feb 4, 2021

modular-magician commented Feb 4, 2021

ve6yeq left a comment

c2thorn commented Feb 9, 2021

c2thorn commented Feb 9, 2021

modular-magician commented Feb 9, 2021

modular-magician commented Feb 9, 2021

modular-magician commented Feb 9, 2021

modular-magician commented Feb 9, 2021

c2thorn left a comment

c2thorn Feb 9, 2021

itkq Feb 10, 2021

c2thorn Feb 9, 2021

itkq Feb 10, 2021

modular-magician commented Feb 10, 2021

c2thorn commented Feb 10, 2021

modular-magician commented Feb 10, 2021

modular-magician commented Feb 10, 2021

modular-magician commented Feb 10, 2021

itkq commented Feb 10, 2021

Support Query Insights #4464

Support Query Insights #4464

Conversation

itkq commented Feb 4, 2021

google-cla bot commented Feb 4, 2021

What to do if you already signed the CLA

Individual signers

Corporate signers

modular-magician commented Feb 4, 2021

modular-magician commented Feb 4, 2021

Diff report:

itkq commented Feb 4, 2021

modular-magician commented Feb 4, 2021

Diff report:

ve6yeq left a comment

Choose a reason for hiding this comment

c2thorn commented Feb 9, 2021

c2thorn commented Feb 9, 2021

modular-magician commented Feb 9, 2021

modular-magician commented Feb 9, 2021

Diff report:

modular-magician commented Feb 9, 2021

modular-magician commented Feb 9, 2021

c2thorn left a comment

Choose a reason for hiding this comment

c2thorn Feb 9, 2021

Choose a reason for hiding this comment

itkq Feb 10, 2021

Choose a reason for hiding this comment

c2thorn Feb 9, 2021

Choose a reason for hiding this comment

itkq Feb 10, 2021

Choose a reason for hiding this comment

modular-magician commented Feb 10, 2021

Diff report:

c2thorn commented Feb 10, 2021

modular-magician commented Feb 10, 2021

modular-magician commented Feb 10, 2021

Diff report:

modular-magician commented Feb 10, 2021

itkq commented Feb 10, 2021