Revert google_dns_record_set to previous implementation (#5191) (#3625

) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Sep 16, 2021 · 534738c · 534738c
1 parent 6325abe
commit 534738c
Show file tree

Hide file tree

Showing 36 changed files with 380 additions and 466 deletions.
diff --git a/.changelog/5191.txt b/.changelog/5191.txt
@@ -0,0 +1,6 @@
+```release-note:bug
+dns: fixed an issue in `google_dns_record_set` where creating the resource would result in an 409 error
+```
+```release-note:bug
+dns: fixed an issue in `google_dns_record_set` where `rrdatas` could not be updated
+```
diff --git a/google-beta/provider.go b/google-beta/provider.go
@@ -889,9 +889,9 @@ func Provider() *schema.Provider {
 	return provider
 }
 
-// Generated resources: 240
+// Generated resources: 239
 // Generated IAM resources: 117
-// Total generated resources: 357
+// Total generated resources: 356
 func ResourceMap() map[string]*schema.Resource {
 	resourceMap, _ := ResourceMapWithErrors()
 	return resourceMap
@@ -1103,7 +1103,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_dialogflow_cx_environment":                             resourceDialogflowCXEnvironment(),
 			"google_dns_managed_zone":                                      resourceDNSManagedZone(),
 			"google_dns_policy":                                            resourceDNSPolicy(),
-			"google_dns_record_set":                                        resourceDNSResourceDnsRecordSet(),
 			"google_essential_contacts_contact":                            resourceEssentialContactsContact(),
 			"google_filestore_instance":                                    resourceFilestoreInstance(),
 			"google_firebase_project":                                      resourceFirebaseProject(),
@@ -1291,6 +1290,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_dataflow_flex_template_job":            resourceDataflowFlexTemplateJob(),
 			"google_dataproc_cluster":                      resourceDataprocCluster(),
 			"google_dataproc_job":                          resourceDataprocJob(),
+			"google_dns_record_set":                        resourceDnsRecordSet(),
 			"google_endpoints_service":                     resourceEndpointsService(),
 			"google_folder":                                resourceGoogleFolder(),
 			"google_folder_organization_policy":            resourceGoogleFolderOrganizationPolicy(),

diff --git a/google-beta/resource_access_context_manager_access_level_condition.go b/google-beta/resource_access_context_manager_access_level_condition.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceAccessContextManagerAccessLevelCondition() *schema.Resource {

diff --git a/google-beta/resource_access_context_manager_service_perimeter_resource.go b/google-beta/resource_access_context_manager_service_perimeter_resource.go
@@ -21,7 +21,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceAccessContextManagerServicePerimeterResource() *schema.Resource {

diff --git a/google-beta/resource_bigquery_dataset.go b/google-beta/resource_bigquery_dataset.go
@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 const datasetIdRegexp = `[0-9A-Za-z_]+`

diff --git a/google-beta/resource_bigquery_dataset_access.go b/google-beta/resource_bigquery_dataset_access.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 var bigqueryAccessRoleToPrimitiveMap = map[string]string{

diff --git a/google-beta/resource_bigquery_job.go b/google-beta/resource_bigquery_job.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 var (

diff --git a/google-beta/resource_bigquery_routine.go b/google-beta/resource_bigquery_routine.go
@@ -25,7 +25,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceBigQueryRoutine() *schema.Resource {

diff --git a/google-beta/resource_bigtable_app_profile.go b/google-beta/resource_bigtable_app_profile.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/bigtableadmin/v2"
 )
 
 func resourceBigtableAppProfile() *schema.Resource {

diff --git a/google-beta/resource_cloud_run_domain_mapping.go b/google-beta/resource_cloud_run_domain_mapping.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 var domainMappingGoogleProvidedLabels = []string{

diff --git a/google-beta/resource_cloud_run_service.go b/google-beta/resource_cloud_run_service.go
@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 func revisionNameCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v interface{}) error {

diff --git a/google-beta/resource_composer_environment.go b/google-beta/resource_composer_environment.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	composer "google.golang.org/api/composer/v1beta1"
 )
 
 const (

diff --git a/google-beta/resource_compute_backend_service.go b/google-beta/resource_compute_backend_service.go
@@ -23,11 +23,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/compute/v1"
-	"google.golang.org/api/googleapi"
 )
 
 // Whether the backend is a global or regional NEG

diff --git a/google-beta/resource_compute_disk.go b/google-beta/resource_compute_disk.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 // Is the new disk size smaller than the old one?

diff --git a/google-beta/resource_compute_instance_group_named_port.go b/google-beta/resource_compute_instance_group_named_port.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeInstanceGroupNamedPort() *schema.Resource {

diff --git a/google-beta/resource_compute_network.go b/google-beta/resource_compute_network.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeNetwork() *schema.Resource {

diff --git a/google-beta/resource_compute_region_backend_service.go b/google-beta/resource_compute_region_backend_service.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 // Fields in "backends" that are not allowed for non-managed backend services

diff --git a/google-beta/resource_compute_region_disk.go b/google-beta/resource_compute_region_disk.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeRegionDisk() *schema.Resource {

diff --git a/google-beta/resource_compute_router_nat.go b/google-beta/resource_compute_router_nat.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceNameSetFromSelfLinkSet(v interface{}) *schema.Set {

diff --git a/google-beta/resource_compute_router_peer.go b/google-beta/resource_compute_router_peer.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceComputeRouterBgpPeer() *schema.Resource {

diff --git a/google-beta/resource_compute_security_policy.go b/google-beta/resource_compute_security_policy.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	compute "google.golang.org/api/compute/v0.beta"
 )
 
 func resourceComputeSecurityPolicy() *schema.Resource {

diff --git a/google-beta/resource_compute_subnetwork.go b/google-beta/resource_compute_subnetwork.go
@@ -22,7 +22,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/apparentlymart/go-cidr/cidr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

diff --git a/google-beta/resource_data_loss_prevention_stored_info_type.go b/google-beta/resource_data_loss_prevention_stored_info_type.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"google.golang.org/api/googleapi"
 )
 
 func resourceDataLossPreventionStoredInfoType() *schema.Resource {

diff --git a/google-beta/resource_dataproc_cluster.go b/google-beta/resource_dataproc_cluster.go
@@ -11,8 +11,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-
-	dataproc "google.golang.org/api/dataproc/v1beta2"
 )
 
 var (

diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -14,8 +14,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
 	"google.golang.org/api/googleapi"
-
-	dataproc "google.golang.org/api/dataproc/v1beta2"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

diff --git a/google-beta/resource_dns_managed_zone.go b/google-beta/resource_dns_managed_zone.go
@@ -25,7 +25,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/dns/v1"
 )
 
 func resourceDNSManagedZone() *schema.Resource {