Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloud NAT Rules and Configurable TCP Time Wait #6221

Merged
merged 6 commits into from
Jul 25, 2022

Conversation

DrFaust92
Copy link
Contributor

@DrFaust92 DrFaust92 commented Jul 5, 2022

Closes hashicorp/terraform-provider-google#10666

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: add `rules` and `tcp_time_wait_timeout_sec` to `google_compute_router_nat`

@modular-magician
Copy link
Collaborator

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

I've detected that you're a community contributor. @shuyama1, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

  • Ensuring it's backwards compatible, covers common error cases, etc.
  • Summarizing the change into a user-facing changelog note.
  • Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.


@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 2 files changed, 314 insertions(+))
Terraform Beta: Diff ( 2 files changed, 314 insertions(+))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2076
Passed tests 1840
Skipped tests: 226
Failed tests: 10

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample|TestAccFirebaserulesRelease_BasicRelease|TestAccComputeRouterNat_withNatIpsAndDrainNatIps|TestAccComputeRouterNat_withPortAllocationMethods|TestAccComputeRouterNat_withManualIpAndSubnetConfiguration|TestAccComputeRouterNat_removeLogConfig|TestAccComputeRouterNat_update|TestAccComputeRouterNat_basic|TestAccVPCAccessConnector_cloudrunVPCAccessConnectorExample

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccComputeRouterNat_basic[view]
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccVPCAccessConnector_cloudrunVPCAccessConnectorExample[view]
TestAccComputeRouterNat_withManualIpAndSubnetConfiguration[view]
TestAccComputeRouterNat_withNatIpsAndDrainNatIps[view]
TestAccComputeRouterNat_withPortAllocationMethods[view]
TestAccComputeRouterNat_removeLogConfig[view]
TestAccComputeRouterNat_update[view]

Tests failed during RECORDING mode:
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]

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

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 2 files changed, 314 insertions(+))
Terraform Beta: Diff ( 2 files changed, 314 insertions(+))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2095
Passed tests 1866
Skipped tests: 226
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample|TestAccFirebaserulesRelease_BasicRelease

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]

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

@DrFaust92 DrFaust92 marked this pull request as ready for review July 14, 2022 14:48
@DrFaust92
Copy link
Contributor Author

added test + fixes to schema

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 3 files changed, 614 insertions(+))
Terraform Beta: Diff ( 3 files changed, 419 insertions(+))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2096
Passed tests 1862
Skipped tests: 226
Failed tests: 8

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample|TestAccFirebaserulesRelease_BasicRelease|TestAccComputeRouterNat_rule|TestAccComputeRouterNat_withPortAllocationMethods|TestAccComputeRouterNat_withNatIpsAndDrainNatIps|TestAccComputeRouterNat_removeLogConfig|TestAccComputeRouterNat_update

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccComputeRouterNat_rule[view]
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccComputeRouterNat_withPortAllocationMethods[view]
TestAccComputeRouterNat_withNatIpsAndDrainNatIps[view]
TestAccComputeRouterNat_removeLogConfig[view]
TestAccComputeRouterNat_update[view]

Tests failed during RECORDING mode:
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]

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

Copy link
Member

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making the changes! Sorry for the delay on reviewing this.

mmv1/products/compute/api.yaml Show resolved Hide resolved
mmv1/products/compute/api.yaml Show resolved Hide resolved
@DrFaust92
Copy link
Contributor Author

Thanks for the comments shuyama1, ive added relevant tests.

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 3 files changed, 748 insertions(+))
Terraform Beta: Diff ( 3 files changed, 553 insertions(+))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2116
Passed tests 1882
Skipped tests: 226
Failed tests: 8

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccComputeRouterNat_tcpTimeWaitTimeoutSec|TestAccComputeRouterNat_rule|TestAccComputeInstance_soleTenantNodeAffinities|TestAccFirebaserulesRelease_BasicRelease|TestAccCloudRunService_cloudRunServiceStaticOutboundExample|TestAccSqlUser_mysqlDisabled|TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccCloudRunService_cloudRunServiceStaticOutboundExample[view]
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]
TestAccSqlUser_mysqlDisabled[view]
TestAccComputeRouterNat_rule[view]
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccComputeRouterNat_tcpTimeWaitTimeoutSec[view]

Tests failed during RECORDING mode:
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccComputeInstance_soleTenantNodeAffinities[view]

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

Copy link
Member

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

@shuyama1 shuyama1 merged commit 57f3a50 into GoogleCloudPlatform:main Jul 25, 2022
@shuyama1
Copy link
Member

shuyama1 commented Jul 29, 2022

Test TestAccComputeRouterNat_rule starts to fail in our nightly run due to:

provider_test.go:309: Step 3/4 error: After applying this test step, the plan was not empty.
stdout:
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
~ update in-place
Terraform will perform the following actions:
# google_compute_router_nat.foobar will be updated in-place
~ resource "google_compute_router_nat" "foobar" {
id                                  = "ci-test-project-188019/us-central1/tf-test-router-nat-kal6esk7c1/tf-test-router-nat-kal6esk7c1"
name                                = "tf-test-router-nat-kal6esk7c1"
# (16 unchanged attributes hidden)
~ rules {
~ match       = "inIpRange(destination.ip, '3.3.0.0/16') || inIpRange(destination.ip, '4.4.0.0/16')" -> "inIpRange(destination.ip, '1.1.0.0/16') || inIpRange(destination.ip, '5.5.0.0/16')"
~ rule_number = 2 -> 1
~ action {
~ source_nat_active_ips = [
- "https://www.googleapis.com/compute/v1/projects/ci-test-project-188019/regions/us-central1/addresses/tf-test-router-nat-kal6esk7c1-addr-3",
+ "projects/ci-test-project-188019/regions/us-central1/addresses/tf-test-router-nat-kal6esk7c1-addr-2",
]
# (1 unchanged attribute hidden)
}
}
~ rules {
~ match       = "inIpRange(destination.ip, '1.1.0.0/16') || inIpRange(destination.ip, '5.5.0.0/16')" -> "inIpRange(destination.ip, '3.3.0.0/16') || inIpRange(destination.ip, '4.4.0.0/16')"
~ rule_number = 1 -> 2
~ action {
~ source_nat_active_ips = [
- "https://www.googleapis.com/compute/v1/projects/ci-test-project-188019/regions/us-central1/addresses/tf-test-router-nat-kal6esk7c1-addr-2",
+ "projects/ci-test-project-188019/regions/us-central1/addresses/tf-test-router-nat-kal6esk7c1-addr-3",
]
+ source_nat_drain_ips  = []
}
}
}
Plan: 0 to add, 1 to change, 0 to destroy.

Reverting this change for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants