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

Add DynamicPortAllocation for Cloud NAT #6022

Merged

Conversation

ichbinfrog
Copy link
Contributor

Adds the enable_dynamic_port_allocation (see equivalent on enableDynamicPortAllocation field in the respective API) field for the google_compute_router_nat resource.

Solves this issue: hashicorp/terraform-provider-google#11052

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).

For the google_compute_router_nat resource this does not seem to apply

  • 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 `enable_dynamic_port_allocation` 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. @c2thorn, 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 modular-magician requested a review from c2thorn May 10, 2022 15:21
@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 ( 4 files changed, 44 insertions(+), 4 deletions(-))
Terraform Beta: Diff ( 3 files changed, 50 insertions(+), 10 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2013
Passed tests 1780
Skipped tests: 231
Failed tests: 2

Action taken

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

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample[view]

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

Copy link
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

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

Hi @ichbinfrog
Can you add an example of of this field in use or add it to an existing example? That way it will be tested for functionality.

@ichbinfrog
Copy link
Contributor Author

Thanks for the review @c2thorn.

Sorry if it's not the correct method but I've added in the latest commit tests for the different port allocation methods in mmv1/third_party/terraform/tests because of the following comment: These examples are not used to autogenerate 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 ( 5 files changed, 61 insertions(+), 12 deletions(-))
Terraform Beta: Diff ( 4 files changed, 57 insertions(+), 8 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2019
Passed tests 1786
Skipped tests: 231
Failed tests: 2

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeRouterNat_withPortAllocationMethods|TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccComputeRouterNat_withPortAllocationMethods[view]

Tests failed during RECORDING mode:
TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample[view]

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

@c2thorn c2thorn merged commit 09bc35c into GoogleCloudPlatform:main May 16, 2022
dark added a commit to dark/magic-modules that referenced this pull request Jun 14, 2022
Having a hardcoded default_value of `false` for the
`enableDynamicPortAllocation` property is troublesome, and the
upstream default should be used. This was added as part of GoogleCloudPlatform#6022.

By hardcoding the default here, any client will explicitly deprogram
the dynamic port allocation setting if it is not part of the client
configuration. This is causing problems for those clients that have
enabled the dynamic port allocation out of band, since the current
support is incomplete (not all parameters can be set via Terraform:
terraform-google-modules/terraform-google-cloud-nat#64 (comment)). While
full support is being added, removing hardcoded defaults allow
out-of-band configurations to continue working.
dark added a commit to dark/magic-modules that referenced this pull request Jun 21, 2022
…amicPortAllocation

Support for the Dynamic Port Allocation feature (tracked in
terraform-google-modules/terraform-google-cloud-nat#64 and
hashicorp/terraform-provider-google#11052) was initially implemented
in GoogleCloudPlatform#6022, but it lacked support for the maxPortsPerVm field. This
field is crucial to allow the full configuration to work.
melinath pushed a commit that referenced this pull request Jun 22, 2022
…amicPortAllocation (#6155)

Support for the Dynamic Port Allocation feature (tracked in
terraform-google-modules/terraform-google-cloud-nat#64 and
hashicorp/terraform-provider-google#11052) was initially implemented
in #6022, but it lacked support for the maxPortsPerVm field. This
field is crucial to allow the full configuration to work.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants