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

Fix rate limiting options values #5691

Merged

Conversation

rileykarson
Copy link
Member

Followup to hashicorp/terraform-provider-google#10020

Seems like some of the values were from the EAP/alpha API, but got renamed going to beta (I can see them in internal protos). I didn't catch it in the initial review, "threshold" and "throttle" looked pretty similar as one of four options.

Pulled the text directly from c.g.c. For the ones w/ a well-formatted entry there I removed the list in the inline Description, but for the one where it isn't I used the raw string.

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)

compute: corrected an issue in `google_compute_security_policy` where only alpha values for certain enums were accepted

@rileykarson rileykarson requested review from a team and c2thorn and removed request for a team February 7, 2022 23:55
@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 ( 2 files changed, 16 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 2 files changed, 21 insertions(+), 17 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@c2thorn
Copy link
Member

c2thorn commented Feb 8, 2022

/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 ( 2 files changed, 16 insertions(+), 11 deletions(-))
Terraform Beta: Diff ( 2 files changed, 21 insertions(+), 17 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceGoogleActiveFolder_default|TestAccDataSourceGoogleForwardingRule|TestAccDataSourceGoogleFolder_byShortName|TestAccDataSourceGoogleFolder_byFullName|TestAccDataSourceGoogleFolder_lookupOrganization|TestAccDataSourceGoogleFolders_basic|TestAccDataSourceGoogleGlobalForwardingRule|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccComputeBackendServiceIamBindingGenerated|TestAccComputeBackendServiceIamMemberGenerated|TestAccComputeBackendServiceIamPolicyGenerated|TestAccComputeBackendServiceIamBindingGenerated_withCondition|TestAccComputeBackendServiceIamMemberGenerated_withCondition|TestAccComputeBackendServiceIamPolicyGenerated_withCondition|TestAccCloudbuildWorkerPool_basic|TestAccComputeForwardingRule_internalHttpLbWithMigBackendExample|TestAccComputeForwardingRule_internalTcpUdpLbWithMigBackendExample|TestAccComputeForwardingRule_forwardingRuleGlobalInternallbExample|TestAccComputeForwardingRule_forwardingRuleExternallbExample|TestAccComputeForwardingRule_forwardingRuleBasicExample|TestAccComputeForwardingRule_forwardingRuleL3DefaultExample|TestAccComputeForwardingRule_forwardingRuleInternallbExample|TestAccComputeForwardingRule_forwardingRuleHttpLbExample|TestAccComputeForwardingRule_forwardingRuleRegionalHttpXlbExample|TestAccComputeForwardingRule_update|TestAccComputeForwardingRule_ip|TestAccComputeForwardingRule_networkTier|TestAccComputeGlobalForwardingRule_externalTcpProxyLbMigBackendExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample|TestAccComputeGlobalForwardingRule_externalHttpLbMigBackendCustomHeaderExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleExternalManagedExample|TestAccComputeGlobalForwardingRule_privateServiceConnectGoogleApisExample|TestAccComputeGlobalForwardingRule_ipv6|TestAccComputeGlobalForwardingRule_updateTarget|TestAccComputeGlobalForwardingRule_labels|TestAccComputeGlobalForwardingRule_internalLoadBalancing|TestAccComputeInstanceFromMachineImage_basic|TestAccComputeInstanceFromMachineImage_overrideMetadataDotStartupScript|TestAccComputeInstanceFromTemplate_basic|TestAccComputeInstanceFromTemplate_overrideScheduling|TestAccComputeInstanceFromMachineImage_diffProject|TestAccComputeInstanceTemplate_basic|TestAccComputeInstanceTemplate_imageShorthand|TestAccComputeInstanceTemplate_preemptible|TestAccComputeInstanceTemplate_guestAcceleratorSkip|TestAccComputeInstanceTemplate_guestAccelerator|TestAccComputeInstanceTemplate_minCpuPlatform|TestAccComputeInstanceTemplate_soleTenantNodeAffinities|TestAccComputeInstanceTemplate_spot|TestAccComputeInstanceTemplate_ConfidentialInstanceConfigMain|TestAccComputeInstanceTemplate_AdvancedMachineFeatures|TestAccComputeInstanceTemplate_nictype_update|TestAccComputeInstance_scheduling|TestAccComputeInstance_soleTenantNodeAffinities|TestAccComputeInstance_guestAcceleratorSkip|TestAccComputeInstance_guestAccelerator|TestAccComputeInstanceConfidentialInstanceConfigMain|TestAccComputeInstance_resourcePolicyCollocate|TestAccComputeInstance_spotVM|TestAccComputeInstance_spotVM_update|TestAccComputeManagedSslCertificate_managedSslCertificateBasicExample|TestAccComputePacketMirroring_computePacketMirroringFullExample|TestAccComputeRoute_routeIlbExample|TestAccComputeRoute_routeIlbVipExample|TestAccComputeRouterPeer_basic|TestAccComputeRouterPeer_advertiseMode|TestAccComputeRouterPeer_enable|TestAccComputeRouterPeer_bfd|TestAccComputeRouterInterface_basic|TestAccComputeRouterInterface_withTunnel|TestAccComputeSecurityPolicy_withRateLimitOptions|TestAccComputeServiceAttachment_serviceAttachmentBasicExample|TestAccComputeServiceAttachment_serviceAttachmentExplicitProjectsExample|TestAccComputeServiceAttachment_serviceAttachmentBasicExampleUpdate|TestAccComputeVpnGateway_targetVpnGatewayBasicExample|TestAccComputeVpnTunnel_vpnTunnelBasicExample|TestAccComputeVpnTunnel_vpnTunnelBetaExample|TestAccComputeVpnTunnel_regionFromGateway|TestAccComputeVpnTunnel_router|TestAccComputeVpnTunnel_defaultTrafficSelectors|TestAccContainerCluster_withAddons|TestAccContainerCluster_nodeAutoprovisioning|TestAccFolderIamAuditConfig_basic|TestAccFolderIamAuditConfig_update|TestAccFolderIamAuditConfig_addFirstExemptMember|TestAccFolderIamAuditConfig_removeLastExemptMember|TestAccFolderIamAuditConfig_updateNoExemptMembers|TestAccFolderIamBinding_basic|TestAccFolderIamBinding_update|TestAccFolderIamMember_basic|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccStorageTransferJob_posixSource|TestAccStorageTransferJob_posixSink You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=254264

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.

just a reminder to hold off on merging until CI is fixed

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