add `numeric_id` field into `google_compute_network` resource #9473

BBBmau · 2023-11-15T00:34:53Z

This PR will fix an issue that relates to tag binding. Where it is only possible to use an id of a resource for binding rather than name. Because of the use of id within the terraform providers, numeric_id is used as a field which is the unique resource identifier for the resource.

marked as id in API documentation but will be named as numeric_id in provider

Release Note Template for Downstream PRs (will be copied)

compute: added `numeric_id` field to `google_compute_network` resource

modular-magician · 2023-11-15T00:45:02Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 2 files changed, 15 insertions(+))
Terraform Beta: Diff ( 2 files changed, 15 insertions(+))

modular-magician · 2023-11-15T01:57:49Z

Tests analytics

Total tests: 3226
Passed tests 2893
Skipped tests: 329
Affected tests: 4

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccContainerAttachedCluster_update|TestAccContainerAttachedCluster_containerAttachedClusterFullExample|TestAccDataprocJobIamPolicy|TestAccDataprocClusterIamPolicy

Get to know how VCR tests work

modular-magician · 2023-11-15T02:08:31Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccContainerAttachedCluster_update[Debug log]
TestAccContainerAttachedCluster_containerAttachedClusterFullExample[Debug log]
TestAccDataprocJobIamPolicy[Debug log]
TestAccDataprocClusterIamPolicy[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{green}{\textsf{All tests passed!}}$
View the build log or the debug log for each test

modular-magician · 2023-11-17T00:28:01Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 2 files changed, 52 insertions(+))
Terraform Beta: Diff ( 2 files changed, 52 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-17T01:10:02Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 122 insertions(+))
Terraform Beta: Diff ( 3 files changed, 122 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-17T02:20:56Z

Tests analytics

Total tests: 2385
Passed tests 2119
Skipped tests: 265
Affected tests: 1

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccDataprocClusterIamPolicy

Get to know how VCR tests work

modular-magician · 2023-11-17T02:26:38Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccDataprocClusterIamPolicy[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{red}{\textsf{Errors occurred during RECORDING mode. Please fix them to complete your PR.}}$
View the build log or the debug log for each test

SarahFrench · 2023-11-17T14:40:47Z

Checks are failing at the moment:

# github.com/hashicorp/terraform-provider-google/google/services/compute_test [github.com/hashicorp/terraform-provider-google/google/services/compute.test]
Error: google/services/compute/resource_compute_network_test.go:481:6: invalid operation: found.Id (variable of type uint64) is not an interface
Error: google/services/compute/resource_compute_network_test.go:485:6: invalid operation: found.Id (variable of type uint64) is not an interface

BBBmau · 2023-11-17T19:07:49Z

Checks are failing at the moment:

# github.com/hashicorp/terraform-provider-google/google/services/compute_test [github.com/hashicorp/terraform-provider-google/google/services/compute.test]
Error: google/services/compute/resource_compute_network_test.go:481:6: invalid operation: found.Id (variable of type uint64) is not an interface
Error: google/services/compute/resource_compute_network_test.go:485:6: invalid operation: found.Id (variable of type uint64) is not an interface

In my latest commit i addressed the value checks for id and numeric_id although it does provide a check of both values im not 100% convinced that this is the best way to go about it. Would love some input on this, I was expecting there to be a value that provides the id that's in the resource path. I found that I wasn't able to access it and had to produce it myself with the use of config.Project and found.name

modular-magician · 2023-11-17T19:16:30Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 122 insertions(+))
Terraform Beta: Diff ( 3 files changed, 122 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-17T19:33:29Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 123 insertions(+))
Terraform Beta: Diff ( 3 files changed, 123 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-17T20:50:50Z

Tests analytics

Total tests: 3236
Passed tests 2904
Skipped tests: 330
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccComputeNetwork_numericId|TestAccDataSourceGoogleServiceAccountAccessToken_basic

Get to know how VCR tests work

modular-magician · 2023-11-17T20:58:29Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccComputeNetwork_numericId[Debug log]
TestAccDataSourceGoogleServiceAccountAccessToken_basic[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{green}{\textsf{All tests passed!}}$
View the build log or the debug log for each test

SarahFrench

I don't think the current approach is the best way to address the problem, but to be fair adding fields that don't map to the API is confusing and requires a bunch of familiarity with the templating in MMv1! Gotta learn the rules to be able to break them 😉

If you'd like to pair on this issue please let me know, I'm available to help synchronously with some planning!

mmv1/products/compute/Network.yaml

mmv1/templates/terraform/custom_flatten/compute_network_numeric_id.go.erb

mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb

modular-magician · 2023-11-27T22:42:56Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 115 insertions(+))
Terraform Beta: Diff ( 3 files changed, 115 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-27T22:56:38Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 115 insertions(+))
Terraform Beta: Diff ( 3 files changed, 115 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-11-28T00:08:16Z

Tests analytics

Total tests: 3238
Passed tests 2906
Skipped tests: 331
Affected tests: 1

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccDataSourceGoogleServiceAccountAccessToken_basic

Get to know how VCR tests work

modular-magician · 2023-11-28T00:10:35Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccDataSourceGoogleServiceAccountAccessToken_basic[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{green}{\textsf{All tests passed!}}$
View the build log or the debug log for each test

mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb

modular-magician · 2023-12-07T00:22:48Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 82 insertions(+))
Terraform Beta: Diff ( 3 files changed, 82 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-12-07T01:34:43Z

Tests analytics

Total tests: 3267
Passed tests 2932
Skipped tests: 334
Affected tests: 1

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

TestAccGKEHub2Fleet_gkehubFleetBasicExample_update

Get to know how VCR tests work

modular-magician · 2023-12-07T01:54:00Z

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccGKEHub2Fleet_gkehubFleetBasicExample_update[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$

$\textcolor{green}{\textsf{All tests passed!}}$
View the build log or the debug log for each test

SarahFrench

Approved, and I'll leave it to you to merge! I've left a comment about the regex that you could push a commit for before merging, up to you. Thanks for taking the time to update the tests!

SarahFrench · 2023-12-07T11:44:57Z

mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb

+			{
+				Config: testAccComputeNetwork_basic(suffixName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestMatchResourceAttr("google_compute_network.bar", "numeric_id",regexp.MustCompile("[1-9]\\d{0,}")),


nit: this regex could be made a bit more strict by updating it to assert that only digits are in the value: ^[1-9]\d{0,}$. Currently the regex would match foobar123, which means it could say that projects/foobar/global/networks/foobar123 is a valid numeric_id value.

It could also be simplified down to ^\d{1,}$ which means 1 or more digits, whereas the other version looks for a digit and then 0 or more digits afterwards.

My favourite website for doing quick manual tests of regexes is https://regexr.com/

Though, just to be clear, if you're testing a regex that uses ^ and $ the regex will need to match everything in the text box:

modular-magician · 2023-12-07T13:24:51Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 82 insertions(+))
Terraform Beta: Diff ( 3 files changed, 82 insertions(+))
TF Conversion: Diff ( 1 file changed, 5 insertions(+))

modular-magician · 2023-12-07T14:37:16Z

Tests analytics

Total tests: 3269
Passed tests 2935
Skipped tests: 334
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

…CloudPlatform#9473) * add numberic_id field * add flattener, encoders, and id field for numeric_id use * WIP: add numberId test * add value checks for id and numeric_id * add strconv * use decoder to store id into numericId after API request * remove network check and add suffix variable * add endlines * typo * Updated test to explicitly check numeric_id and id with ResourceAttr * update regex to be more strict on numeric_id check

add numberic_id field

b12dc2d

modular-magician added the service/compute-vpc label Nov 15, 2023

SarahFrench self-requested a review November 16, 2023 11:38

add flattener, encoders, and id field for numeric_id use

a171167

BBBmau changed the title ~~add numberic_id field into google_compute_network.network resource~~ add numeric_id field into google_compute_network.network resource Nov 17, 2023

WIP: add numberId test

c40a8a6

add value checks for id and numeric_id

e910140

BBBmau marked this pull request as ready for review November 17, 2023 19:07

add strconv

77e0659

SarahFrench requested changes Nov 20, 2023

View reviewed changes

BBBmau added 3 commits November 27, 2023 14:02

use decoder to store id into numericId after API request

f5681ef

remove network check and add suffix variable

5bb5ac8

add endlines

797ee95

BBBmau requested a review from SarahFrench November 27, 2023 22:37

typo

ebe7ca0

SarahFrench reviewed Dec 5, 2023

View reviewed changes

mmv1/third_party/terraform/services/compute/resource_compute_network_test.go.erb Outdated Show resolved Hide resolved

BBBmau added 2 commits December 6, 2023 15:39

Merge branch 'main' into add-numeric_id-computenetwork-resource

81f62d8

Updated test to explicitly check numeric_id and id with ResourceAttr

ec5d4fe

BBBmau requested a review from SarahFrench December 7, 2023 00:17

BBBmau changed the title ~~add numeric_id field into google_compute_network.network resource~~ add numeric_id field into google_compute_network resource Dec 7, 2023

SarahFrench approved these changes Dec 7, 2023

View reviewed changes

update regex to be more strict on numeric_id check

c55320d

BBBmau merged commit d6ce702 into GoogleCloudPlatform:main Dec 7, 2023
6 checks passed

This was referenced Dec 7, 2023

add numeric_id field into google_compute_network resource hashicorp/terraform-provider-google-beta#6719

Merged

add numeric_id field into google_compute_network resource hashicorp/terraform-provider-google#16712

Merged

modular-magician mentioned this pull request Dec 7, 2023

add numeric_id field into google_compute_network resource GoogleCloudPlatform/terraform-google-conversion#1763

Merged

BBBmau mentioned this pull request Dec 23, 2023

Refactor networkName in TestAccComputeNetwork_* #9713

Merged

This was referenced Jan 2, 2024

Refactor networkName in TestAccComputeNetwork_* hashicorp/terraform-provider-google-beta#6800

Merged

Refactor networkName in TestAccComputeNetwork_* hashicorp/terraform-provider-google#16891

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add `numeric_id` field into `google_compute_network` resource #9473

add `numeric_id` field into `google_compute_network` resource #9473

BBBmau commented Nov 15, 2023 •

edited

Loading

modular-magician commented Nov 15, 2023

modular-magician commented Nov 15, 2023

modular-magician commented Nov 15, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

SarahFrench commented Nov 17, 2023

BBBmau commented Nov 17, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

modular-magician commented Nov 17, 2023

SarahFrench left a comment

modular-magician commented Nov 27, 2023

modular-magician commented Nov 27, 2023

modular-magician commented Nov 28, 2023

modular-magician commented Nov 28, 2023

modular-magician commented Dec 7, 2023

modular-magician commented Dec 7, 2023

modular-magician commented Dec 7, 2023

SarahFrench left a comment

SarahFrench Dec 7, 2023

SarahFrench Dec 7, 2023

modular-magician commented Dec 7, 2023

modular-magician commented Dec 7, 2023

add numeric_id field into google_compute_network resource #9473

add numeric_id field into google_compute_network resource #9473

Conversation

BBBmau commented Nov 15, 2023 • edited Loading

modular-magician commented Nov 15, 2023

Diff report

modular-magician commented Nov 15, 2023

Tests analytics

Action taken

modular-magician commented Nov 15, 2023

Rerun these tests in REPLAYING mode to catch issues

modular-magician commented Nov 17, 2023

Diff report

modular-magician commented Nov 17, 2023

Diff report

modular-magician commented Nov 17, 2023

Tests analytics

Action taken

modular-magician commented Nov 17, 2023

Rerun these tests in REPLAYING mode to catch issues

SarahFrench commented Nov 17, 2023

BBBmau commented Nov 17, 2023

modular-magician commented Nov 17, 2023

Diff report

modular-magician commented Nov 17, 2023

Diff report

modular-magician commented Nov 17, 2023

Tests analytics

Action taken

modular-magician commented Nov 17, 2023

Rerun these tests in REPLAYING mode to catch issues

SarahFrench left a comment

Choose a reason for hiding this comment

modular-magician commented Nov 27, 2023

Diff report

modular-magician commented Nov 27, 2023

Diff report

modular-magician commented Nov 28, 2023

Tests analytics

Action taken

modular-magician commented Nov 28, 2023

Rerun these tests in REPLAYING mode to catch issues

modular-magician commented Dec 7, 2023

Diff report

modular-magician commented Dec 7, 2023

Tests analytics

Action taken

modular-magician commented Dec 7, 2023

Rerun these tests in REPLAYING mode to catch issues

SarahFrench left a comment

Choose a reason for hiding this comment

SarahFrench Dec 7, 2023

Choose a reason for hiding this comment

SarahFrench Dec 7, 2023

Choose a reason for hiding this comment

modular-magician commented Dec 7, 2023

Diff report

modular-magician commented Dec 7, 2023

Tests analytics

add `numeric_id` field into `google_compute_network` resource #9473

add `numeric_id` field into `google_compute_network` resource #9473

BBBmau commented Nov 15, 2023 •

edited

Loading