Skip to content

Make resource definition functions public #7324

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.

Sign up for GitHub

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

Jump to bottom
Merged
zli82016 merged 1 commit into from
Feb 21, 2023
Merged

Make resource definition functions public #7324

zli82016 merged 1 commit into from
Feb 21, 2023

Conversation

@zli82016
Copy link
Member

@zli82016 zli82016 commented Feb 18, 2023

We are going to create a new package provider and move provider.go to this package.
In provider.go file, the resource definition functions in google package are called. The provider.go file will be moved to a new package provider. The resource definition functions need to be public by capitalizing the function names.

Also, some utility functions called in provider.go file need to be public.

multiEnvSearch
expandProviderBatchingConfig
configureDCLProvider
providerDCLConfigure

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 the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

@zli82016 zli82016 requested a review from a team as a code owner February 18, 2023 00:43
@zli82016 zli82016 requested review from slevenick and removed request for a team February 18, 2023 00:43
@modular-magician
Copy link
Collaborator

modular-magician commented Feb 18, 2023

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 ( 510 files changed, 1116 insertions(+), 1107 deletions(-))
Terraform Beta: Diff ( 567 files changed, 1243 insertions(+), 1234 deletions(-))
TF Validator: Diff ( 6 files changed, 11 insertions(+), 11 deletions(-))

@modular-magician
Copy link
Collaborator

modular-magician commented Feb 18, 2023

Tests analytics

Total tests: 2467
Passed tests 2211
Skipped tests: 256
Failed tests: 0

All tests passed in REPLAYING mode
View the build log

@zli82016 zli82016 requested a review from rileykarson February 21, 2023 17:46
rileykarson
rileykarson approved these changes Feb 21, 2023
View reviewed changes
Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Two functions snuck through, otherwise LGTM

mmv1/third_party/terraform/utils/provider.go.erb Outdated
"google_folders": DataSourceGoogleFolders(),
"google_folder_organization_policy": DataSourceGoogleFolderOrganizationPolicy(),
"google_logging_project_cmek_settings": DataSourceGoogleLoggingProjectCmekSettings(),
"google_logging_sink": dataSourceGoogleLoggingSink(),
Copy link
Member

@rileykarson rileykarson Feb 21, 2023

Choose a reason for hiding this comment

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

nit: This one seems to have been missed

Copy link
Member Author

@zli82016 zli82016 Feb 21, 2023

Choose a reason for hiding this comment

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

Good catch. Thanks.

mmv1/third_party/terraform/utils/provider.go.erb Outdated
"google_spanner_instance": DataSourceSpannerInstance(),
"google_sql_ca_certs": DataSourceGoogleSQLCaCerts(),
"google_sql_backup_run": DataSourceSqlBackupRun(),
"google_sql_databases": dataSourceSqlDatabases(),
Copy link
Member

@rileykarson rileykarson Feb 21, 2023

Choose a reason for hiding this comment

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

nit: This one seems to have been missed

Copy link
Member Author

@zli82016 zli82016 Feb 21, 2023

Choose a reason for hiding this comment

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

Good catch. Thanks.

@zli82016 zli82016 force-pushed the resource-definition branch from c30ad98 to 640419b Compare February 21, 2023 18:56
@modular-magician
Copy link
Collaborator

modular-magician commented Feb 21, 2023

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 ( 511 files changed, 1120 insertions(+), 1111 deletions(-))
Terraform Beta: Diff ( 570 files changed, 1251 insertions(+), 1242 deletions(-))
TF Validator: Diff ( 6 files changed, 11 insertions(+), 11 deletions(-))

@modular-magician
Copy link
Collaborator

modular-magician commented Feb 21, 2023

Tests analytics

Total tests: 2472
Passed tests 2211
Skipped tests: 256
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests
TestAccFirebaserulesRelease_BasicRelease|TestAccLoggingBucketConfigProject_cmekSettings|TestAccDNSRecordSet_changeRouting|TestAccDNSRecordSet_routingPolicy|TestAccApigeeAddonsConfig_apigeeAddonsTestExample

@modular-magician
Copy link
Collaborator

modular-magician commented Feb 21, 2023

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccLoggingBucketConfigProject_cmekSettings[Debug log]
TestAccDNSRecordSet_changeRouting[Debug log]
TestAccDNSRecordSet_routingPolicy[Debug log]
TestAccApigeeAddonsConfig_apigeeAddonsTestExample[Debug log]

All tests passed
View the build log or the debug log for each test

@zli82016 zli82016 merged commit 921f407 into main Feb 21, 2023
This was referenced Feb 21, 2023
Merged
Merged
Merged
@rileykarson rileykarson mentioned this pull request Feb 23, 2023
Merged
5 tasks
This was referenced Feb 23, 2023
Merged
Merged
Merged
kubalaguna pushed a commit to kubalaguna/magic-modules that referenced this pull request Feb 27, 2023
@zli82016 @kubalaguna
Make resource definition functions public (GoogleCloudPlatform#7324)
b21b8a8
ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023
@zli82016 @ericayyliu
Make resource definition functions public (GoogleCloudPlatform#7324)
5f4c015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rileykarson rileykarson rileykarson approved these changes

@slevenick slevenick Awaiting requested review from slevenick slevenick was automatically assigned from GoogleCloudPlatform/terraform-team

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zli82016 @modular-magician @rileykarson