diff --git a/plugins/source/aws/docs/tables/aws_route53_domains.md b/plugins/source/aws/docs/tables/aws_route53_domains.md index 48faf2c0f3743a..8d16286e36ade9 100644 --- a/plugins/source/aws/docs/tables/aws_route53_domains.md +++ b/plugins/source/aws/docs/tables/aws_route53_domains.md @@ -13,23 +13,24 @@ The composite primary key for this table is (**account_id**, **domain_name**). |account_id (PK)|String| |domain_name (PK)|String| |tags|JSON| -|admin_contact|JSON| -|nameservers|JSON| -|registrant_contact|JSON| -|tech_contact|JSON| |abuse_contact_email|String| |abuse_contact_phone|String| +|admin_contact|JSON| |admin_privacy|Bool| |auto_renew|Bool| |creation_date|Timestamp| |dns_sec|String| +|dnssec_keys|JSON| |expiration_date|Timestamp| +|nameservers|JSON| +|registrant_contact|JSON| |registrant_privacy|Bool| |registrar_name|String| |registrar_url|String| |registry_domain_id|String| |reseller|String| |status_list|StringArray| +|tech_contact|JSON| |tech_privacy|Bool| |updated_date|Timestamp| |who_is_server|String| diff --git a/plugins/source/aws/go.mod b/plugins/source/aws/go.mod index 5ea2898a5eb8ad..a29e5cee698859 100644 --- a/plugins/source/aws/go.mod +++ b/plugins/source/aws/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.26.18 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.21 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.59.0 diff --git a/plugins/source/aws/go.sum b/plugins/source/aws/go.sum index 23605aefed2115..f9cba630eb9c05 100644 --- a/plugins/source/aws/go.sum +++ b/plugins/source/aws/go.sum @@ -204,8 +204,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23 h1:DcD2mZOpFmo3HOd4 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.23/go.mod h1:ZkZtG/eXl3leAzkIHhWJOkKaAObxOHtYe3lxUxW1WW0= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2 h1:MNL6bLDcwOGL9j+ANiejLYn/cBSku1m+pLWXri/FFF4= github.com/aws/aws-sdk-go-v2/service/route53 v1.25.2/go.mod h1:4SAHuLdh4v7pA2F6HdhUUgiLUDA6J89KWr7xAYCDiyc= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.21 h1:6tzCaDiUwpqPHOEP5Uumnz8M6XcRClAcE9rJtsQhnEk= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.21/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0 h1:0isIvtqn8syj503AEQSdu56dMtuEeu0h5LJ7sgpR8CY= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.13.0/go.mod h1:TTvu6PV1OnaZWl5QWRgpP1iH79bEESwPnCNya1sDqyM= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6 h1:W8pLcSn6Uy0eXgDBUUl8M8Kxv7JCoP68ZKTD04OXLEA= github.com/aws/aws-sdk-go-v2/service/s3 v1.29.6/go.mod h1:L2l2/q76teehcW7YEsgsDjqdsDTERJeX3nOMIFlgGUE= github.com/aws/aws-sdk-go-v2/service/s3control v1.28.2 h1:HILTJewyveEWszPKAN3C3gALrs2x13tCIN3BZZrUgkE= diff --git a/plugins/source/aws/resources/services/route53/domains.go b/plugins/source/aws/resources/services/route53/domains.go index 1f92a57432e73b..9ee4876e79ef8e 100644 --- a/plugins/source/aws/resources/services/route53/domains.go +++ b/plugins/source/aws/resources/services/route53/domains.go @@ -35,26 +35,6 @@ func Domains() *schema.Table { Resolver: resolveRoute53DomainTags, Description: `A list of tags`, }, - { - Name: "admin_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("AdminContact"), - }, - { - Name: "nameservers", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("Nameservers"), - }, - { - Name: "registrant_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("RegistrantContact"), - }, - { - Name: "tech_contact", - Type: schema.TypeJSON, - Resolver: schema.PathResolver("TechContact"), - }, { Name: "abuse_contact_email", Type: schema.TypeString, @@ -65,6 +45,11 @@ func Domains() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("AbuseContactPhone"), }, + { + Name: "admin_contact", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("AdminContact"), + }, { Name: "admin_privacy", Type: schema.TypeBool, @@ -85,11 +70,26 @@ func Domains() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("DnsSec"), }, + { + Name: "dnssec_keys", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("DnssecKeys"), + }, { Name: "expiration_date", Type: schema.TypeTimestamp, Resolver: schema.PathResolver("ExpirationDate"), }, + { + Name: "nameservers", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("Nameservers"), + }, + { + Name: "registrant_contact", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("RegistrantContact"), + }, { Name: "registrant_privacy", Type: schema.TypeBool, @@ -120,6 +120,11 @@ func Domains() *schema.Table { Type: schema.TypeStringArray, Resolver: schema.PathResolver("StatusList"), }, + { + Name: "tech_contact", + Type: schema.TypeJSON, + Resolver: schema.PathResolver("TechContact"), + }, { Name: "tech_privacy", Type: schema.TypeBool,