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

Revert google_dns_record_set to previous implementation #5191

Merged
merged 4 commits into from
Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 1 addition & 3 deletions mmv1/products/dns/ansible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
contain_extra_docs: false
Project: !ruby/object:Overrides::Ansible::ResourceOverride
# TODO(alexstephen): Re-evaluate merging Project into Ansible
exclude: true
ResourceDnsRecordSet: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
exclude: true
files: !ruby/object:Provider::Config::Files
resource:
<%= lines(indent(compile('provider/ansible/resource~compile.yaml'), 4)) -%>
65 changes: 0 additions & 65 deletions mmv1/products/dns/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -497,68 +497,3 @@ objects:
description: |
As defined in RFC 1035 (section 5) and RFC 1034 (section 3.6.1)
api_name: rrdatas
- !ruby/object:Api::Resource
name: 'ResourceDnsRecordSet'
kind: 'dns#resourceRecordSet'
description: |
A single DNS record that exists on a domain name (i.e. in a managed zone).
This record defines the information about the domain and where the
domain / subdomains direct to.

The record will include the domain/subdomain name, a type (i.e. A, AAA,
CAA, MX, CNAME, NS, etc)
base_url: 'projects/{{project}}/managedZones/{{managed_zone}}/rrsets'
self_link: 'projects/{{project}}/managedZones/{{managed_zone}}/rrsets/{{name}}/{{type}}'
update_verb: :PATCH
parameters:
- !ruby/object:Api::Type::ResourceRef
name: 'managed_zone'
input: true
description: |
Identifies the managed zone addressed by this request.
required: true
resource: 'ManagedZone'
imports: 'name'
properties:
- !ruby/object:Api::Type::String
name: 'name'
description: For example, www.example.com.
required: true
input: true
- !ruby/object:Api::Type::Enum
name: 'type'
values:
- :A
- :AAAA
- :CAA
- :CNAME
- :DNSKEY
- :DS
- :IPSECVPNKEY
- :MX
- :NAPTR
- :NS
- :PTR
- :SOA
- :SPF
- :SRV
- :SSHFP
- :TLSA
- :TXT
description: One of valid DNS resource types.
required: true
- !ruby/object:Api::Type::Integer
name: 'ttl'
description: |
Number of seconds that this ResourceRecordSet can be cached by
resolvers.
- !ruby/object:Api::Type::Array
name: rrdatas
input: true
description: |
The string data for the records in this record set whose meaning depends on the DNS type.
For TXT record, if the string data contains spaces, add surrounding \" if you don't want your string to get
split on spaces. To specify a single record value longer than 255 characters such as a TXT record for
DKIM, add \"\" inside the Terraform configuration string (e.g. "first255characters\"\"morecharacters").
item_type: Api::Type::String

2 changes: 0 additions & 2 deletions mmv1/products/dns/inspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,4 @@ overrides: !ruby/object:Overrides::ResourceOverrides
exclude: true
Policy: !ruby/object:Overrides::Inspec::ResourceOverride
exclude: true
ResourceDnsRecordSet: !ruby/object:Overrides::Inspec::ResourceOverride
exclude: true

17 changes: 0 additions & 17 deletions mmv1/products/dns/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
pre_delete: templates/terraform/pre_delete/detach_network.erb
ResourceRecordSet: !ruby/object:Overrides::Terraform::ResourceOverride
exclude: true
ResourceDnsRecordSet: !ruby/object:Overrides::Terraform::ResourceOverride
legacy_name: "google_dns_record_set"
import_format: ["projects/{{project}}/managedZones/{{managed_zone}}/rrsets/{{name}}/{{type}}"]
custom_code: !ruby/object:Provider::Terraform::CustomCode
constants: 'templates/terraform/constants/resource_dns_resource_record_set.go.erb'
examples:
- !ruby/object:Provider::Terraform::Examples
skip_test: true
name: "dns_record_set_basic"
primary_resource_id: "resource-recordset"
vars:
zone_name: "my-zone"
properties:
rrdatas: !ruby/object:Overrides::Terraform::PropertyOverride
diff_suppress_func: 'rrdatasDnsDiffSuppress'
managed_zone: !ruby/object:Overrides::Terraform::PropertyOverride
ignore_read: true
Project: !ruby/object:Overrides::Terraform::ResourceOverride
exclude: true
# This is for copying files over
Expand Down
Loading