availability sli for SLO monitoring resource #4344

venkykuberan · 2020-12-22T01:00:32Z

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)

monitoring : added `availability` sli metric support for the resource `google_monitoring_slo`

fixes hashicorp/terraform-provider-google#7239

modular-magician · 2020-12-22T01:01:46Z

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.

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

modular-magician · 2020-12-22T01:08:40Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 107 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 107 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 16 insertions(+))

modular-magician · 2020-12-22T01:08:47Z

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

modular-magician · 2020-12-22T01:11:21Z

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 · 2020-12-29T21:35:34Z

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.

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

modular-magician · 2020-12-29T21:42:19Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 110 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 110 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 16 insertions(+))

modular-magician · 2020-12-29T21:42:27Z

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

modular-magician · 2020-12-29T21:44:54Z

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 · 2020-12-29T21:47:06Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 110 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 110 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 16 insertions(+))

modular-magician · 2020-12-29T21:47:15Z

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

modular-magician · 2020-12-29T21:49:46Z

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.

products/monitoring/terraform.yaml

templates/terraform/custom_flatten/monitoring_slo_availability_sli.go.erb

products/monitoring/api.yaml

…-modules into add-availability-sli-to-slo-7239

modular-magician · 2021-01-05T02:30:26Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 100 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 100 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 16 insertions(+))

modular-magician · 2021-01-05T02:30:31Z

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

modular-magician · 2021-01-05T02:33:13Z

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.

…lidation func added

modular-magician · 2021-01-08T23:59:56Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 131 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 4 files changed, 132 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-09T00:00:08Z

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

modular-magician · 2021-01-09T00:02:46Z

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 · 2021-01-09T00:04:11Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 131 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 131 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-09T00:04:22Z

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

modular-magician · 2021-01-09T00:06:59Z

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.

products/monitoring/api.yaml

templates/terraform/custom_flatten/monitoring_slo_availability_sli.go.erb

templates/terraform/encoders/monitoring_slo.go.erb

third_party/terraform/tests/resource_monitoring_slo_test.go

modular-magician · 2021-01-14T19:36:44Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 142 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 142 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 45 insertions(+))

modular-magician · 2021-01-14T19:37:02Z

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

modular-magician · 2021-01-14T19:39:31Z

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.

rileykarson · 2021-01-15T17:33:36Z

I'm seeing the following across multiple tests, can you take a look?

Test ended in panic.
------- Stdout: -------
=== RUN   TestAccMonitoringSlo_monitoringSloRequestBasedExample
=== PAUSE TestAccMonitoringSlo_monitoringSloRequestBasedExample
=== CONT  TestAccMonitoringSlo_monitoringSloRequestBasedExample
------- Stderr: -------
panic: interface conversion: interface {} is nil, not map[string]interface {}
goroutine 247 [running]:
github.com/hashicorp/terraform-provider-google-beta/v3/google-beta.resourceMonitoringSloEncoder(...)
  /opt/teamcity-agent/work/2e51954ade9939a/src/github.com/terraform-providers/terraform-provider-google-beta/google-beta/resource_monitoring_slo.go:2293
github.com/hashicorp/terraform-provider-google-beta/v3/google-beta.resourceMonitoringSloCreate(0xc000c43400, 0x3220800, 0xc001194e00, 0x0, 0x0)

Also, do you mind adding a changelog as well?

modular-magician · 2021-01-20T00:09:36Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 4 files changed, 144 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-20T00:09:46Z

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

rileykarson · 2021-01-20T21:44:51Z

templates/terraform/encoders/monitoring_slo.go.erb

-
-//Removing the dummy `enabled` attribute
-	if availability, ok := basSli["availability"]; ok {
+Sli := obj["serviceLevelIndicator"].(map[string]interface{})


Should we check if serviceLevelIndicator is present too, or is it guaranteed to always be returned?

A slo should have at least one ServiceLevelIndicator, Goal & calendar or rolling period.

rileykarson · 2021-01-20T21:45:40Z

Rerunning VCR

/gcbrun

modular-magician · 2021-01-20T21:53:39Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-20T21:53:57Z

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

modular-magician · 2021-01-20T23:05:01Z

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

modular-magician · 2021-01-26T19:31:04Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-26T19:44:31Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 143 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 4 files changed, 144 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 46 insertions(+))

