Fix condition in forceNewIfNetworkIPNotUpdatableFunc #11395

karolgorc · 2024-08-08T10:54:43Z

This function didn't work before.

d.HasChange will always return true in this condition because of this comparasion on the network field

https://www.googleapis.com/compute/v1/projects/iac-poc-krakow/global/networks/default
against
default

Release Note Template for Downstream PRs (will be copied)

compute: fixed force diff replacement logic for `network_ip` on resource `google_compute_instance`

github-actions · 2024-08-08T10:55:26Z

Hello! I am a robot. Tests will require approval from a repository maintainer to run.

@ScottSuarez, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

ScottSuarez

Is there a way to add a testcase for this to validate behavior going forward?

Overall the change makes sense to me.

modular-magician · 2024-08-12T22:03:58Z

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.

google provider: Diff ( 1 file changed, 2 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 1 file changed, 2 insertions(+), 1 deletion(-))

modular-magician · 2024-08-12T22:20:09Z

Tests analytics

Total tests: 979
Passed tests: 906
Skipped tests: 72
Affected tests: 1

Click here to see the affected service packages

compute

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

TestAccComputeInstance_subnetworkUpdate

Get to know how VCR tests work

modular-magician · 2024-08-12T22:24:47Z

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

$\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

karolgorc · 2024-08-13T07:22:12Z

Is there a way to add a testcase for this to validate behavior going forward?

Yup, will add 2 configs that change the network IP and expect a non-empty plan. Because before the terraform apply succeded but this function was never executed causing a change in every terraform plan as shown in the Issue

karolgorc · 2024-08-13T10:44:45Z

--- PASS: TestAccComputeInstance_networkIpUpdate (575.26s)
PASS
ok      github.com/hashicorp/terraform-provider-google/google/services/compute  575.285s

case 1:

Create an instance with network_ip 10.3.0.3
Check if instance exists and address matches

case 2:

Creating an instance with network_ip 10.3.0.4 forces replacement
Instance gets replaced
Check if instance exists and address matches

case 3:

Same as case 2 but uses google_compute_address instead of a hardcoded string value

This would previously fail and produce a non-empty plan before the changes

modular-magician · 2024-08-13T16:47:04Z

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.

google provider: Diff ( 2 files changed, 180 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 2 files changed, 180 insertions(+), 1 deletion(-))

modular-magician · 2024-08-13T17:02:15Z

Tests analytics

Total tests: 980
Passed tests: 907
Skipped tests: 72
Affected tests: 1

Click here to see the affected service packages

compute

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

TestAccComputeInstance_networkIpUpdate

Get to know how VCR tests work

modular-magician · 2024-08-13T17:08:03Z

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

$\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

ScottSuarez · 2024-08-13T18:02:52Z

Looks like there are unit test failures.

