dcl upgrade #5994

shuyama1 · 2022-04-29T17:43:12Z

This PR includes the changes in:
#5936
#5902

Fixes hashicorp/terraform-provider-google#10873
Fixes hashicorp/terraform-provider-google#10297
Fixes hashicorp/terraform-provider-google#11487

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)

compute: added `service_directory_registrations` to `google_compute_forwarding_rule` resource

containeraws: added `proxy_config` to `google_container_aws_node_pool` resource

containerazure: added `proxy_config` to `google_container_azure_node_pool` resource

containeraws: added `instance_placement` and `logging_config` to `google_container_aws_cluster` resource (beta)

containeraws: added `image_type` and `instance_placement` to `google_container_aws_node_pool` resource (beta)

containerazure: added `logging_config` to `google_container_azure_cluster` resource (beta)

containerazure: added `image_type` to `google_container_azure_node_pool` resource (beta)

modular-magician · 2022-04-29T17:58:06Z

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

Diff report:

Terraform GA: Diff ( 14 files changed, 545 insertions(+), 135 deletions(-))
Terraform Beta: Diff ( 16 files changed, 853 insertions(+), 135 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

modular-magician · 2022-04-29T18:43:03Z

Tests analytics

Total tests: 1995
Passed tests 1752
Skipped tests: 241
Failed tests: 2

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccContainerAzureNodePool_BasicHandWritten|TestAccContainerAwsNodePool_BasicHandWritten

modular-magician · 2022-04-29T18:43:29Z

Tests failed during RECORDING mode:
TestAccContainerAwsNodePool_BasicHandWritten[view]
TestAccContainerAzureNodePool_BasicHandWritten[view]

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

modular-magician · 2022-04-29T20:55:03Z

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

Diff report:

Terraform GA: Diff ( 14 files changed, 950 insertions(+), 137 deletions(-))
Terraform Beta: Diff ( 18 files changed, 2302 insertions(+), 137 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

modular-magician · 2022-04-29T21:30:02Z

Tests analytics

Total tests: 1999
Passed tests 1751
Skipped tests: 241
Failed tests: 7

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccContainerAzureCluster_BetaBasicHandWritten|TestAccContainerAzureNodePool_BasicHandWritten|TestAccContainerAzureCluster_BasicHandWritten|TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccContainerAwsCluster_BetaBasicHandWritten|TestAccContainerAzureNodePool_BetaBasicHandWritten|TestAccBigQueryDataTable_bigtable

modular-magician · 2022-04-29T21:31:52Z

Tests passed during RECORDING mode:
TestAccBigQueryDataTable_bigtable[view]
TestAccContainerAzureNodePool_BetaBasicHandWritten[view]
TestAccContainerAzureNodePool_BasicHandWritten[view]
TestAccContainerAwsNodePool_BetaBasicHandWritten[view]
TestAccContainerAwsCluster_BetaBasicHandWritten[view]

Tests failed during RECORDING mode:
TestAccContainerAzureCluster_BetaBasicHandWritten[view]
TestAccContainerAzureCluster_BasicHandWritten[view]

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

modular-magician · 2022-04-29T23:07:42Z

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

Diff report:

Terraform GA: Diff ( 14 files changed, 829 insertions(+), 89 deletions(-))
Terraform Beta: Diff ( 20 files changed, 2392 insertions(+), 137 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-04-29T23:10:35Z

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-29T23:38:23Z

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

Diff report:

Terraform GA: Diff ( 14 files changed, 829 insertions(+), 89 deletions(-))
Terraform Beta: Diff ( 20 files changed, 2392 insertions(+), 137 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-04-29T23:50:51Z

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

Diff report:

Terraform GA: Diff ( 14 files changed, 829 insertions(+), 89 deletions(-))
Terraform Beta: Diff ( 19 files changed, 2250 insertions(+), 89 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

slevenick · 2022-04-29T23:49:36Z

tpgtools/overrides/compute/beta/forwarding_rule.yaml

@@ -123,3 +123,6 @@
 - type: EXCLUDE
  field: location
  location: global
+- type: EXCLUDE


This is why we prefer having split out resources for different locations, right?

Yeah, absolutely.

slevenick · 2022-04-29T23:50:53Z

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

+
+	poolName := fmt.Sprintf("tf-%s", randString(t, 10))
+	ruleName := fmt.Sprintf("tf-%s", randString(t, 10))
+	svcDirNamespace := fmt.Sprintf("tf-svcdirns-%s", randString(t, 10))


Should these be tf-test- to work with sweepers?

slevenick · 2022-04-29T23:53:00Z

tpgtools/overrides/containerazure/samples/nodepool/basic_update.tf.tmpl

@@ -80,7 +85,7 @@ resource "google_container_azure_node_pool" "primary" {

  name      = "{{node-pool-name}}"
  subnet_id = "/subscriptions/{{azure_subscription}}/resourceGroups/{{byo_multicloud_prefix}}-dev-byo/providers/Microsoft.Network/virtualNetworks/{{byo_multicloud_prefix}}-dev-vnet/subnets/default"
-  version   = "1.21.6-gke.1500"
+  version   = "${data.google_container_azure_versions.versions.valid_versions[0]}"


Are these handwritten? This will make it significantly more difficult to change this to be based off the samples in the DCL repo.

modular-magician · 2022-04-30T00:26:43Z

Tests analytics

Total tests: 2000
Passed tests 1755
Skipped tests: 241
Failed tests: 4

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccContainerAzureCluster_BetaBasicHandWritten|TestAccContainerAzureCluster_BasicHandWritten|TestAccComputeForwardingRule_serviceDirectoryRegistrations

modular-magician · 2022-04-30T00:28:23Z

Tests passed during RECORDING mode:
TestAccComputeForwardingRule_serviceDirectoryRegistrations[view]
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccContainerAzureCluster_BetaBasicHandWritten[view]
TestAccContainerAzureCluster_BasicHandWritten[view]

All tests passed
View the build log or the debug log for each test

modular-magician · 2022-05-02T19:26:51Z

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

Diff report:

Terraform GA: Diff ( 13 files changed, 355 insertions(+), 89 deletions(-))
Terraform Beta: Diff ( 19 files changed, 1832 insertions(+), 89 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-05-02T20:13:53Z

Tests analytics

Total tests: 2000
Passed tests 1756
Skipped tests: 241
Failed tests: 3

Action taken

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

modular-magician · 2022-05-02T20:21:15Z

Tests passed during RECORDING mode:
TestAccComputeForwardingRule_serviceDirectoryRegistrations[view]
TestAccServiceNetworkingPeeredDNSDomain_basic[view]
TestAccFirebaserulesRelease_BasicRelease[view]

All tests passed
View the build log or the debug log for each test

…trations from global_forwarding_rule

modular-magician · 2022-05-02T23:31:03Z

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

Diff report:

Terraform GA: Diff ( 17 files changed, 448 insertions(+), 93 deletions(-))
Terraform Beta: Diff ( 19 files changed, 1935 insertions(+), 93 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-05-03T00:15:12Z

Tests analytics

Total tests: 2002
Passed tests 1759
Skipped tests: 241
Failed tests: 2

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccContainerAwsNodePool_BasicHandWritten

modular-magician · 2022-05-03T00:15:39Z

Tests passed during RECORDING mode:
TestAccContainerAwsNodePool_BasicHandWritten[view]

Tests failed during RECORDING mode:
TestAccContainerAwsNodePool_BetaBasicHandWritten[view]

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

modular-magician · 2022-05-03T00:42:24Z

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

Diff report:

Terraform GA: Diff ( 17 files changed, 448 insertions(+), 93 deletions(-))
Terraform Beta: Diff ( 19 files changed, 1935 insertions(+), 93 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-05-03T01:30:43Z

Tests analytics

Total tests: 2002
Passed tests 1759
Skipped tests: 241
Failed tests: 2

Action taken

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

modular-magician · 2022-05-03T01:31:24Z

Tests passed during RECORDING mode:
TestAccContainerAwsNodePool_BetaBasicHandWritten[view]
TestAccFirebaserulesRelease_BasicRelease[view]

All tests passed
View the build log or the debug log for each test

slevenick · 2022-05-03T16:11:30Z

mmv1/products/compute/api.yaml

+              name: 'namespace'
+              description: |
+                Service Directory namespace to register the forwarding rule under.
+              required: true


These two are listed as "Required" but aren't actually required according to the produced schema.

Fixed it! Thanks!

slevenick

One note on required in the docs for forwarding rule, other than that LGTM!

modular-magician · 2022-05-03T16:35:54Z

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

Diff report:

Terraform GA: Diff ( 17 files changed, 448 insertions(+), 93 deletions(-))
Terraform Beta: Diff ( 19 files changed, 1935 insertions(+), 93 deletions(-))
TF Validator: Diff ( 3 files changed, 48 insertions(+), 5 deletions(-))

modular-magician · 2022-05-03T17:13:48Z

Tests analytics

Total tests: 2002
Passed tests 1760
Skipped tests: 241
Failed tests: 1

Action taken

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

modular-magician · 2022-05-03T17:14:10Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

All tests passed
View the build log or the debug log for each test

shuyama1 requested a review from slevenick April 29, 2022 23:38

slevenick reviewed Apr 29, 2022

View reviewed changes

shuyama1 added 11 commits May 2, 2022 16:04

dcl upgrade + proxy_config test

befe9ba

run make serialize

1e3a4bd

added more multicloud tests

42d2447

added forwarding_rule tests + doc and exclude service_directory_regis…

71da819

…trations from global_forwarding_rule

fix tests

6da3fc0

run make serialize

9c358f3

fix forwarding_rule test

4afd99f

added EXCLUDE to beta file

901d32d

update test + hide beta example + exclude containeraws proxy_config

bb48039

upgrade dcl to 1.5.1

71e0155

added proxy_config test

f6e9e61

shuyama1 force-pushed the dcl_upgrade branch from c05fe0d to f6e9e61 Compare May 2, 2022 23:11

remove EXCLUDE tag

66ca32e

shuyama1 requested a review from slevenick May 2, 2022 23:57

shuyama1 added 2 commits May 2, 2022 17:25

fix test

df2c161

format

9afb3d3

slevenick reviewed May 3, 2022

View reviewed changes

slevenick self-requested a review May 3, 2022 16:14

slevenick approved these changes May 3, 2022

View reviewed changes

remove require

54f17eb

shuyama1 merged commit 94c8b3b into GoogleCloudPlatform:main May 3, 2022

shuyama1 mentioned this pull request May 3, 2022

chore: Bump DCL to v1.4.0. #5902

Closed

5 tasks

This was referenced May 3, 2022

dcl upgrade hashicorp/terraform-provider-google#11635

Merged

dcl upgrade hashicorp/terraform-provider-google-beta#4276

Merged

dcl upgrade GoogleCloudPlatform/terraform-validator#677

Merged

This was referenced May 16, 2022

Added service_directory_registrations to forwarding_rule resource #5936

Closed

Missing support for loggingConfig in google_container_aws_cluster hashicorp/terraform-provider-google#11679

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dcl upgrade #5994

dcl upgrade #5994

shuyama1 commented Apr 29, 2022 •

edited

Loading

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 29, 2022

modular-magician commented Apr 29, 2022

modular-magician commented Apr 29, 2022

slevenick Apr 29, 2022

shuyama1 May 2, 2022

slevenick Apr 29, 2022

slevenick Apr 29, 2022

modular-magician commented Apr 30, 2022

modular-magician commented Apr 30, 2022

modular-magician commented May 2, 2022

modular-magician commented May 2, 2022

modular-magician commented May 2, 2022

modular-magician commented May 2, 2022

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

slevenick May 3, 2022

shuyama1 May 3, 2022

slevenick left a comment

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

dcl upgrade #5994

dcl upgrade #5994

Conversation

shuyama1 commented Apr 29, 2022 • edited Loading

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

Diff report:

modular-magician commented Apr 29, 2022

Tests analytics

Action taken

modular-magician commented Apr 29, 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

Diff report:

slevenick Apr 29, 2022

Choose a reason for hiding this comment

shuyama1 May 2, 2022

Choose a reason for hiding this comment

slevenick Apr 29, 2022

Choose a reason for hiding this comment

slevenick Apr 29, 2022

Choose a reason for hiding this comment

modular-magician commented Apr 30, 2022

Tests analytics

Action taken

modular-magician commented Apr 30, 2022

modular-magician commented May 2, 2022

Diff report:

modular-magician commented May 2, 2022

Tests analytics

Action taken

modular-magician commented May 2, 2022

modular-magician commented May 2, 2022

Diff report:

modular-magician commented May 3, 2022

Tests analytics

Action taken

modular-magician commented May 3, 2022

modular-magician commented May 3, 2022

Diff report:

modular-magician commented May 3, 2022

Tests analytics

Action taken

modular-magician commented May 3, 2022

slevenick May 3, 2022

Choose a reason for hiding this comment

shuyama1 May 3, 2022

Choose a reason for hiding this comment

slevenick left a comment

Choose a reason for hiding this comment

modular-magician commented May 3, 2022

Diff report:

modular-magician commented May 3, 2022

Tests analytics

Action taken

modular-magician commented May 3, 2022

shuyama1 commented Apr 29, 2022 •

edited

Loading