modular-magician · 2021-01-26T19:44:45Z

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

inital check-in for review

3cbed43

google-cla bot added the cla: yes label Dec 22, 2020

modular-magician requested a review from nat-henderson December 22, 2020 01:01

slevenick removed the request for review from nat-henderson December 22, 2020 01:02

custom_flattner added

4eb7e10

modular-magician requested a review from nat-henderson December 29, 2020 21:35

venkykuberan requested review from rileykarson and removed request for nat-henderson December 29, 2020 21:36

venkykuberan marked this pull request as ready for review December 29, 2020 21:36

extra line added at EOF

f62743a

rileykarson reviewed Dec 29, 2020

View reviewed changes

venkykuberan added 2 commits January 4, 2021 17:13

Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…

41dcc36

…-modules into add-availability-sli-to-slo-7239

PR comments implemented

0d1a166

venkykuberan added 2 commits January 8, 2021 15:51

custom_expander logic is placed in encoder as it more appropriate, va…

0f9306e

…lidation func added

empty lines added at EOF

097fdaf

venkykuberan requested a review from rileykarson January 8, 2021 23:56

rileykarson reviewed Jan 12, 2021

View reviewed changes

PR comments implemented, Test cases added

60112f4

fixed encoder for the case where basicsli is not used in the config

38de1fc

rileykarson reviewed Jan 20, 2021

View reviewed changes

rileykarson approved these changes Jan 21, 2021

View reviewed changes

merge conflict fixed

071ca38

venkykuberan merged commit b01da15 into GoogleCloudPlatform:master Jan 27, 2021

availability sli for SLO monitoring resource #4344

availability sli for SLO monitoring resource #4344

Conversation

venkykuberan commented Dec 22, 2020 • edited Loading

modular-magician commented Dec 22, 2020

modular-magician commented Dec 22, 2020

Diff report:

modular-magician commented Dec 22, 2020

modular-magician commented Dec 22, 2020

modular-magician commented Dec 29, 2020

modular-magician commented Dec 29, 2020

Diff report:

modular-magician commented Dec 29, 2020

modular-magician commented Dec 29, 2020

modular-magician commented Dec 29, 2020

Diff report:

modular-magician commented Dec 29, 2020

modular-magician commented Dec 29, 2020

modular-magician commented Jan 5, 2021

Diff report:

modular-magician commented Jan 5, 2021

modular-magician commented Jan 5, 2021

modular-magician commented Jan 8, 2021

Diff report:

modular-magician commented Jan 9, 2021

modular-magician commented Jan 9, 2021

modular-magician commented Jan 9, 2021

Diff report:

modular-magician commented Jan 9, 2021

modular-magician commented Jan 9, 2021

modular-magician commented Jan 14, 2021

Diff report:

modular-magician commented Jan 14, 2021

modular-magician commented Jan 14, 2021

rileykarson commented Jan 15, 2021

modular-magician commented Jan 20, 2021

Diff report:

modular-magician commented Jan 20, 2021

rileykarson Jan 20, 2021

Choose a reason for hiding this comment

venkykuberan Jan 21, 2021 • edited Loading

Choose a reason for hiding this comment

rileykarson commented Jan 20, 2021

modular-magician commented Jan 20, 2021

Diff report:

modular-magician commented Jan 20, 2021

modular-magician commented Jan 20, 2021

modular-magician commented Jan 26, 2021

Diff report:

modular-magician commented Jan 26, 2021

Diff report:

modular-magician commented Jan 26, 2021

venkykuberan commented Dec 22, 2020 •

edited

Loading

venkykuberan Jan 21, 2021 •

edited

Loading