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

DNS: Riviera Cleanup #198

Merged
merged 5 commits into from
Jul 26, 2017
Merged

DNS: Riviera Cleanup #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89e0f17
Moving DNS into the SDK group
tombuildsstuff Jul 26, 2017
f4af984
Removing the Riviera DNS SDK
tombuildsstuff Jul 26, 2017
9879591
Linting
tombuildsstuff Jul 26, 2017
d253502
Updating Timeout to reflect being an Int in the tests + docs
tombuildsstuff Jul 26, 2017
ec35c05
These computed fields aren't actually optional
tombuildsstuff Jul 26, 2017
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
87 changes: 44 additions & 43 deletions azurerm/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,52 +70,63 @@ func Provider() terraform.ResourceProvider {

ResourcesMap: map[string]*schema.Resource{
// These resources use the Azure ARM SDK
"azurerm_availability_set": resourceArmAvailabilitySet(),
"azurerm_cdn_endpoint": resourceArmCdnEndpoint(),
"azurerm_cdn_profile": resourceArmCdnProfile(),
"azurerm_container_registry": resourceArmContainerRegistry(),
"azurerm_container_service": resourceArmContainerService(),
"azurerm_cosmosdb_account": resourceArmCosmosDBAccount(),
"azurerm_dns_ptr_record": resourceArmDnsPtrRecord(),
"azurerm_application_insights": resourceArmApplicationInsights(),
"azurerm_availability_set": resourceArmAvailabilitySet(),
"azurerm_cdn_endpoint": resourceArmCdnEndpoint(),
"azurerm_cdn_profile": resourceArmCdnProfile(),
"azurerm_container_registry": resourceArmContainerRegistry(),
"azurerm_container_service": resourceArmContainerService(),
"azurerm_cosmosdb_account": resourceArmCosmosDBAccount(),

"azurerm_dns_a_record": resourceArmDnsARecord(),
"azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(),
"azurerm_dns_cname_record": resourceArmDnsCNameRecord(),
"azurerm_dns_mx_record": resourceArmDnsMxRecord(),
"azurerm_dns_ns_record": resourceArmDnsNsRecord(),
"azurerm_dns_ptr_record": resourceArmDnsPtrRecord(),
"azurerm_dns_srv_record": resourceArmDnsSrvRecord(),
"azurerm_dns_txt_record": resourceArmDnsTxtRecord(),
"azurerm_dns_zone": resourceArmDnsZone(),

"azurerm_eventhub": resourceArmEventHub(),
"azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(),
"azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(),
"azurerm_eventhub_namespace": resourceArmEventHubNamespace(),

"azurerm_express_route_circuit": resourceArmExpressRouteCircuit(),
"azurerm_express_route_circuit": resourceArmExpressRouteCircuit(),
"azurerm_image": resourceArmImage(),
"azurerm_key_vault": resourceArmKeyVault(),

"azurerm_lb": resourceArmLoadBalancer(),
"azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(),
"azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(),
"azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(),
"azurerm_lb_probe": resourceArmLoadBalancerProbe(),
"azurerm_lb_rule": resourceArmLoadBalancerRule(),
"azurerm_local_network_gateway": resourceArmLocalNetworkGateway(),

"azurerm_managed_disk": resourceArmManagedDisk(),
"azurerm_network_interface": resourceArmNetworkInterface(),
"azurerm_network_security_group": resourceArmNetworkSecurityGroup(),
"azurerm_network_security_rule": resourceArmNetworkSecurityRule(),
"azurerm_public_ip": resourceArmPublicIp(),

"azurerm_redis_cache": resourceArmRedisCache(),
"azurerm_route": resourceArmRoute(),
"azurerm_route_table": resourceArmRouteTable(),

"azurerm_servicebus_namespace": resourceArmServiceBusNamespace(),
"azurerm_servicebus_queue": resourceArmServiceBusQueue(),
"azurerm_servicebus_subscription": resourceArmServiceBusSubscription(),
"azurerm_servicebus_topic": resourceArmServiceBusTopic(),
"azurerm_sql_elasticpool": resourceArmSqlElasticPool(),
"azurerm_storage_account": resourceArmStorageAccount(),
"azurerm_storage_blob": resourceArmStorageBlob(),
"azurerm_storage_container": resourceArmStorageContainer(),
"azurerm_storage_share": resourceArmStorageShare(),
"azurerm_storage_queue": resourceArmStorageQueue(),
"azurerm_storage_table": resourceArmStorageTable(),
"azurerm_subnet": resourceArmSubnet(),

"azurerm_managed_disk": resourceArmManagedDisk(),
"azurerm_image": resourceArmImage(),

"azurerm_key_vault": resourceArmKeyVault(),
"azurerm_local_network_gateway": resourceArmLocalNetworkGateway(),
"azurerm_network_interface": resourceArmNetworkInterface(),
"azurerm_network_security_group": resourceArmNetworkSecurityGroup(),
"azurerm_network_security_rule": resourceArmNetworkSecurityRule(),
"azurerm_public_ip": resourceArmPublicIp(),
"azurerm_redis_cache": resourceArmRedisCache(),
"azurerm_route": resourceArmRoute(),
"azurerm_route_table": resourceArmRouteTable(),
"azurerm_servicebus_namespace": resourceArmServiceBusNamespace(),
"azurerm_servicebus_queue": resourceArmServiceBusQueue(),
"azurerm_servicebus_subscription": resourceArmServiceBusSubscription(),
"azurerm_servicebus_topic": resourceArmServiceBusTopic(),
"azurerm_sql_elasticpool": resourceArmSqlElasticPool(),
"azurerm_storage_account": resourceArmStorageAccount(),
"azurerm_storage_blob": resourceArmStorageBlob(),
"azurerm_storage_container": resourceArmStorageContainer(),
"azurerm_storage_share": resourceArmStorageShare(),
"azurerm_storage_queue": resourceArmStorageQueue(),
"azurerm_storage_table": resourceArmStorageTable(),
"azurerm_subnet": resourceArmSubnet(),
"azurerm_template_deployment": resourceArmTemplateDeployment(),
"azurerm_traffic_manager_endpoint": resourceArmTrafficManagerEndpoint(),
"azurerm_traffic_manager_profile": resourceArmTrafficManagerProfile(),
Expand All @@ -125,17 +136,7 @@ func Provider() terraform.ResourceProvider {
"azurerm_virtual_network": resourceArmVirtualNetwork(),
"azurerm_virtual_network_peering": resourceArmVirtualNetworkPeering(),

"azurerm_application_insights": resourceArmApplicationInsights(),

// These resources use the Riviera SDK
"azurerm_dns_a_record": resourceArmDnsARecord(),
"azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(),
"azurerm_dns_cname_record": resourceArmDnsCNameRecord(),
"azurerm_dns_mx_record": resourceArmDnsMxRecord(),
"azurerm_dns_ns_record": resourceArmDnsNsRecord(),
"azurerm_dns_srv_record": resourceArmDnsSrvRecord(),
"azurerm_dns_txt_record": resourceArmDnsTxtRecord(),
"azurerm_dns_zone": resourceArmDnsZone(),
"azurerm_resource_group": resourceArmResourceGroup(),
"azurerm_search_service": resourceArmSearchService(),
"azurerm_sql_database": resourceArmSqlDatabase(),
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_a_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "azurerm_dns_a_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["1.2.3.4", "1.2.4.5"]
}
`, rInt, rInt, rInt)
Expand All @@ -184,7 +184,7 @@ resource "azurerm_dns_a_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["1.2.3.4", "1.2.4.5", "1.2.3.7"]
}
`, rInt, rInt, rInt)
Expand All @@ -206,7 +206,7 @@ resource "azurerm_dns_a_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["1.2.3.4", "1.2.4.5"]

tags {
Expand All @@ -233,7 +233,7 @@ resource "azurerm_dns_a_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["1.2.3.4", "1.2.4.5"]

tags {
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_aaaa_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "azurerm_dns_aaaa_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["2607:f8b0:4009:1803::1005", "2607:f8b0:4009:1803::1006"]
}
`, rInt, rInt, rInt)
Expand All @@ -184,7 +184,7 @@ resource "azurerm_dns_aaaa_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["2607:f8b0:4009:1803::1005", "2607:f8b0:4009:1803::1006", "::1"]
}
`, rInt, rInt, rInt)
Expand All @@ -206,7 +206,7 @@ resource "azurerm_dns_aaaa_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["2607:f8b0:4009:1803::1005", "2607:f8b0:4009:1803::1006"]

tags {
Expand All @@ -233,7 +233,7 @@ resource "azurerm_dns_aaaa_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["2607:f8b0:4009:1803::1005", "2607:f8b0:4009:1803::1006"]

tags {
Expand Down
10 changes: 5 additions & 5 deletions azurerm/resource_arm_dns_cname_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ resource "azurerm_dns_cname_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record = "contoso.com"
}
`, rInt, rInt, rInt)
Expand All @@ -203,7 +203,7 @@ resource "azurerm_dns_cname_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record = "test.contoso.com"
}
`, rInt, rInt, rInt)
Expand All @@ -225,7 +225,7 @@ resource "azurerm_dns_cname_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record = "contoso.co.uk"
}
`, rInt, rInt, rInt)
Expand All @@ -247,7 +247,7 @@ resource "azurerm_dns_cname_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record = "contoso.com"

tags {
Expand All @@ -274,7 +274,7 @@ resource "azurerm_dns_cname_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record = "contoso.com"

tags {
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_mx_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "azurerm_dns_mx_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
preference = "10"
Expand Down Expand Up @@ -193,7 +193,7 @@ resource "azurerm_dns_mx_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
preference = "10"
Expand Down Expand Up @@ -229,7 +229,7 @@ resource "azurerm_dns_mx_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
preference = "10"
Expand Down Expand Up @@ -265,7 +265,7 @@ resource "azurerm_dns_mx_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
preference = "10"
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_ns_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ resource "azurerm_dns_ns_record" "test" {
name = "mynsrecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
nsdname = "ns1.contoso.com"
Expand Down Expand Up @@ -190,7 +190,7 @@ resource "azurerm_dns_ns_record" "test" {
name = "mynsrecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
nsdname = "ns1.contoso.com"
Expand Down Expand Up @@ -223,7 +223,7 @@ resource "azurerm_dns_ns_record" "test" {
name = "mynsrecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
nsdname = "ns1.contoso.com"
Expand Down Expand Up @@ -257,7 +257,7 @@ resource "azurerm_dns_ns_record" "test" {
name = "mynsrecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
record {
nsdname = "ns1.contoso.com"
}
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_ptr_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "azurerm_dns_ptr_record" "test" {
name = "testptrrecord%[1]d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["hashicorp.com", "microsoft.com"]
}
`, rInt)
Expand All @@ -184,7 +184,7 @@ resource "azurerm_dns_ptr_record" "test" {
name = "testptrrecord%[1]d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["hashicorp.com", "microsoft.com", "reddit.com"]
}
`, rInt)
Expand All @@ -206,7 +206,7 @@ resource "azurerm_dns_ptr_record" "test" {
name = "testptrrecord%[1]d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["hashicorp.com", "microsoft.com"]

tags {
Expand All @@ -233,7 +233,7 @@ resource "azurerm_dns_ptr_record" "test" {
name = "testptrrecord%[1]d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300
records = ["hashicorp.com", "microsoft.com"]

tags {
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_dns_srv_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ resource "azurerm_dns_srv_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
priority = 1
Expand Down Expand Up @@ -195,7 +195,7 @@ resource "azurerm_dns_srv_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
priority = 1
Expand Down Expand Up @@ -237,7 +237,7 @@ resource "azurerm_dns_srv_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
priority = 1
Expand Down Expand Up @@ -277,7 +277,7 @@ resource "azurerm_dns_srv_record" "test" {
name = "myarecord%d"
resource_group_name = "${azurerm_resource_group.test.name}"
zone_name = "${azurerm_dns_zone.test.name}"
ttl = "300"
ttl = 300

record {
priority = 1
Expand Down
Loading