cleanup

api/domains.go

@@ -66,15 +66,9 @@ func (c *Client) GetDomainRecords(customerID, domain string) ([]*DomainRecord, e
 	return records, nil
 }
 
-<<<<<<< Updated upstream
-// UpdateDomainRecords replaces all of the existing records for the provided domain
-func (c *Client) UpdateDomainRecords(customerID, domain string, records []*DomainRecord) error {
-	for _, t := range supportedTypes {
-=======
 // UpdateDomainRecords adds records or replaces all existing records for the provided domain
 func (c *Client) UpdateDomainRecords(customerID, domain string, records []*DomainRecord) error {
 	for t := range supportedTypes {
->>>>>>> Stashed changes
 		typeRecords := c.domainRecordsOfType(t, records)
 		if IsDisallowed(t, typeRecords) {
 			continue

docs/index.md

@@ -1,20 +1,12 @@
 ---
-<<<<<<< Updated upstream
-page_title: "GoDaddy Provider"
-subcategory: "infrastructure"
-=======
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "GoDaddy Provider"
 subcategory: "infrastructure"
 description: |-
->>>>>>> Stashed changes
   
 ---
 
 # GoDaddy Provider
 
-<<<<<<< Updated upstream
-=======
 The GoDaddy Provider supports Terraform's `import` feature to make it easier to deal with existing records that are supplied by GoDaddy by default.
 
 #### Import Example
@@ -25,7 +17,6 @@ To import any pre-existing GoDaddy resource data into your local Terraform state
 terraform import godaddy_domain_record.mydomain mydomain.com
 ```
 
->>>>>>> Stashed changes
 ## Schema
 
 ### Optional

docs/resources/domain_record.md

@@ -1,12 +1,8 @@
 ---
 page_title: "godaddy_domain_record Resource - terraform-provider-godaddy"
 subcategory: "infrastructure"
-<<<<<<< Updated upstream
-
-=======
 description: |-
   
->>>>>>> Stashed changes
 ---
 
 # godaddy_domain_record (Resource)
@@ -15,17 +11,10 @@ description: |-
 
 ### Required
 
-- **domain** (String)
+- `domain` (String)
 
 ### Optional
 
-<<<<<<< Updated upstream
-- **addresses** (List of String)
-- **customer** (String)
-- **id** (String) The ID of this resource.
-- **nameservers** (List of String)
-- **record** (Block Set) (see [below for nested schema](#nestedblock--record))
-=======
 - `addresses` (List of String) IP Addresses.
 - `customer` (String) Customer ID (required if you are a reseller managing a domain purchased outside the scope of your reseller account).
 - `nameservers` (List of String)
@@ -34,22 +23,21 @@ description: |-
 ### Read-Only
 
 - `id` (String) The ID of this resource.
->>>>>>> Stashed changes
 
 <a id="nestedblock--record"></a>
 ### Nested Schema for `record`
 
 Required:
 
-- **data** (String)
-- **name** (String)
-- **type** (String)
+- `data` (String)
+- `name` (String)
+- `type` (String)
 
 Optional:
 
-- **port** (Number)
-- **priority** (Number)
-- **protocol** (String)
-- **service** (String)
-- **ttl** (Number)
-- **weight** (Number)
+- `port` (Number)
+- `priority` (Number)
+- `protocol` (String)
+- `service` (String)
+- `ttl` (Number)
+- `weight` (Number)

go.mod

@@ -1,74 +1,47 @@
 module github.com/n3integration/terraform-provider-godaddy
 
 require (
-<<<<<<< Updated upstream
 	github.com/hashicorp/hcl/v2 v2.9.1 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.0
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
-=======
-	github.com/hashicorp/terraform-plugin-docs v0.13.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.0
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/stretchr/testify v1.7.0
->>>>>>> Stashed changes
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
 )
 
 require (
-	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.1.1 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v0.15.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.4.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.4.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.9.1 // indirect
-	github.com/hashicorp/terraform-exec v0.17.2 // indirect
-	github.com/hashicorp/terraform-json v0.14.0 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.3.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
-	github.com/huandu/xstrings v1.3.2 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mitchellh/cli v1.1.4 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.0.4 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/posener/complete v1.2.3 // indirect
-	github.com/russross/blackfriday v1.6.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/zclconf/go-cty v1.10.0 // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
 	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
-	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
 	google.golang.org/grpc v1.32.0 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.0 // indirect
 )