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

Revert google_dns_record_set to previous implementation #3625

Merged
merged 1 commit into from
Sep 16, 2021
Merged

Revert google_dns_record_set to previous implementation #3625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/5191.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
```
6 changes: 3 additions & 3 deletions google-beta/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_access_context_manager_access_level_condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_access_context_manager_service_perimeter_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"google.golang.org/api/googleapi"
)

func resourceAccessContextManagerServicePerimeterResource() *schema.Resource {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_bigquery_dataset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_]+`
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_bigquery_dataset_access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_bigquery_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_bigquery_routine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_bigtable_app_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_cloud_run_domain_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_cloud_run_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_composer_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
3 changes: 0 additions & 3 deletions google-beta/resource_compute_backend_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_instance_group_named_port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"google.golang.org/api/googleapi"
)

func resourceComputeInstanceGroupNamedPort() *schema.Resource {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_region_backend_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_region_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_router_nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_router_peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_security_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_compute_subnetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_data_loss_prevention_stored_info_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"google.golang.org/api/googleapi"
)

func resourceDataLossPreventionStoredInfoType() *schema.Resource {
Expand Down
2 changes: 0 additions & 2 deletions google-beta/resource_dataproc_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 0 additions & 2 deletions google-beta/resource_dataproc_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion google-beta/resource_dns_managed_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading