diff --git a/azurerm/provider.go b/azurerm/provider.go index 465005f9f669..fa75a486eac0 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -70,20 +70,31 @@ 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(), @@ -91,31 +102,31 @@ func Provider() terraform.ResourceProvider { "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(), @@ -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(), diff --git a/azurerm/resource_arm_dns_a_record_test.go b/azurerm/resource_arm_dns_a_record_test.go index 3e158a448f1f..cccc8b3900fe 100644 --- a/azurerm/resource_arm_dns_a_record_test.go +++ b/azurerm/resource_arm_dns_a_record_test.go @@ -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) @@ -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) @@ -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 { @@ -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 { diff --git a/azurerm/resource_arm_dns_aaaa_record_test.go b/azurerm/resource_arm_dns_aaaa_record_test.go index 4c832225e306..c2da52769ffd 100644 --- a/azurerm/resource_arm_dns_aaaa_record_test.go +++ b/azurerm/resource_arm_dns_aaaa_record_test.go @@ -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) @@ -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) @@ -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 { @@ -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 { diff --git a/azurerm/resource_arm_dns_cname_record_test.go b/azurerm/resource_arm_dns_cname_record_test.go index 59e4fb65c54b..61fc2c5e276d 100644 --- a/azurerm/resource_arm_dns_cname_record_test.go +++ b/azurerm/resource_arm_dns_cname_record_test.go @@ -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) @@ -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) @@ -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) @@ -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 { @@ -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 { diff --git a/azurerm/resource_arm_dns_mx_record_test.go b/azurerm/resource_arm_dns_mx_record_test.go index 8a6c614a5ca7..177bf97bda55 100644 --- a/azurerm/resource_arm_dns_mx_record_test.go +++ b/azurerm/resource_arm_dns_mx_record_test.go @@ -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" @@ -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" @@ -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" @@ -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" diff --git a/azurerm/resource_arm_dns_ns_record_test.go b/azurerm/resource_arm_dns_ns_record_test.go index 8982795ed48c..3a23b43b9267 100644 --- a/azurerm/resource_arm_dns_ns_record_test.go +++ b/azurerm/resource_arm_dns_ns_record_test.go @@ -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" @@ -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" @@ -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" @@ -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" } diff --git a/azurerm/resource_arm_dns_ptr_record_test.go b/azurerm/resource_arm_dns_ptr_record_test.go index 17eb7fafa7be..8e3b78d5acee 100644 --- a/azurerm/resource_arm_dns_ptr_record_test.go +++ b/azurerm/resource_arm_dns_ptr_record_test.go @@ -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) @@ -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) @@ -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 { @@ -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 { diff --git a/azurerm/resource_arm_dns_srv_record_test.go b/azurerm/resource_arm_dns_srv_record_test.go index 42aed5dd2d3e..2139cc0eea25 100644 --- a/azurerm/resource_arm_dns_srv_record_test.go +++ b/azurerm/resource_arm_dns_srv_record_test.go @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/azurerm/resource_arm_dns_txt_record_test.go b/azurerm/resource_arm_dns_txt_record_test.go index 7d8efad3dead..29739515332f 100644 --- a/azurerm/resource_arm_dns_txt_record_test.go +++ b/azurerm/resource_arm_dns_txt_record_test.go @@ -162,7 +162,7 @@ resource "azurerm_dns_txt_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 { value = "Quick brown fox" @@ -191,7 +191,7 @@ resource "azurerm_dns_txt_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 { value = "Quick brown fox" @@ -224,7 +224,7 @@ resource "azurerm_dns_txt_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 { value = "Quick brown fox" @@ -258,7 +258,7 @@ resource "azurerm_dns_txt_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 { value = "Quick brown fox" } diff --git a/azurerm/resource_arm_dns_zone.go b/azurerm/resource_arm_dns_zone.go index 3ccccd2aad3e..0fd236bda1fa 100644 --- a/azurerm/resource_arm_dns_zone.go +++ b/azurerm/resource_arm_dns_zone.go @@ -34,13 +34,11 @@ func resourceArmDnsZone() *schema.Resource { "number_of_record_sets": { Type: schema.TypeString, - Optional: true, Computed: true, }, "max_number_of_record_sets": { Type: schema.TypeString, - Optional: true, Computed: true, }, diff --git a/vendor/github.com/jen20/riviera/dns/api.go b/vendor/github.com/jen20/riviera/dns/api.go deleted file mode 100644 index de3a32429d7c..000000000000 --- a/vendor/github.com/jen20/riviera/dns/api.go +++ /dev/null @@ -1,18 +0,0 @@ -package dns - -import "fmt" - -const apiVersion = "2015-05-04-preview" -const apiProvider = "Microsoft.Network" - -func dnsZoneDefaultURLPathFunc(resourceGroupName, dnsZoneName string) func() string { - return func() string { - return fmt.Sprintf("resourceGroups/%s/providers/%s/dnsZones/%s", resourceGroupName, apiProvider, dnsZoneName) - } -} - -func dnsRecordSetDefaultURLPathFunc(resourceGroupName, dnsZoneName, recordSetType, recordSetName string) func() string { - return func() string { - return fmt.Sprintf("resourceGroups/%s/providers/%s/dnsZones/%s/%s/%s", resourceGroupName, apiProvider, dnsZoneName, recordSetType, recordSetName) - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_a_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_a_recordset.go deleted file mode 100644 index 154b61fd91d8..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_a_recordset.go +++ /dev/null @@ -1,37 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type ARecord struct { - IPv4Address string `json:"ipv4Address" mapstructure:"ipv4Address"` -} - -type CreateARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - ARecords []ARecord `mapstructure:"ARecords"` -} - -type CreateARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - ARecords []ARecord `json:"ARecords"` -} - -func (command CreateARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "A", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateARecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_aaaa_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_aaaa_recordset.go deleted file mode 100644 index 78e5bdec5d89..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_aaaa_recordset.go +++ /dev/null @@ -1,37 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type AAAARecord struct { - IPv6Address string `json:"ipv6Address" mapstructure:"ipv6Address"` -} - -type CreateAAAARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - AAAARecords []AAAARecord `mapstructure:"AAAARecords"` -} - -type CreateAAAARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - AAAARecords []AAAARecord `json:"AAAARecords"` -} - -func (command CreateAAAARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "AAAA", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateAAAARecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_cname_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_cname_recordset.go deleted file mode 100644 index ee7963500674..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_cname_recordset.go +++ /dev/null @@ -1,37 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type CNAMERecord struct { - CNAME string `json:"cname" mapstructure:"cname"` -} - -type CreateCNAMERecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - CNAMERecord CNAMERecord `mapstructure:"CNAMERecord"` -} - -type CreateCNAMERecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - CNAMERecord CNAMERecord `json:"CNAMERecord"` -} - -func (command CreateCNAMERecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "CNAME", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateCNAMERecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_mx_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_mx_recordset.go deleted file mode 100644 index b28a68bae4d4..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_mx_recordset.go +++ /dev/null @@ -1,38 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type MXRecord struct { - Preference string `json:"preference" mapstructure:"preference"` //*Why* is this a string in the API?! - Exchange string `json:"exchange" mapstructure:"exchange"` -} - -type CreateMXRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - MXRecords []MXRecord `mapstructure:"MXRecords"` -} - -type CreateMXRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - MXRecords []MXRecord `json:"MXRecords"` -} - -func (command CreateMXRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "MX", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateMXRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_ns_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_ns_recordset.go deleted file mode 100644 index e2471460e6a6..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_ns_recordset.go +++ /dev/null @@ -1,37 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type NSRecord struct { - NSDName string `json:"nsdname" mapstructure:"nsdname"` -} - -type CreateNSRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - NSRecords []NSRecord `mapstructure:"NSRecords"` -} - -type CreateNSRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - NSRecords []NSRecord `json:"NSRecords"` -} - -func (command CreateNSRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "NS", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateNSRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_srv_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_srv_recordset.go deleted file mode 100644 index b1ba2d89b85e..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_srv_recordset.go +++ /dev/null @@ -1,40 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type SRVRecord struct { - Priority int `json:"priority" mapstructure:"priority"` - Weight int `json:"weight" mapstructure:"weight"` - Port int `json:"port" mapstructure:"port"` - Target string `json:"target" mapstructure:"target"` -} - -type CreateSRVRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - SRVRecords []SRVRecord `mapstructure:"SRVRecords"` -} - -type CreateSRVRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - SRVRecords []SRVRecord `json:"SRVRecords"` -} - -func (command CreateSRVRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "SRV", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateSRVRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_txt_recordset.go b/vendor/github.com/jen20/riviera/dns/create_dns_txt_recordset.go deleted file mode 100644 index efe9429e9906..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_txt_recordset.go +++ /dev/null @@ -1,37 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type TXTRecord struct { - Value string `json:"value" mapstructure:"value"` -} - -type CreateTXTRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - TXTRecords []TXTRecord `mapstructure:"TXTRecords"` -} - -type CreateTXTRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - TXTRecords []TXTRecord `json:"TXTRecords"` -} - -func (command CreateTXTRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "TXT", command.Name), - ResponseTypeFunc: func() interface{} { - return &CreateTXTRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/create_dns_zone.go b/vendor/github.com/jen20/riviera/dns/create_dns_zone.go deleted file mode 100644 index 900424dc44b8..000000000000 --- a/vendor/github.com/jen20/riviera/dns/create_dns_zone.go +++ /dev/null @@ -1,21 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type CreateDNSZone struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` -} - -func (command CreateDNSZone) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PUT", - URLPathFunc: dnsZoneDefaultURLPathFunc(command.ResourceGroupName, command.Name), - ResponseTypeFunc: func() interface{} { - return nil - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/delete_dns_recordset.go b/vendor/github.com/jen20/riviera/dns/delete_dns_recordset.go deleted file mode 100644 index fee85bad3184..000000000000 --- a/vendor/github.com/jen20/riviera/dns/delete_dns_recordset.go +++ /dev/null @@ -1,21 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type DeleteRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - RecordSetType string `json:"-"` -} - -func (command DeleteRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "DELETE", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, command.RecordSetType, command.Name), - ResponseTypeFunc: func() interface{} { - return nil - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/delete_dns_zone.go b/vendor/github.com/jen20/riviera/dns/delete_dns_zone.go deleted file mode 100644 index 52521aebd2be..000000000000 --- a/vendor/github.com/jen20/riviera/dns/delete_dns_zone.go +++ /dev/null @@ -1,19 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type DeleteDNSZone struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` -} - -func (command DeleteDNSZone) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "DELETE", - URLPathFunc: dnsZoneDefaultURLPathFunc(command.ResourceGroupName, command.Name), - ResponseTypeFunc: func() interface{} { - return nil - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_a_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_a_recordset.go deleted file mode 100644 index e219b9fca005..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_a_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - ARecords []ARecord `mapstructure:"ARecords"` -} - -type GetARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "A", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetARecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_aaaa_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_aaaa_recordset.go deleted file mode 100644 index 8846b500c978..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_aaaa_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetAAAARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - AAAARecords []AAAARecord `mapstructure:"AAAARecords"` -} - -type GetAAAARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetAAAARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "AAAA", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetAAAARecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go deleted file mode 100644 index 959bcc85a78c..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetCNAMERecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - CNAMERecord CNAMERecord `mapstructure:"CNAMERecord"` -} - -type GetCNAMERecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetCNAMERecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "CNAME", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetCNAMERecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_mx_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_mx_recordset.go deleted file mode 100644 index aaed7f4223a5..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_mx_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetMXRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - MXRecords []MXRecord `mapstructure:"MXRecords"` -} - -type GetMXRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetMXRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "MX", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetMXRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_ns_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_ns_recordset.go deleted file mode 100644 index 087f2acc6ebc..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_ns_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetNSRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - NSRecords []NSRecord `mapstructure:"NSRecords"` -} - -type GetNSRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetNSRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "NS", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetNSRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_soa_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_soa_recordset.go deleted file mode 100644 index 0d8a71f4d75a..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_soa_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetSOARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - SOARecord SOARecord `mapstructure:"SOARecord"` -} - -type GetSOARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetSOARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "SOA", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetSOARecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_srv_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_srv_recordset.go deleted file mode 100644 index 2a62033f675b..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_srv_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetSRVRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - SRVRecords []SRVRecord `mapstructure:"SRVRecords"` -} - -type GetSRVRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetSRVRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "SRV", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetSRVRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_txt_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_txt_recordset.go deleted file mode 100644 index 7e707a3ebdcf..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_txt_recordset.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetTXTRecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - TXTRecords []TXTRecord `mapstructure:"TXTRecords"` -} - -type GetTXTRecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` -} - -func (command GetTXTRecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "TXT", command.Name), - ResponseTypeFunc: func() interface{} { - return &GetTXTRecordSetResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_zone.go b/vendor/github.com/jen20/riviera/dns/get_dns_zone.go deleted file mode 100644 index a588f6587dd1..000000000000 --- a/vendor/github.com/jen20/riviera/dns/get_dns_zone.go +++ /dev/null @@ -1,29 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type GetDNSZoneResponse struct { - ID *string `mapstructure:"id"` - Name *string `mapstructure:"name"` - Location *string `mapstructure:"location"` - Tags *map[string]*string `mapstructure:"tags"` - NumberOfRecordSets *string `mapstructure:"numberOfRecordSets"` - MaxNumberOfRecordSets *string `mapstructure:"maxNumberOfRecordSets"` - NameServers []*string `mapstructure:"nameServers"` -} - -type GetDNSZone struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` -} - -func (s GetDNSZone) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "GET", - URLPathFunc: dnsZoneDefaultURLPathFunc(s.ResourceGroupName, s.Name), - ResponseTypeFunc: func() interface{} { - return &GetDNSZoneResponse{} - }, - } -} diff --git a/vendor/github.com/jen20/riviera/dns/update_dns_soa_recordset.go b/vendor/github.com/jen20/riviera/dns/update_dns_soa_recordset.go deleted file mode 100644 index d4518c2499b5..000000000000 --- a/vendor/github.com/jen20/riviera/dns/update_dns_soa_recordset.go +++ /dev/null @@ -1,42 +0,0 @@ -package dns - -import "github.com/jen20/riviera/azure" - -type SOARecord struct { - Email string `json:"email" mapstructure:"email"` - ExpireTime int `json:"expireTime" mapstructure:"expireTime"` - Host string `json:"host" mapstructure:"host"` - MinimumTTL int `json:"minimumTTL" mapstructure:"minimumTTL"` - RefreshTime int `json:"refreshTime" mapstructure:"refreshTime"` - RetryTime int `json:"retryTime" mapstructure:"retryTime"` -} - -type UpdateSOARecordSetResponse struct { - ID string `mapstructure:"id"` - Name string `mapstructure:"name"` - Location string `mapstructure:"location"` - Tags map[string]*string `mapstructure:"tags"` - TTL *int `mapstructure:"TTL"` - SOARecord SOARecord `mapstructure:"SOARecord"` -} - -type UpdateSOARecordSet struct { - Name string `json:"-"` - ResourceGroupName string `json:"-"` - ZoneName string `json:"-"` - Location string `json:"-" riviera:"location"` - Tags map[string]*string `json:"-" riviera:"tags"` - TTL int `json:"TTL"` - SOARecord SOARecord `json:"SOARecord"` -} - -func (command UpdateSOARecordSet) APIInfo() azure.APIInfo { - return azure.APIInfo{ - APIVersion: apiVersion, - Method: "PATCH", - URLPathFunc: dnsRecordSetDefaultURLPathFunc(command.ResourceGroupName, command.ZoneName, "SOA", command.Name), - ResponseTypeFunc: func() interface{} { - return &UpdateSOARecordSetResponse{} - }, - } -} diff --git a/vendor/vendor.json b/vendor/vendor.json index 11889652ce64..7c4861138843 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -752,12 +752,6 @@ "revision": "7ee711f4d8cc27b811bde3907614ecd86e98c9bc", "revisionTime": "2017-01-04T10:03:54Z" }, - { - "checksumSHA1": "ncdT+1PFEF5ly0niXuQc9/pKzT0=", - "path": "github.com/jen20/riviera/dns", - "revision": "7ee711f4d8cc27b811bde3907614ecd86e98c9bc", - "revisionTime": "2017-01-04T10:03:54Z" - }, { "checksumSHA1": "zVXx6ha3bt0N4ukRbRHXjSl91S4=", "path": "github.com/jen20/riviera/search", diff --git a/website/docs/r/dns_a_record.html.markdown b/website/docs/r/dns_a_record.html.markdown index f1743607d744..180a08eb4ef0 100644 --- a/website/docs/r/dns_a_record.html.markdown +++ b/website/docs/r/dns_a_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_a_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 records = ["10.0.180.17"] } ``` diff --git a/website/docs/r/dns_aaaa_record.html.markdown b/website/docs/r/dns_aaaa_record.html.markdown index 773bc0ef765d..7aa830629b7c 100644 --- a/website/docs/r/dns_aaaa_record.html.markdown +++ b/website/docs/r/dns_aaaa_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_aaaa_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 records = ["2607:f8b0:4009:1803::1005"] } ``` diff --git a/website/docs/r/dns_cname_record.html.markdown b/website/docs/r/dns_cname_record.html.markdown index 5e00c2e6b840..2cd43ac65b54 100644 --- a/website/docs/r/dns_cname_record.html.markdown +++ b/website/docs/r/dns_cname_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_cname_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 record = "contoso.com" } ``` diff --git a/website/docs/r/dns_mx_record.html.markdown b/website/docs/r/dns_mx_record.html.markdown index af183e6602ff..4ba192e9036e 100644 --- a/website/docs/r/dns_mx_record.html.markdown +++ b/website/docs/r/dns_mx_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_mx_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 record { preference = 10 diff --git a/website/docs/r/dns_ns_record.html.markdown b/website/docs/r/dns_ns_record.html.markdown index 057d2533c9be..5bb424c3087b 100644 --- a/website/docs/r/dns_ns_record.html.markdown +++ b/website/docs/r/dns_ns_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_ns_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 record { nsdname = "ns1.contoso.com" diff --git a/website/docs/r/dns_ptr_record.html.markdown b/website/docs/r/dns_ptr_record.html.markdown index 4f355707f2ea..1cb90fcbb476 100644 --- a/website/docs/r/dns_ptr_record.html.markdown +++ b/website/docs/r/dns_ptr_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_ptr_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 records = ["yourdomain.com"] } ``` diff --git a/website/docs/r/dns_srv_record.html.markdown b/website/docs/r/dns_srv_record.html.markdown index d8534f17439d..0dad5b606ee5 100644 --- a/website/docs/r/dns_srv_record.html.markdown +++ b/website/docs/r/dns_srv_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_srv_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 record { priority = 1 diff --git a/website/docs/r/dns_txt_record.html.markdown b/website/docs/r/dns_txt_record.html.markdown index b96df41b9407..541344605411 100644 --- a/website/docs/r/dns_txt_record.html.markdown +++ b/website/docs/r/dns_txt_record.html.markdown @@ -27,7 +27,7 @@ resource "azurerm_dns_txt_record" "test" { name = "test" zone_name = "${azurerm_dns_zone.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" - ttl = "300" + ttl = 300 record { value = "google-site-authenticator"