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.

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

Support allocated_ip_range in google_sql_database_instance #5500

Merged
merged 6 commits into from
Dec 3, 2021
Merged

Support allocated_ip_range in google_sql_database_instance #5500

merged 6 commits into from
Dec 3, 2021

Conversation

shuyama1
Copy link
Member

@shuyama1 shuyama1 commented Dec 1, 2021 •
edited

Fix hashicorp/terraform-provider-google#9986
Also bring the test to GA as service networking is available in GA now

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)

sql: added field `allocated_ip_range` to resource `google_sql_database_instance`

@google-cla google-cla bot added the cla: yes label Dec 1, 2021
@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 ( 3 files changed, 83 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 3 files changed, 23 insertions(+), 11 deletions(-))

@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 ( 3 files changed, 80 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 3 files changed, 20 insertions(+), 16 deletions(-))

@shuyama1
Copy link
Member Author

shuyama1 commented Dec 1, 2021

/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 ( 3 files changed, 80 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 3 files changed, 20 insertions(+), 16 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeHealthCheckDatasource_basic|TestAccDataSourceComputeNetworkEndpointGroup|TestAccDataSourceGoogleComputeDefaultServiceAccount_basic|TestAccDataSourceComputeBackendBucket_basic|TestAccDataSourceComputeBackendService_basic|TestAccDataSourceComputeGlobalAddress|TestAccDataSourceGoogleForwardingRule|TestAccDataSourceComputeImage|TestAccDataSourceComputeImageFilter|TestAccDataSourceComputeHaVpnGateway|TestAccDataSourceGoogleComputeInstanceGroup_basic|TestAccDataSourceGoogleComputeInstanceGroup_withNamedPort|TestAccDataSourceGoogleComputeInstanceGroup_fromIGM|TestAccDataSourceComputeNodeTypes_basic|TestAccComputeRegions_basic|TestAccInstanceTemplateDatasource_name|TestAccDataSourceComputeInstanceSerialPort_basic|TestAccDataSourceGoogleNetwork|TestAccInstanceTemplateDatasource_filter|TestAccDataSourceComputeInstance_basic|TestAccInstanceTemplateDatasource_filter_mostRecent|TestAccDataSourceComputeRegionSslCertificate|TestAccDataSourceComputeResourcePolicy|TestAccDataSourceComputeRouter|TestAccComputeZones_filter|TestAccComputeZones_basic|TestAccDataSourceComputeSslCertificate|TestAccDataSourceGoogleSslPolicy|TestAccDataSourceGoogleSubnetwork|TestAccDataSourceGoogleVpnGateway|TestAccContainerClusterDatasource_regional|TestAccContainerClusterDatasource_zonal|TestAccDataSourceGoogleGlobalForwardingRule|TestAccDataSourceGoogleSQLCaCerts_basic|TestAccDataSourceSqlDatabaseInstance_basic|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccComputeDiskIamBindingGenerated|TestAccComputeDiskIamMemberGenerated|TestAccComputeImageIamBindingGenerated|TestAccComputeDiskIamPolicyGenerated|TestAccComputeImageIamMemberGenerated|TestAccComputeImageIamBindingGenerated_withCondition|TestAccComputeImageIamPolicyGenerated|TestAccComputeImageIamMemberGenerated_withCondition|TestAccComputeInstanceIamBindingGenerated|TestAccComputeImageIamPolicyGenerated_withCondition|TestAccComputeInstanceIamMemberGenerated|TestAccComputeInstanceIamBindingGenerated_withCondition|TestAccComputeInstanceIamPolicyGenerated|TestAccComputeInstanceIamMemberGenerated_withCondition|TestAccComputeMachineImageIamBindingGenerated|TestAccComputeInstanceIamPolicyGenerated_withCondition|TestAccComputeMachineImageIamMemberGenerated|TestAccComputeMachineImageIamBindingGenerated_withCondition|TestAccComputeMachineImageIamPolicyGenerated|TestAccComputeMachineImageIamMemberGenerated_withCondition|TestAccComputeRegionDiskIamBindingGenerated|TestAccComputeMachineImageIamPolicyGenerated_withCondition|TestAccComputeRegionDiskIamMemberGenerated|TestAccComputeSubnetworkIamBindingGenerated|TestAccComputeSubnetworkIamMemberGenerated|TestAccComputeRegionDiskIamPolicyGenerated|TestAccComputeSubnetworkIamBindingGenerated_withCondition|TestAccComputeSubnetworkIamMemberGenerated_withCondition|TestAccComputeSubnetworkIamPolicyGenerated|TestAccComputeSubnetworkIamPolicyGenerated_withCondition|TestAccIapTunnelInstanceIamBindingGenerated|TestAccIapTunnelInstanceIamMemberGenerated|TestAccIapTunnelInstanceIamBindingGenerated_withCondition|TestAccIapTunnelInstanceIamPolicyGenerated|TestAccIapTunnelInstanceIamMemberGenerated_withCondition|TestAccIapTunnelInstanceIamPolicyGenerated_withCondition|TestAccIapWebBackendServiceIamBindingGenerated|TestAccIapWebBackendServiceIamMemberGenerated|TestAccIapWebBackendServiceIamPolicyGenerated|TestAccIapWebBackendServiceIamBindingGenerated_withCondition|TestAccIapWebBackendServiceIamMemberGenerated_withCondition|TestAccIapWebBackendServiceIamPolicyGenerated_withCondition|TestAccPubsubTopicIamBindingGenerated|TestAccPubsubTopicIamMemberGenerated|TestAccPubsubTopicIamPolicyGenerated|TestAccRuntimeConfigConfigIamPolicyGenerated|TestAccProviderBasePath_setBasePath|TestAccProviderMeta_setModuleName|TestAccApiGatewayApi_apigatewayApiBasicExample|TestAccApiGatewayApi_apigatewayApiFullExample|TestAccApiGatewayGateway_apigatewayGatewayFullExample|TestAccArtifactRegistryRepository_artifactRegistryRepositoryBasicExample|TestAccArtifactRegistryRepository_artifactRegistryRepositoryCmekExample|TestAccArtifactRegistryRepository_artifactRegistryRepositoryIamExample|TestAccBillingBudget_billingBudgetCurrencycode|TestAccCloudRunService_cloudRunServiceSqlExample|TestAccCloudRunService_cloudRunServiceSecretEnvironmentVariablesExample|TestAccCloudRunService_cloudRunServiceSecretVolumesExample|TestAccCloudSchedulerJob_schedulerJobOauthExample|TestAccCloudSchedulerJob_schedulerJobOidcExample|TestAccCloudRunService_secretEnvironmentVariable|TestAccCloudRunService_secretVolume|TestAccCloudFunctionsFunction_basic|TestAccCloudFunctionsFunction_update|TestAccCloudFunctionsFunction_serviceAccountEmail|TestAccCloudFunctionsFunction_vpcConnector|TestAccComposerEnvironment_basic|TestAccComposerEnvironment_private|TestAccComposerEnvironment_privateWithWebServerControl|TestAccComposerEnvironment_withDatabaseConfig|TestAccComposerEnvironment_withWebServerConfig|TestAccComposerEnvironment_withNodeConfig|TestAccComposerEnvironment_withMaintenanceWindow|TestAccComposerEnvironment_withUpdateOnCreate|TestAccComputeAddress_addressBasicExample|TestAccComputeAddress_addressWithSubnetworkExample|TestAccComposerEnvironment_withEncryptionConfig|TestAccComputeAddress_addressWithGceEndpointExample|TestAccComputeAddress_instanceWithIpExample|TestAccComputeAddress_addressWithSharedLoadbalancerVipExample|TestAccComputeAddress_computeAddressIpsecInterconnectExample|TestAccComputeAddress_networkTier|TestAccComputeAttachedDisk_basic|TestAccComputeAddress_internal|TestAccComputeAttachedDisk_full|TestAccComputeAttachedDisk_region|TestAccComputeAutoscaler_autoscalerSingleInstanceExample|TestAccComputeAutoscaler_autoscalerBasicExample|TestAccComputeAttachedDisk_count|TestAccComputeAutoscaler_update|TestAccComputeAutoscaler_multicondition|TestAccComputeAutoscaler_scaleDownControl|TestAccComputeAutoscaler_scalingSchedule|TestAccComputeAutoscaler_scaleInControl|TestAccComputeAutoscaler_scaleInControlFixed|TestAccComputeBackendService_backendServiceBasicExample|TestAccComputeBackendBucket_backendBucketBasicExample|TestAccComputeBackendService_backendServiceCacheSimpleExample|TestAccComputeBackendService_backendServiceCacheExample|TestAccComputeBackendBucket_backendBucketFullExample|TestAccComputeBackendService_backendServiceTrafficDirectorRoundRobinExample|TestAccComputeBackendBucketSignedUrlKey_basic|TestAccComputeBackendBucket_basicModified|TestAccComputeBackendBucket_withCdnPolicy|TestAccComputeBackendService_backendServiceTrafficDirectorRingHashExample|TestAccComputeBackendService_backendServiceNetworkEndpointExample|TestAccComputeBackendService_withBackend|TestAccComputeBackendService_withBackendAndMaxUtilization|TestAccComputeBackendService_withBackendAndIAP|TestAccComputeBackendServiceSignedUrlKey_basic|TestAccComputeBackendService_basic|TestAccComputeBackendService_updatePreservesOptionalParameters|TestAccComputeBackendService_withConnectionDrainingAndUpdate|TestAccComputeBackendService_withConnectionDraining|TestAccComputeBackendService_withHttpsHealthCheck|TestAccComputeBackendService_withCdnPolicy|TestAccComputeBackendService_withSecurityPolicy|TestAccComputeBackendService_withMaxConnections|TestAccComputeBackendService_withMaxConnectionsPerInstance|TestAccComputeBackendService_withCDNEnabled|TestAccComputeBackendService_withSessionAffinity|TestAccComputeBackendService_withMaxRatePerEndpoint|TestAccComputeBackendService_withAffinityCookieTtlSec|TestAccComputeBackendService_withMaxConnectionsPerEndpoint|TestAccComputeDiskResourcePolicyAttachment_diskResourcePolicyAttachmentBasicExample|TestAccComputeBackendService_withCustomHeaders|TestAccComputeDiskResourcePolicyAttachment_update|TestAccComputeDisk_update|TestAccComputeDisk_encryption|TestAccComputeBackendService_withLogConfig|TestAccComputeDisk_fromSnapshot|TestAccComputeDisk_encryptionKMS|TestAccComputeBackendService_trafficDirectorUpdateFull|TestAccComputeBackendService_trafficDirectorUpdateBasic|TestAccComputeDisk_diskBasicExample|TestAccComputeDisk_deleteDetach|TestAccComputeDisk_resourcePolicies|TestAccComputeDisk_multiWriter|TestAccComputeFirewall_firewallBasicExample|TestAccComputeFirewall_update|TestAccComputeFirewall_priority|TestAccComputeFirewall_denied|TestAccComputeFirewall_egress|TestAccComputeBackendService_regionNegBackend|TestAccComputeFirewall_disabled|TestAccComputeFirewall_enableLogging|TestAccComputeFirewall_serviceAccounts|TestAccComputeForwardingRule_forwardingRuleExternallbExample|TestAccComputeForwardingRule_forwardingRuleGlobalInternallbExample|TestAccComputeForwardingRule_forwardingRuleBasicExample|TestAccComputeForwardingRule_forwardingRuleHttpLbExample|TestAccComputeForwardingRule_forwardingRuleInternallbExample|TestAccComputeForwardingRule_update|TestAccComputeForwardingRule_ip|TestAccComputeGlobalAddress_globalAddressBasicExample|TestAccComputeForwardingRule_networkTier|TestAccComputeGlobalAddress_globalAddressPrivateServicesConnectExample|TestAccComputeGlobalAddress_ipv6|TestAccComputeGlobalAddress_internal|TestAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample|TestAccComputeGlobalForwardingRule_privateServiceConnectGoogleApisExample|TestAccComputeGlobalForwardingRule_updateTarget|TestAccComputeGlobalForwardingRule_ipv6|TestAccComputeGlobalForwardingRule_labels|TestAccComputeGlobalForwardingRule_internalLoadBalancing|TestAccComputeGlobalNetworkEndpointGroup_globalNetworkEndpointGroupExample|TestAccComputeHaVpnGateway_haVpnGatewayBasicExample|TestAccComputeGlobalNetworkEndpointGroup_globalNetworkEndpointGroupIpAddressExample|TestAccComputeGlobalNetworkEndpoint_networkEndpointsBasic|TestAccComputeHaVpnGateway_computeHaVpnGatewayEncryptedInterconnectExample|TestAccComputeHealthCheck_healthCheckTcpExample|TestAccComputeHealthCheck_healthCheckTcpFullExample|TestAccComputeHealthCheck_healthCheckSslExample|TestAccComputeHealthCheck_healthCheckSslFullExample|TestAccComputeHealthCheck_healthCheckHttpExample|TestAccComputeHealthCheck_healthCheckHttpFullExample|TestAccComputeHealthCheck_healthCheckHttpsExample|TestAccComputeHealthCheck_healthCheckHttpsFullExample|TestAccComputeHealthCheck_healthCheckHttp2Example|TestAccComputeHealthCheck_healthCheckHttp2FullExample|TestAccComputeHealthCheck_healthCheckGrpcExample|TestAccComputeHealthCheck_healthCheckGrpcFullExample|TestAccComputeHealthCheck_ssl_port_spec|TestAccComputeHealthCheck_tcp_update|TestAccComputeHealthCheck_healthCheckWithLoggingExample|TestAccComputeHealthCheck_http_port_spec|TestAccComputeHealthCheck_https_serving_port|TestAccComputeHealthCheck_logConfigDisabled|TestAccComputeHealthCheck_typeTransition|TestAccComputeHttpHealthCheck_httpHealthCheckBasicExample|TestAccComputeHttpHealthCheck_update|TestAccComputeHttpsHealthCheck_httpsHealthCheckBasicExample|TestAccComputeImage_imageBasicExample|TestAccComputeHttpsHealthCheck_update|TestAccComputeImage_withLicense|TestAccComputeImage_imageGuestOsExample|TestAccComputeImage_basedondisk|TestAccComputeImage_sourceImage|TestAccComputeImage_sourceSnapshot|TestAccComputeImage_update|TestAccComputeImage_resolveImage|TestAccComputeInstanceFromTemplate_basic|TestAccComputeInstanceFromTemplate_overrideBootDisk|TestAccComputeInstanceFromTemplate_overrideAttachedDisk|TestAccComputeInstanceFromTemplate_overrideScratchDisk|TestAccComputeInstanceFromTemplate_overrideScheduling|TestAccComputeInstanceFromTemplate_012_removableFields|TestAccComputeInstanceFromTemplate_overrideMetadataDotStartupScript|TestAccInstanceGroupManager_basic|TestAccInstanceGroupManager_targetSizeZero|TestAccInstanceGroupManager_update|TestAccInstanceGroupManager_versions|TestAccInstanceGroupManager_autoHealingPolicies|TestAccInstanceGroupManager_waitForStatus|TestAccInstanceGroupManager_stateful|TestAccComputeInstanceGroup_basic|TestAccComputeInstanceGroup_rename|TestAccComputeInstanceGroup_update|TestAccComputeInstanceGroup_outOfOrderInstances|TestAccComputeInstanceGroup_network|TestAccComputeInstanceTemplate_basic|TestAccComputeInstanceTemplate_preemptible|TestAccComputeInstanceTemplate_IP|TestAccComputeInstanceTemplate_networkTier|TestAccComputeInstanceTemplate_networkIP|TestAccComputeInstanceTemplate_imageShorthand|TestAccComputeInstanceIamPolicy|TestAccComputeInstanceTemplate_networkIPAddress|TestAccComputeInstanceTemplate_disks|TestAccComputeInstanceTemplate_disksInvalid|TestAccComputeInstanceTemplate_regionDisks|TestAccComputeInstanceTemplate_subnet_auto|TestAccComputeInstanceTemplate_metadata_startup_script|TestAccComputeInstanceTemplate_subnet_custom|TestAccComputeInstanceTemplate_primaryAliasIpRange|TestAccComputeInstanceTemplate_secondaryAliasIpRange|TestAccComputeInstanceTemplate_guestAccelerator|TestAccComputeInstanceTemplate_minCpuPlatform|TestAccComputeInstanceTemplate_guestAcceleratorSkip|TestAccComputeInstanceTemplate_EncryptKMS|TestAccComputeInstanceTemplate_soleTenantNodeAffinities|TestAccComputeInstanceTemplate_reservationAffinities|TestAccComputeInstanceTemplate_shieldedVmConfig1|TestAccComputeInstanceTemplate_shieldedVmConfig2|TestAccComputeInstanceTemplate_AdvancedMachineFeatures|TestAccComputeInstanceTemplate_ConfidentialInstanceConfigMain|TestAccComputeInstanceTemplate_enableDisplay|TestAccComputeInstanceTemplate_withScratchDisk|TestAccComputeInstanceTemplate_resourcePolicies|TestAccComputeInstance_basic1|TestAccComputeInstance_basic2|TestAccComputeInstance_basic3|TestAccComputeInstance_basic5|TestAccComputeInstance_IP|TestAccComputeInstance_basic4|TestAccComputeInstanceTemplate_nictype_update|TestAccComputeInstance_PTRRecord|TestAccComputeInstance_networkTier|TestAccComputeInstance_diskEncryption|TestAccComputeInstance_diskEncryptionRestart|TestAccComputeInstance_kmsDiskEncryption|TestAccComputeInstance_attachedDisk|TestAccComputeInstance_attachedDisk_modeRo|TestAccComputeInstance_attachedDisk_sourceUrl|TestAccComputeInstance_attachedDiskUpdate|TestAccComputeInstance_bootDisk_source|TestAccComputeInstance_bootDisk_sourceUrl|TestAccComputeInstance_bootDisk_type|TestAccComputeInstance_bootDisk_mode|TestAccComputeInstance_update|TestAccComputeInstance_forceNewAndChangeMetadata|TestAccComputeInstance_scratchDisk|TestAccComputeInstance_stopInstanceToUpdate|TestAccComputeInstance_serviceAccount|TestAccComputeInstance_serviceAccount_updated|TestAccComputeInstance_serviceAccount_updated0to1to0scopes|TestAccComputeInstance_scheduling|TestAccComputeInstance_advancedMachineFeatures|TestAccComputeInstance_soleTenantNodeAffinities|TestAccComputeInstance_subnet_auto|TestAccComputeInstance_reservationAffinities|TestAccComputeInstance_subnet_custom|TestAccComputeInstance_network_ip_custom|TestAccComputeInstance_networkIPAuto|TestAccComputeInstance_private_image_family|TestAccComputeInstance_networkPerformanceConfig|TestAccComputeInstance_forceChangeMachineTypeManually|TestAccComputeInstance_multiNic|TestAccComputeInstance_guestAccelerator|TestAccComputeInstance_guestAcceleratorSkip|TestAccComputeInstance_deletionProtectionExplicitFalse|TestAccComputeInstance_minCpuPlatform|TestAccComputeInstance_deletionProtectionExplicitTrueAndUpdateFalse|TestAccComputeInstance_nictype_update|TestAccComputeInstance_secondaryAliasIpRange|TestAccComputeInstance_hostname|TestAccComputeInstance_primaryAliasIpRange|TestAccComputeInstanceConfidentialInstanceConfigMain|TestAccComputeInstance_shieldedVmConfig|TestAccComputeInstance_enableDisplay|TestAccComputeInstance_desiredStatusOnCreation|TestAccComputeInstance_desiredStatusTerminatedUpdateFields|TestAccComputeInstance_desiredStatusUpdateBasic|TestAccComputeInstance_updateRunning_desiredStatusRunning_allowStoppingForUpdate|TestAccComputeInstance_updateRunning_desiredStatusNotSet_notAllowStoppingForUpdate|TestAccComputeInstance_updateRunning_desiredStatusTerminated_allowStoppingForUpdate|TestAccComputeInstance_updateRunning_desiredStatusTerminated_notAllowStoppingForUpdate|TestAccComputeInstance_updateRunning_desiredStatusRunning_notAllowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusNotSet_allowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusNotSet_notAllowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusTerminated_allowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusTerminated_notAllowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusRunning_notAllowStoppingForUpdate|TestAccComputeInstance_updateTerminated_desiredStatusRunning_allowStoppingForUpdate|TestAccComputeInstance_resourcePolicyCollocate|TestAccComputeInstance_subnetworkUpdate|TestAccComputeInterconnectAttachment_interconnectAttachmentBasicExample|TestAccComputeInterconnectAttachment_computeInterconnectAttachmentIpsecEncryptionExample|TestAccComputeMachineImage_machineImageBasicExample|TestAccComputeNetworkEndpointGroup_networkEndpointGroupExample|TestAccComputeManagedSslCertificate_managedSslCertificateBasicExample|TestAccComputeNetwork_networkBasicExample|TestAccComputeNetwork_networkCustomMtuExample|TestAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigBasicExample|TestAccComputeNetworkPeering_basic|TestAccComputeNetworkPeeringRoutesConfig_networkPeeringRoutesConfigGkeExample|TestAccComputeNetworkPeering_subnetRoutes|TestAccComputeNetworkPeering_customRoutesUpdate|TestAccComputeNetwork_explicitAutoSubnet|TestAccComputeNetwork_customSubnet|TestAccComputeMachineImage_computeMachineImageKmsExample|TestAccComputeNetwork_routingModeAndUpdate|TestAccComputeNetwork_default_routing_mode|TestAccComputeNodeTemplate_nodeTemplateServerBindingExample|TestAccComputeNodeGroup_nodeGroupBasicExample|TestAccComputeNetwork_networkDeleteDefaultRoute|TestAccComputeNodeGroup_nodeGroupAutoscalingPolicyExample|TestAccComputeNodeGroup_updateNodeTemplate|TestAccComputeNodeTemplate_nodeTemplateBasicExample|TestAccComputeOrganizationSecurityPolicy_organizationSecurityPolicyBasicExample|TestAccComputeOrganizationSecurityPolicyRule_organizationSecurityPolicyRuleUpdateExample|TestAccComputeOrganizationSecurityPolicyAssociation_organizationSecurityPolicyAssociationBasicExample|TestAccComputeOrganizationSecurityPolicyRule_organizationSecurityPolicyRuleBasicExample|TestAccComputePerInstanceConfig_update|TestAccComputeOrganizationSecurityPolicy_organizationSecurityPolicyUpdateExample|TestAccComputePacketMirroring_computePacketMirroringFullExample|TestAccComputeProjectMetadataItem_basic|TestAccComputeProjectMetadataItem_basicUpdate|TestAccComputeProjectMetadataItem_basicWithEmptyVal|TestAccComputeProjectMetadataItem_exists|TestAccComputeRegionAutoscaler_regionAutoscalerBasicExample|TestAccComputeRegionAutoscaler_update|TestAccComputeRegionAutoscaler_scaleDownControl|TestAccComputeRegionAutoscaler_scalingSchedule|TestAccComputeRegionAutoscaler_scaleInControl|TestAccComputeRegionBackendService_regionBackendServiceBasicExample|TestAccComputeRegionBackendService_regionBackendServiceCacheExample|TestAccComputeRegionBackendService_regionBackendServiceIlbRoundRobinExample|TestAccComputeRegionBackendService_regionBackendServiceBalancingModeExample|TestAccComputeRegionBackendService_regionBackendServiceExternalExample|TestAccComputeRegionBackendService_regionBackendServiceIlbRingHashExample|TestAccComputeRegionBackendService_withBackendInternal|TestAccComputeRegionBackendService_withBackendMultiNic|TestAccComputeRegionBackendService_withBackendInternalManaged|TestAccComputeRegionBackendService_basic|TestAccComputeRegionBackendService_withConnectionDrainingAndUpdate|TestAccComputeRegionBackendService_ilbUpdateBasic|TestAccComputeProjectDefaultNetworkTier_basic|TestAccComputeProjectDefaultNetworkTier_modify|TestAccComputeRegionDiskResourcePolicyAttachment_regionDiskResourcePolicyAttachmentBasicExample|TestAccComputeRegionBackendService_ilbUpdateFull|TestAccComputeRegionDisk_regionDiskBasicExample|TestAccComputeProjectMetadata_basic|TestAccComputeProjectMetadata_modify_1|TestAccComputeProjectMetadata_modify_2|TestAccComputeRegionDisk_basic|TestAccComputeRegionDisk_basicUpdate|TestAccComputeRegionDisk_encryption|TestAccComputeRegionHealthCheck_regionHealthCheckTcpExample|TestAccComputeRegionDisk_deleteDetach|TestAccComputeRegionHealthCheck_regionHealthCheckTcpFullExample|TestAccComputeRegionHealthCheck_regionHealthCheckSslExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttpExample|TestAccComputeRegionHealthCheck_regionHealthCheckSslFullExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttpLogsExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttpFullExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttpsExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttp2Example|TestAccComputeRegionHealthCheck_regionHealthCheckHttp2FullExample|TestAccComputeRegionHealthCheck_regionHealthCheckHttpsFullExample|TestAccComputeRegionHealthCheck_regionHealthCheckGrpcExample|TestAccComputeRegionHealthCheck_tcp_update|TestAccComputeRegionHealthCheck_regionHealthCheckGrpcFullExample|TestAccComputeRegionHealthCheck_ssl_port_spec|TestAccRegionInstanceGroupManager_basic|TestAccRegionInstanceGroupManager_update|TestAccRegionInstanceGroupManager_targetSizeZero|TestAccComputeRegionHealthCheck_https_serving_port|TestAccComputeRegionHealthCheck_typeTransition|TestAccComputeRegionHealthCheck_http_port_spec|TestAccRegionInstanceGroupManager_versions|TestAccRegionInstanceGroupManager_autoHealingPolicies|TestAccRegionInstanceGroupManager_distributionPolicy|TestAccRegionInstanceGroupManager_stateful|TestAccComputeRegionPerInstanceConfig_update|TestAccComputeRegionTargetHttpProxy_regionTargetHttpProxyBasicExample|TestAccComputeRegionTargetHttpProxy_regionTargetHttpProxyHttpsRedirectExample|TestAccComputeRegionTargetHttpProxy_update|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupFunctionsExample|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccComputeRegionUrlMap_regionUrlMapBasicExample|TestAccComputeRegionTargetHttpsProxy_update|TestAccComputeRegionTargetHttpsProxy_regionTargetHttpsProxyBasicExample|TestAccComputeRegionUrlMap_regionUrlMapL7IlbPathExample|TestAccComputeRegionUrlMap_regionUrlMapL7IlbPathPartialExample|TestAccComputeRegionUrlMap_regionUrlMapL7IlbRouteExample|TestAccComputeRegionUrlMap_advanced|TestAccComputeRegionUrlMap_regionUrlMapL7IlbRoutePartialExample|TestAccComputeRegionUrlMap_update_path_matcher|TestAccComputeRegionUrlMap_noPathRulesWithUpdate|TestAccComputeRegionUrlMap_ilbPathUpdate|TestAccComputeRegionUrlMap_defaultUrlRedirect|TestAccComputeRegionUrlMap_ilbRouteUpdate|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupCloudrunExample|TestAccComputeRegionUrlMap_defaultUrlRedirectWithinPathMatcher|TestAccComputeReservation_reservationBasicExample|TestAccComputeResourcePolicy_attached|TestAccComputeReservation_update|TestAccComputeResourcePolicy_resourcePolicyBasicExample|TestAccComputeResourcePolicy_resourcePolicyInstanceSchedulePolicyExample|TestAccComputeResourcePolicy_resourcePolicyPlacementPolicyExample|TestAccComputeResourcePolicy_resourcePolicyFullExample|TestAccComputeRoute_hopInstance|TestAccComputeRoute_routeBasicExample|TestAccComputeRoute_routeIlbExample|TestAccComputeRoute_defaultInternetGateway|TestAccComputeRouterPeer_basic|TestAccComputeRouterPeer_advertiseMode|TestAccComputeRouter_routerBasicExample|TestAccComputeRouterInterface_basic|TestAccComputeRouter_computeRouterEncryptedInterconnectExample|TestAccComputeRouterNat_basic|TestAccComputeRouterInterface_withTunnel|TestAccComputeRouterNat_update|TestAccComputeRouterNat_withManualIpAndSubnetConfiguration|TestAccComputeRouterNat_withDisabledIndependentEndpointMapping|TestAccComputeRouterNat_withNatIpsAndDrainNatIps|TestAccComputeRouter_noRegion|TestAccComputeRouter_basic|TestAccComputeRouter_full|TestAccComputeRouter_update|TestAccComputeRouter_updateAddRemoveBGP|TestAccComputeSecurityPolicy_basic|TestAccComputeSecurityPolicy_withRule|TestAccComputeSecurityPolicy_withRuleExpr|TestAccComputeSecurityPolicy_update|TestAccComputeSecurityPolicy_withAdaptiveProtection|TestAccComputeServiceAttachment_serviceAttachmentBasicExample|TestAccComputeServiceAttachment_serviceAttachmentExplicitProjectsExample|TestAccComputeSnapshot_snapshotBasicExample|TestAccComputeSnapshot_encryption|TestAccComputeSslPolicy_update|TestAccComputeSslPolicy_sslPolicyBasicExample|TestAccComputeSslPolicy_update_to_custom|TestAccComputeSslPolicy_update_from_custom|TestAccComputeSubnetwork_subnetworkBasicExample|TestAccComputeSubnetwork_subnetworkLoggingConfigExample|TestAccComputeSubnetwork_subnetworkInternalL7lbExample|TestAccComputeSubnetwork_basic|TestAccComputeSubnetwork_secondaryIpRanges|TestAccComputeSubnetwork_update|TestAccComputeSubnetworkIamPolicy|TestAccComputeSharedVpc_basic|TestAccComputeSubnetwork_flowLogs|TestAccComputeSubnetwork_flowLogsMigrate|TestAccComputeTargetGrpcProxy_targetGrpcProxyBasicExample|TestAccComputeTargetGrpcProxy_update|TestAccComputeTargetHttpProxy_targetHttpProxyBasicExample|TestAccComputeTargetInstance_targetInstanceBasicExample|TestAccComputeTargetHttpProxy_targetHttpProxyHttpsRedirectExample|TestAccComputeTargetHttpProxy_update|TestAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample|TestAccComputeTargetInstance_targetInstanceCustomNetworkExample|TestAccComputeTargetHttpsProxy_update|TestAccComputeTargetPool_basic|TestAccComputeTargetPool_update|TestAccComputeTargetSslProxy_targetSslProxyBasicExample|TestAccComputeTargetSslProxy_update|TestAccComputeTargetTcpProxy_targetTcpProxyBasicExample|TestAccComputeTargetTcpProxy_update|TestAccComputeUrlMap_urlMapTrafficDirectorRouteExample|TestAccComputeUrlMap_urlMapTrafficDirectorRoutePartialExample|TestAccComputeUrlMap_urlMapTrafficDirectorPathExample|TestAccComputeUrlMap_urlMapBasicExample|TestAccComputeUrlMap_urlMapTrafficDirectorPathPartialExample|TestAccComputeUrlMap_urlMapHeaderBasedRoutingExample|TestAccComputeUrlMap_urlMapParameterBasedRoutingExample|TestAccComputeUrlMap_update_path_matcher|TestAccComputeUrlMap_advanced|TestAccComputeUrlMap_defaultRouteActionPathUrlRewrite|TestAccComputeUrlMap_defaultRouteActionUrlRewrite|TestAccComputeUrlMap_noPathRulesWithUpdate|TestAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate|TestAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate|TestAccComputeUrlMap_trafficDirectorUpdate|TestAccComputeUrlMap_trafficDirectorPathUpdate|TestAccComputeUrlMap_trafficDirectorRemoveRouteRule|TestAccComputeVpnGateway_targetVpnGatewayBasicExample|TestAccComputeUrlMap_defaultUrlRedirect|TestAccComputeVpnTunnel_vpnTunnelBasicExample|TestAccComputeVpnTunnel_regionFromGateway|TestAccComputeVpnTunnel_vpnTunnelBetaExample|TestAccComputeVpnTunnel_router|TestAccComputeVpnTunnel_defaultTrafficSelectors|TestAccContainerCluster_basic|TestAccContainerCluster_misc|TestAccContainerCluster_withAddons|TestAccContainerCluster_withNotificationConfig|TestAccContainerCluster_withConfidentialNodes|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccContainerCluster_withNetworkPolicyEnabled|TestAccContainerCluster_withILBSubsetting|TestAccContainerCluster_withReleaseChannelEnabled|TestAccContainerCluster_withTelemetryEnabled|TestAccContainerCluster_withReleaseChannelEnabledDefaultVersion|TestAccContainerCluster_withMasterAuthorizedNetworksConfig|TestAccContainerCluster_regionalWithNodePool|TestAccContainerCluster_regional|TestAccContainerCluster_withTpu|TestAccContainerCluster_regionalWithNodeLocations|TestAccContainerCluster_withPrivateClusterConfig|TestAccContainerCluster_withIntraNodeVisibility|TestAccContainerCluster_withNodeConfig|TestAccContainerCluster_withNodeConfigScopeAlias|TestAccContainerCluster_withVersion|TestAccContainerCluster_updateVersion|TestAccContainerCluster_withNodeConfigShieldedInstanceConfig|TestAccContainerCluster_backend|TestAccContainerCluster_network|TestAccContainerCluster_withWorkloadMetadataConfig|TestAccContainerCluster_withNodePoolBasic|TestAccContainerCluster_withSandboxConfig|TestAccContainerCluster_withNodePoolResize|TestAccContainerCluster_withNodePoolUpdateVersion|TestAccContainerCluster_withNodePoolAutoscaling|TestAccContainerCluster_withNodePoolMultiple|TestAccContainerCluster_withNodePoolNodeConfig|TestAccContainerCluster_withRecurringMaintenanceWindow|TestAccContainerCluster_withMaintenanceWindow|TestAccContainerCluster_withMaintenanceExclusionWindow|TestAccContainerCluster_withIPAllocationPolicy_existingSecondaryRanges|TestAccContainerCluster_withIPAllocationPolicy_specificIPRanges|TestAccContainerCluster_withIPAllocationPolicy_specificSizes|TestAccContainerCluster_nodeAutoprovisioning|TestAccContainerCluster_nodeAutoprovisioningDefaults|TestAccContainerCluster_withShieldedNodes|TestAccContainerCluster_withAutopilot|TestAccContainerCluster_withWorkloadIdentityConfig|TestAccContainerCluster_withAutoscalingProfile|TestAccContainerCluster_withBinaryAuthorization|TestAccContainerCluster_nodeAutoprovisioningDefaultsMinCpuPlatform|TestAccContainerCluster_withFlexiblePodCIDR|TestAccContainerCluster_errorCleanDanglingCluster|TestAccContainerCluster_errorNoClusterCreated|TestAccContainerCluster_withAdvancedDatapath|TestAccContainerCluster_withDatabaseEncryption|TestAccContainerCluster_withMasterAuthorizedNetworksDisabled|TestAccContainerCluster_withEnableKubernetesAlpha|TestAccContainerCluster_withResourceUsageExportConfig|TestAccContainerNodePool_basicWithClusterId|TestAccContainerNodePool_basic|TestAccContainerNodePool_nodeLocations|TestAccContainerNodePool_maxPodsPerNode|TestAccContainerNodePool_withNodeConfig|TestAccContainerNodePool_withSandboxConfig|TestAccContainerNodePool_withWorkloadIdentityConfig|TestAccContainerNodePool_withKubeletConfig|TestAccContainerNodePool_withNetworkConfig|TestAccContainerNodePool_withLinuxNodeConfig|TestAccContainerNodePool_withUpgradeSettings|TestAccContainerNodePool_withManagement|TestAccContainerNodePool_withGPU|TestAccContainerNodePool_regionalAutoscaling|TestAccContainerNodePool_withNodeConfigScopeAlias|TestAccContainerNodePool_autoscaling|TestAccContainerNodePool_resize|TestAccContainerNodePool_regionalClusters|TestAccContainerNodePool_EmptyGuestAccelerator|TestAccContainerNodePool_012_ConfigModeAttr|TestAccContainerNodePool_version|TestAccContainerNodePool_shieldedInstanceConfig|TestAccDataCatalogPolicyTag_dataCatalogTaxonomiesPolicyTagChildPoliciesExample|TestAccDataCatalogPolicyTag_dataCatalogTaxonomiesPolicyTagBasicExample|TestAccDataCatalogTaxonomy_dataCatalogTaxonomyBasicExample|TestAccDataFusionInstance_dataFusionInstanceBasicExample|TestAccDataFusionInstance_dataFusionInstanceFullExample|TestAccDataprocCluster_withInternalIpOnlyTrueAndShieldedConfig|TestAccDataprocWorkflowTemplate_basic|TestAccDataprocMetastoreService_dataprocMetastoreServiceBasicExample|TestAccDNSManagedZone_dnsManagedZonePrivateExample|TestAccDNSManagedZone_dnsManagedZonePrivatePeeringExample|TestAccDNSManagedZone_privateUpdate|TestAccDNSManagedZone_dnsManagedZoneServiceDirectoryExample|TestAccDNSManagedZone_privateForwardingUpdate|TestAccDNSManagedZone_reverseLookup|TestAccDNSPolicy_dnsPolicyBasicExample|TestAccDNSPolicy_update|TestAccDNSRecordSet_basic|TestAccDNSRecordSet_Update|TestAccDNSRecordSet_changeType|TestAccDNSRecordSet_nestedNS|TestAccDNSRecordSet_quotedTXT|TestAccDNSRecordSet_uppercaseMX|TestAccFilestoreInstance_filestoreInstanceBasicExample|TestAccEssentialContactsContact_essentialContactExample|TestAccFilestoreInstance_filestoreInstanceFullExample|TestAccFilestoreInstance_update|TestAccFirestoreIndex_firestoreIndexBasicExample|TestAccGKEHubMembership_gkehubMembershipIssuerExample|TestAccGKEHubMembership_gkehubMembershipBasicExample|TestAccSecurityScannerScanConfig_scanConfigUpdate|TestAccProject_deleteDefaultNetwork|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccHealthcareDicomStore_healthcareDicomStoreBqStreamExample|TestAccHealthcareHl7V2Store_healthcareHl7V2StoreParserConfigExample|TestAccHealthcareHl7V2Store_healthcareHl7V2StoreUnschematizedExample|TestAccIAMBetaWorkloadIdentityPool_iamWorkloadIdentityPoolFullExample|TestAccIAMBetaWorkloadIdentityPool_iamWorkloadIdentityPoolBasicExample|TestAccIAMBetaWorkloadIdentityPoolProvider_iamWorkloadIdentityPoolProviderAwsBasicExample|TestAccHealthcareHl7V2Store_basic|TestAccIAMBetaWorkloadIdentityPoolProvider_iamWorkloadIdentityPoolProviderAwsFullExample|TestAccIAMBetaWorkloadIdentityPoolProvider_iamWorkloadIdentityPoolProviderOidcBasicExample|TestAccIAMBetaWorkloadIdentityPoolProvider_iamWorkloadIdentityPoolProviderOidcFullExample|TestAccNetworkManagementConnectivityTest_networkManagementConnectivityTestInstancesExample|TestAccNetworkManagementConnectivityTest_update|TestAccNetworkManagementConnectivityTest_networkManagementConnectivityTestAddressesExample|TestAccNetworkServicesEdgeCacheOrigin_networkServicesEdgeCacheOriginBasicExample|TestAccNotebooksInstance_notebookInstanceFullExample|TestAccNotebooksInstance_create_vm_image|TestAccNotebooksInstance_update|TestAccOSConfigGuestPolicies_osConfigGuestPoliciesBasicExample|TestAccOSConfigPatchDeployment_osConfigPatchDeploymentInstanceExample|TestAccPrivatecaCertificate_privatecaCertificateConfigExample|TestAccPrivatecaCertificate_privatecaCertificateCsrExample|TestAccPubsubLiteTopic_pubsubLiteTopicBasicExample|TestAccPubsubTopic_pubsubTopicBasicExample|TestAccRedisInstance_redisInstanceFullExample|TestAccSecurityScannerScanConfig_scanConfigBasicExample|TestAccServiceDirectoryEndpoint_serviceDirectoryEndpointBasicExample|TestAccServiceNetworkingConnection_create|TestAccServiceDirectoryNamespace_serviceDirectoryNamespaceBasicExample|TestAccServiceNetworkingConnection_update|TestAccServiceDirectoryService_serviceDirectoryServiceBasicExample|TestAccServiceUsageConsumerQuotaOverride_consumerQuotaOverrideExample|TestAccServiceUsageConsumerQuotaOverride_consumerQuotaOverrideZeroValueExample|TestAccServiceUsageConsumerQuotaOverride_regionConsumerQuotaOverrideExample|TestAccSQLDatabase_sqlDatabaseBasicExample|TestAccSqlDatabaseInstance_basicSecondGen|TestAccSqlDatabaseInstance_basicMSSQL|TestAccSqlDatabaseInstance_dontDeleteDefaultUserOnReplica|TestAccSqlDatabaseInstance_settings_basic|TestAccSqlDatabaseInstance_settings_deletionProtection|TestAccSqlDatabaseInstance_settings_checkServiceNetworking|TestAccSqlDatabaseInstance_replica|TestAccSqlDatabaseInstance_slave|TestAccSqlDatabaseInstance_highAvailability|TestAccSqlDatabaseInstance_maintenance|TestAccSqlDatabaseInstance_diskspecs|TestAccSqlDatabaseInstance_settings_upgrade|TestAccSqlDatabaseInstance_settingsDowngrade|TestAccSqlDatabaseInstance_authNets|TestAccSqlDatabaseInstance_multipleOperations|TestAccSqlDatabaseInstance_basic_with_user_labels|TestAccSqlDatabaseInstance_withPrivateNetwork|TestAccSqlDatabaseInstance_insights|TestAccSqlDatabaseInstance_PointInTimeRecoveryEnabled|TestAccSqlDatabaseInstance_BackupRetention|TestAccSqlDatabase_basic|TestAccSqlDatabase_update|TestAccSqlClientCert_mysql|TestAccSqlClientCert_postgres|TestAccSqlUser_postgresAbandon|TestAccSqlUser_postgres|TestAccSqlUser_postgresIAM|TestAccStorageBucketAcl_predefined|TestAccStorageBucket_requesterPays|TestAccStorageBucket_basic|TestAccStorageBucket_lowercaseLocation|TestAccStorageBucket_customAttributes|TestAccStorageBucket_lifecycleRuleStateLive|TestAccStorageBucket_lifecycleRuleStateArchived|TestAccStorageBucket_versioning|TestAccStorageBucket_update_requesterPays|TestAccStorageBucket_defaultEventBasedHold|TestAccStorageBucket_forceDestroy|TestAccStorageBucket_cors|TestAccStorageBucket_forceDestroyObjectDeleteError|TestAccStorageBucket_forceDestroyWithVersioning|TestAccStorageBucket_logging|TestAccStorageDefaultObjectAcl_basic|TestAccStorageBucket_retentionPolicy|TestAccStorageDefaultObjectAcl_noRoleEntity|TestAccStorageDefaultObjectAcl_upgrade|TestAccStorageBucket_lifecycleRuleStateAny|TestAccStorageBucket_uniformBucketAccessOnly|TestAccStorageDefaultObjectAcl_downgrade|TestAccStorageDefaultObjectAcl_unordered|TestAccStorageBucket_website|TestAccStorageBucket_labels|TestAccStorageTransferJob_basic|TestAccTPUNode_tpuNodeFullExample|TestAccVertexAIMetadataStore_vertexAiMetadataStoreExample|TestAccVPCAccessConnector_vpcAccessConnectorSharedVPCExample|TestAccVPCAccessConnector_vpcAccessConnectorThroughput|TestAccComputeResourceUsageExportBucket You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=226521

rileykarson
rileykarson reviewed Dec 1, 2021
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.

VCR's freaking out- are you able to start an independent run, or share a successful test log here?

mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb Outdated
@@ -48,13 +48,6 @@ var (
"settings.0.backup_configuration.0.transaction_log_retention_days",
}

ipConfigurationKeys = []string{
Copy link
Member

Choose a reason for hiding this comment

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

What's changed that we want to inline this rather than add allocated_ip_range as a value? I believe the purpose here is avoiding an empty block in Terraform, as those map to an unusual Go object that it's better we avoid.

Copy link
Member Author

Choose a reason for hiding this comment

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

My concern is that allocated_ip_range should only be set as long as private_network also got a correct value being set, so allocated_ip_range should not be in that AtLeastOneOf, and ipConfigurationKeys may be confusing if it only contains the other four fields but not allocated_ip_range (or maybe it is not confusing, it was just my concern). Also is there a way to indicate that a field should be set only if some other fields are set as well?

Copy link
Member

Choose a reason for hiding this comment

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

My concern is that allocated_ip_range should only be set as long as private_network also got a correct value being set, so allocated_ip_range should not be in that AtLeastOneOf, and ipConfigurationKeys may be confusing if it only contains the other four fields but not allocated_ip_range (or maybe it is not confusing, it was just my concern).
Using AtLeastOneOf makes up for a specific deficiency in Terraform, I think it's fine to not represent the API 100% accurately here. The API will just return an error.

Also is there a way to indicate that a field should be set only if some other fields are set as well?
Not that I can think of right now! It's possible with CustomizeDiff but prone to errors and certainly not worth doing.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah. I think the error returned is clear enough. Will bring back the ipConfigurationKeys and add allocated_ip_range to it.

mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown Outdated
@@ -295,6 +295,8 @@ This setting can be updated, but it cannot be removed after it is set.

* `require_ssl` - (Optional) Whether SSL connections over IP are enforced or not.

* `allocated_ip_range` - (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?. Reserved for future use.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* `allocated_ip_range` - (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?. Reserved for future use.
* `allocated_ip_range` - (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://datatracker.ietf.org/doc/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.

I suspect we can drop this part.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah. I agree and will do!

mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb Show resolved Hide resolved
@shuyama1
Copy link
Member Author

shuyama1 commented Dec 2, 2021

I run the test independently and it passed (https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/226542), but it seems never passed in the VCR test

@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 ( 3 files changed, 140 insertions(+), 3 deletions(-))
Terraform Beta: Diff ( 3 files changed, 83 insertions(+), 8 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccSqlDatabaseInstance_withPrivateNetwork_withoutAllocatedIpRange|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=227052

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode: TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange|TestAccSqlDatabaseInstance_withPrivateNetwork_withoutAllocatedIpRange|TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccCloudFunctionsFunction_vpcConnector Please fix these to complete your PR

@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, 158 insertions(+), 21 deletions(-))
Terraform Beta: Diff ( 3 files changed, 83 insertions(+), 8 deletions(-))

@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 ( 3 files changed, 140 insertions(+), 3 deletions(-))
Terraform Beta: Diff ( 4 files changed, 101 insertions(+), 26 deletions(-))

@shuyama1
Copy link
Member Author

shuyama1 commented Dec 3, 2021

/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, 162 insertions(+), 25 deletions(-))
Terraform Beta: Diff ( 3 files changed, 83 insertions(+), 8 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccSqlDatabaseInstance_withPrivateNetwork_withoutAllocatedIpRange|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=227588

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode: TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample Please fix these to complete your PR

@shuyama1 shuyama1 merged commit 367d67d into GoogleCloudPlatform:master Dec 3, 2021
This was referenced Dec 3, 2021
Merged
Merged
betsy-lichtenberg pushed a commit to betsy-lichtenberg/magic-modules that referenced this pull request Apr 25, 2022
@shuyama1 @betsy-lichtenberg
Support allocated_ip_range in google_sql_database_instance (Googl…
2d7f46f 
…eCloudPlatform#5500)

* support allocated_ip_range in sql_database_instance

* support allocated_ip_range

* clean up

* remove unused variable

* separate tests

* increase size of allogcated ip range
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

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
3 participants
@shuyama1 @modular-magician @rileykarson