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

Move files to the sweeper and envvar packages #5824

Conversation

modular-magician
Copy link
Collaborator

Main changes are in the files

  • mmv1/third_party/terraform/acctest/gcp_sweeper.go
  • mmv1/third_party/terraform/sweeper/gcp_sweeper.go
  • mmv1/third_party/terraform/acctest/provider_test_utils.go
  • mmv1/third_party/terraform/envvar/envvar_utils.go

In this PR,

  1. Move the file gcp_sweeper.go from acctest package to the sweeper package
  2. Move most functions in the file provider_test_utils.go in the acctest package to the package envvar
  3. Replace the function calls.

The reason to introduce the new packages sweep and envvar is to avoid the import circle.

The testAccProvider will be moved to the acctest package from the google package later.

If the file gcp_sweeper.go and the env variables are still in the acctest package, the sweeper file in the specific service package imports the acctest package to add the sweeper to the sweepers map. The acctest package imports the provider package to initialize the testAccProvider. The provider package imports the service package. Then the import circle is formed.

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).
  • 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).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)


Derived from GoogleCloudPlatform/magic-modules#8198

* Move files to the package sweep and envvar

* Replace function calls

* Rename sweeper package

* Fix rebasing error

Signed-off-by: Modular Magician <magic-modules@google.com>
@modular-magician modular-magician merged commit 699167d into hashicorp:main Jun 28, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant