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

Update EdgeCacheOrigin resources to reflect current API #5776

Merged

Conversation

justin-mp
Copy link
Contributor

The google_network_services_edge_cache_origin resource is stale
compared to the current GCP Network Services API. This commit updates
the resources to keep them in sync.

  • Add the missing FORBIDDEN retry condition

  • Properly read and write the timeout property, including the
    previously missing read_timeout field.

  • Update field documentation to represent the documentation of the
    resource’s REST API.

I tested my changes with:

$ make testacc TEST=./google TESTARGS='-run=TestAccNetworkServicesEdgeCacheOrigin'

This is part of hashicorp/terraform-provider-google/#10722.

Signed-off-by: Justin Mazzola Paluska justinmp@google.com

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)

networkservices: updated EdgeCacheOrigin to retry_conditions to include `FORBIDDEN`
networkservices: updated EdgeCacheOrigin resource to read and write the `timeout` property, including a new `read_timeout` field.

The google_network_services_edge_cache_origin resource is stale
compared to the current GCP Network Services API.  This commit updates
the resources to keep them in sync.

* Add the missing `FORBIDDEN` retry condition

* Properly read and write the `timeout` property, including the
  previously missing `read_timeout` field.

* Update field documentation to represent the documentation of the
  resource’s REST API.

This is part of hashicorp/terraform-provider-google/GoogleCloudPlatform#10722.

Signed-off-by: Justin Mazzola Paluska <justinmp@google.com>
@modular-magician
Copy link
Collaborator

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

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@ScottSuarez, please review this PR or find an appropriate assignee.

@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, 115 insertions(+), 35 deletions(-))
Terraform Beta: Diff ( 4 files changed, 115 insertions(+), 35 deletions(-))
TF Validator: Diff ( 3 files changed, 14 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 5 insertions(+), 3 deletions(-))

@ScottSuarez
Copy link
Contributor

/gcbrun

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccDataSourceSqlDatabaseInstance_basic|TestAccBigqueryReservationAssignment_BasicHandWritten|TestAccCGCSnippet_sqlSqlserverInstanceAuthorizedNetworkExample|TestAccCloudBuildTrigger_cloudbuildTriggerPubsubConfigExample|TestAccCloudBuildTrigger_cloudbuildTriggerWebhookConfigExample|TestAccCloudBuildTrigger_cloudbuildTriggerManualExample|TestAccCloudBuildTrigger_cloudbuildTriggerFilenameExample|TestAccCloudBuildTrigger_cloudbuildTriggerBuildExample|TestAccCloudBuildTrigger_basic|TestAccCloudBuildTrigger_available_secrets_config|TestAccCloudBuildTrigger_cloudbuildTriggerServiceAccountExample|TestAccCloudBuildTrigger_disable|TestAccCloudBuildTrigger_fullStep|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccNetworkServicesEdgeCacheOrigin_networkServicesEdgeCacheOriginAdvancedExample|TestAccNetworkServicesEdgeCacheOrigin_updateAndImport|TestAccNetworkServicesEdgeCacheService_updateAndImport You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=264789

Signed-off-by: Justin Mazzola Paluska <justinmp@google.com>
@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, 118 insertions(+), 35 deletions(-))
Terraform Beta: Diff ( 4 files changed, 118 insertions(+), 35 deletions(-))
TF Validator: Diff ( 3 files changed, 14 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 5 insertions(+), 3 deletions(-))

@ScottSuarez
Copy link
Contributor

/gcbrun

@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, 118 insertions(+), 35 deletions(-))
Terraform Beta: Diff ( 4 files changed, 118 insertions(+), 35 deletions(-))
TF Validator: Diff ( 3 files changed, 14 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 5 insertions(+), 3 deletions(-))

@ScottSuarez
Copy link
Contributor

/gcbrun

@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, 118 insertions(+), 35 deletions(-))
Terraform Beta: Diff ( 4 files changed, 118 insertions(+), 35 deletions(-))
TF Validator: Diff ( 3 files changed, 14 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 5 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccCGCSnippet_sqlMysqlInstanceBackupExample|TestAccCGCSnippet_sqlPostgresInstanceBackupExample|TestAccCGCSnippet_sqlSqlserverInstanceBackupExample|TestAccCGCSnippet_sqlPostgresInstanceAuthorizedNetworkExample|TestAccCloudFunctionsFunction_secretEnvVar|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccDataprocCluster_nonPreemptibleSecondary|TestAccDataprocCluster_updatable|TestAccDataprocCluster_withConfigOverrides You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=267024

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