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

Adds connectedProjects field to resource google_vpc_access_connector #8071

Merged

Conversation

yanweiguo
Copy link
Member

@yanweiguo yanweiguo commented Jun 1, 2023

Fixes hashicorp/terraform-provider-google#14760.
API reference: https://cloud.google.com/vpc/docs/reference/vpcaccess/rest/v1/projects.locations.connectors

Did a manual test for the built binary with input:

provider "google-beta" {
  project = "xxx"
  region  = "us-central1"
}

resource "google_cloud_run_v2_service" "default" {
  name     = "tf-vpc-connector"
  project  = "xxx"
  location = "us-central1"

  template {
    containers {
      image = "us-docker.pkg.dev/cloudrun/container/hello"
    }
    vpc_access {
      connector = google_vpc_access_connector.connector.id
      egress = "ALL_TRAFFIC"
    }
  }
}

resource "google_vpc_access_connector" "connector" {
  provider = google-beta
  name          = "run-vpc2"
  project       = "xxx"
  network = "default"
  ip_cidr_range = "10.2.0.0/28"
  machine_type = "e2-standard-4"
  min_instances = 2
  max_instances = 3
  region        = "us-central1"
}

The output of terraform state show google_vpc_access_connector.connector is

# google_vpc_access_connector.connector:
resource "google_vpc_access_connector" "connector" {
    connected_projects = [
        "xxx",
    ]
    id                 = "projects/xxx/locations/us-central1/connectors/run-vpc2"
    ip_cidr_range      = "10.2.0.0/28"
    machine_type       = "e2-standard-4"
    max_instances      = 3
    max_throughput     = 300
    min_instances      = 2
    min_throughput     = 200
    name               = "run-vpc2"
    network            = "default"
    project            = "xxx"
    region             = "us-central1"
    self_link          = "projects/xxx/locations/us-central1/connectors/run-vpc2"
    state              = "READY"
}

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)

vpcaccess: Added `connected_projects` attribute to resource `google_vpc_access_connector`.

@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. @SarahFrench, 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 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 ( 2 files changed, 18 insertions(+))
Terraform Beta: Diff ( 2 files changed, 18 insertions(+))
TF Conversion: Diff ( 3 files changed, 5 insertions(+), 4 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2760
Passed tests 2467
Skipped tests: 283
Affected tests: 10

Action taken

Found 10 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccSqlUser_postgresAbandon|TestAccSqlUser_postgres|TestAccSqlUser_postgresIAM|TestAccBillingSubaccount_basic|TestAccBillingSubaccount_renameOnDestroy|TestAccDataSourceGoogleFirebaseAndroidAppConfig|TestAccComputeFirewallPolicyRule_multipleRules|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccDataSourceAlloydbLocations_basic|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccSqlUser_postgresAbandon[Debug log]
TestAccSqlUser_postgres[Debug log]
TestAccSqlUser_postgresIAM[Debug log]
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Debug log]
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Debug log]

Tests failed during RECORDING mode:
TestAccBillingSubaccount_basic[Error message] [Debug log]
TestAccBillingSubaccount_renameOnDestroy[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

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

@SarahFrench SarahFrench self-assigned this Jun 5, 2023
@modular-magician
Copy link
Collaborator

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 ( 2 files changed, 18 insertions(+))
Terraform Beta: Diff ( 2 files changed, 18 insertions(+))
TF Conversion: Diff ( 3 files changed, 5 insertions(+), 4 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2771
Passed tests 2481
Skipped tests: 285
Affected tests: 5

Action taken

Found 5 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComputeFirewallPolicyRule_multipleRules|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccDataSourceAlloydbLocations_basic|TestAccDataSourceGoogleFirebaseAndroidAppConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Debug log]
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Debug log]

Tests failed during RECORDING mode:
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

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

Copy link
Collaborator

@SarahFrench SarahFrench left a comment

Choose a reason for hiding this comment

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

I double checked and I think unordered_list should be removed, but otherwise this PR looks ok.

I currently don't have capacity to test whether the connectedProjects list is returned from the API in order or not. If you're able to check this it'll be a great help! If not then lets proceed with merging the PR.

mmv1/products/vpcaccess/Connector.yaml Outdated Show resolved Hide resolved
Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
@yanweiguo
Copy link
Member Author

I double checked and I think unordered_list should be removed, but otherwise this PR looks ok.

I currently don't have capacity to test whether the connectedProjects list is returned from the API in order or not. If you're able to check this it'll be a great help! If not then lets proceed with merging the PR.

I'd treat the connectedProjects list returned by the API as unordered. Is the current setting output: true sufficient to handle unordered output only array field?

@modular-magician
Copy link
Collaborator

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 ( 2 files changed, 18 insertions(+))
Terraform Beta: Diff ( 2 files changed, 18 insertions(+))
TF Conversion: Diff ( 3 files changed, 5 insertions(+), 4 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2776
Passed tests 2486
Skipped tests: 285
Affected tests: 5

Action taken

Found 5 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComputeFirewallPolicyRule_multipleRules|TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example|TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample|TestAccDataSourceAlloydbLocations_basic|TestAccDataSourceGoogleFirebaseAndroidAppConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example[Debug log]
TestAccApigeeKeystoresAliasesKeyCertFile_apigeeKeystoresAliasesKeyCertFileTestExample[Debug log]
TestAccDataSourceAlloydbLocations_basic[Debug log]
TestAccDataSourceGoogleFirebaseAndroidAppConfig[Debug log]

Tests failed during RECORDING mode:
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

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

@SarahFrench
Copy link
Collaborator

Is the current setting output: true sufficient to handle unordered output only array field?

I believe so, yes. The realy problem with lists is when it's defined in a user's Terraform configuration (for example defining entries in an IAM policy) but the list returned from the API is ordered differently. Terraform will identify the difference as drift, even though the overall content of the lists is the same.

In the case of an output there won't be this conflict, so I'll go ahead and approve this PR

@SarahFrench
Copy link
Collaborator

The failing checks are due to unrelated tests failing and a YAML linting issue that's also unrelated to this PR 👉 going ahead with merge

@SarahFrench SarahFrench merged commit d2e06b1 into GoogleCloudPlatform:main Jun 7, 2023
ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023
…or` (GoogleCloudPlatform#8071)

* add_new_field

* add unsorted

* Update mmv1/products/vpcaccess/Connector.yaml

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
wj-chen pushed a commit to wj-chen/magic-modules that referenced this pull request Aug 1, 2023
…or` (GoogleCloudPlatform#8071)

* add_new_field

* add unsorted

* Update mmv1/products/vpcaccess/Connector.yaml

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>

---------

Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
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.

Add support of connectedProjects in google_vpc_access_connector
4 participants