2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"allow.#":"1", "allow.0.ports.#":"4", "allow.0.ports.1693978638":"8080", "allow.0.ports.172152165":"8081", "allow.0.ports.299962681":"7072", "allow.0.ports.3435931483":"4044", "allow.0.protocol":"udp"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"allow.#":"1", "allow.0.ports.#":"4", "allow.0.ports.0":"8080", "allow.0.ports.1":"8081", "allow.0.ports.2":"7072", "allow.0.ports.3":"4044", "allow.0.protocol":"udp"}
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [INFO] Found Compute Instance Group State v1; migrating to v2
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"name":"instancegroup-test", "zone":"us-central1-c"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Group State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"instances.#":"1", "instances.0":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-1", "instances.1":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-0", "name":"instancegroup-test", "zone":"us-central1-c"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"instances.#":"1", "instances.1519187872":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-0", "instances.7[64](https://github.com/GoogleCloudPlatform/magic-modules/actions/runs/10373770092/job/28719655211?pr=11395#step:8:65)135222":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-1", "name":"instancegroup-test", "zone":"us-central1-c"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Group State v1; migrating to v2
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"instances.#":"1", "instances.1519187872":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-0", "instances.764135222":"https://www.googleapis.com/compute/v1/projects/project_name/zones/zone_name/instances/instancegroup-test-1", "name":"instancegroup-test", "zone":"us-central1-c"}
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true", "scheduling.#":"0"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true", "scheduling.#":"2", "scheduling.0.automatic_restart":"true", "scheduling.1.automatic_restart":"true"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true", "scheduling.#":"1", "scheduling.0.automatic_restart":"false"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true", "scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true", "on_host_maintenance":"MIGRATE", "scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [INFO] Found Compute Instance Template State v0; migrating to v1
2024/08/13 16:45:14 [DEBUG] Attributes before migration: map[string]string{"automatic_restart":"true"}
2024/08/13 16:45:14 [DEBUG] Attributes after migration: map[string]string{"scheduling.#":"1", "scheduling.0.automatic_restart":"true"}
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
2024/08/13 16:45:14 [DEBUG] Empty InstanceState; nothing to migrate.
--- FAIL: TestComputeInstance_networkIPCustomizedDiff (0.00s)
    resource_compute_instance_internal_test.go:134: NetworkIP and Subnetwork change: expected d.IsForceNew to be false, but was true
    resource_compute_instance_internal_test.go:134: NetworkIP and SubnetworkProject change: expected d.IsForceNew to be false, but was true
FAIL

TestComputeInstance_networkIPCustomizedDiff

…e more restrictive for unit test

karolgorc · 2024-08-14T10:49:05Z

--- PASS: TestComputeInstance_networkIPCustomizedDiff (0.00s)
PASS
ok      github.com/hashicorp/terraform-provider-google/google/services/compute   0.035s

Failed due to the OR statement that i added just in case. This is more restrictive and passing the unit test

modular-magician · 2024-08-14T15:46:58Z

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.

google provider: Diff ( 2 files changed, 181 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 2 files changed, 181 insertions(+), 1 deletion(-))

modular-magician · 2024-08-14T16:01:25Z

Tests analytics

Total tests: 981
Passed tests: 908
Skipped tests: 72
Affected tests: 1

Click here to see the affected service packages

compute

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

TestAccComputeInstance_subnetworkUpdate

Get to know how VCR tests work

modular-magician · 2024-08-14T16:06:27Z

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

$\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

…form#11395)

karolgorc added 3 commits August 8, 2024 12:40

Fix condition in forceNewIfNetworkIPNotUpdatableFunc

d51cbe4

broaden the if statement

5390292

fix white space

05b175b

github-actions bot requested a review from ScottSuarez August 8, 2024 10:55

modular-magician added the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Aug 8, 2024

ScottSuarez removed the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Aug 12, 2024

ScottSuarez reviewed Aug 12, 2024

View reviewed changes

ScottSuarez mentioned this pull request Aug 12, 2024

google_compute_instance update network_interface.network_ip with google_compute_address hashicorp/terraform-provider-google#16494

Closed

modular-magician added the service/compute-instances label Aug 12, 2024

github-actions bot requested a review from ScottSuarez August 13, 2024 07:22

add testing for network_ip updating

6c742f6

modular-magician added the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Aug 13, 2024

modular-magician removed the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Aug 13, 2024

change the if statement to resolve subnetwork selflinks, as well. Mak…

c8a5e93

…e more restrictive for unit test

modular-magician added awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests and removed awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests labels Aug 14, 2024

ScottSuarez approved these changes Aug 14, 2024

View reviewed changes

ScottSuarez merged commit 8400c36 into GoogleCloudPlatform:main Aug 14, 2024
13 checks passed

BBBmau pushed a commit to bschaatsbergen/magic-modules that referenced this pull request Aug 21, 2024

Fix condition in forceNewIfNetworkIPNotUpdatableFunc (GoogleCloudPlat…

50d0ab8

…form#11395)

rainshen49 pushed a commit to rainshen49/magic-modules that referenced this pull request Aug 21, 2024

Fix condition in forceNewIfNetworkIPNotUpdatableFunc (GoogleCloudPlat…

9264e3a

…form#11395)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix condition in forceNewIfNetworkIPNotUpdatableFunc #11395

Fix condition in forceNewIfNetworkIPNotUpdatableFunc #11395

karolgorc commented Aug 8, 2024 •

edited by ScottSuarez

Loading

github-actions bot commented Aug 8, 2024

ScottSuarez left a comment

modular-magician commented Aug 12, 2024

modular-magician commented Aug 12, 2024

modular-magician commented Aug 12, 2024

karolgorc commented Aug 13, 2024

karolgorc commented Aug 13, 2024 •

edited

Loading

modular-magician commented Aug 13, 2024

modular-magician commented Aug 13, 2024

modular-magician commented Aug 13, 2024

ScottSuarez commented Aug 13, 2024

karolgorc commented Aug 14, 2024

modular-magician commented Aug 14, 2024

modular-magician commented Aug 14, 2024

modular-magician commented Aug 14, 2024

Fix condition in forceNewIfNetworkIPNotUpdatableFunc #11395

Fix condition in forceNewIfNetworkIPNotUpdatableFunc #11395

Conversation

karolgorc commented Aug 8, 2024 • edited by ScottSuarez Loading

github-actions bot commented Aug 8, 2024

ScottSuarez left a comment

Choose a reason for hiding this comment

modular-magician commented Aug 12, 2024

Diff report

modular-magician commented Aug 12, 2024

Tests analytics

Action taken

modular-magician commented Aug 12, 2024

karolgorc commented Aug 13, 2024

karolgorc commented Aug 13, 2024 • edited Loading

modular-magician commented Aug 13, 2024

Diff report

modular-magician commented Aug 13, 2024

Tests analytics

Action taken

modular-magician commented Aug 13, 2024

ScottSuarez commented Aug 13, 2024

karolgorc commented Aug 14, 2024

modular-magician commented Aug 14, 2024

Diff report

modular-magician commented Aug 14, 2024

Tests analytics

Action taken

modular-magician commented Aug 14, 2024

karolgorc commented Aug 8, 2024 •

edited by ScottSuarez

Loading

karolgorc commented Aug 13, 2024 •

edited

Loading