From 3bb75c3221d174aad1ad88629fe6e4377f8c7cf8 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 14 Sep 2018 11:02:56 -0700 Subject: [PATCH 1/3] update azurerm packages to 1.15.0 --- .../validate/virtual_network_rule_name.go | 43 +++++++++++++++++++ vendor/vendor.json | 18 ++++---- 2 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate/virtual_network_rule_name.go diff --git a/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate/virtual_network_rule_name.go b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate/virtual_network_rule_name.go new file mode 100644 index 000000000..16dcdc33c --- /dev/null +++ b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate/virtual_network_rule_name.go @@ -0,0 +1,43 @@ +package validate + +import ( + "fmt" + "regexp" +) + +func VirtualNetworkRuleName(v interface{}, k string) (ws []string, errors []error) { + value := v.(string) + + // Cannot be empty + if len(value) == 0 { + errors = append(errors, fmt.Errorf( + "%q cannot be an empty string: %q", k, value)) + } + + // Cannot be more than 128 characters + if len(value) > 128 { + errors = append(errors, fmt.Errorf( + "%q cannot be longer than 128 characters: %q", k, value)) + } + + // Must only contain alphanumeric characters or hyphens + if !regexp.MustCompile(`^[A-Za-z0-9-]*$`).MatchString(value) { + errors = append(errors, fmt.Errorf( + "%q can only contain alphanumeric characters and hyphens: %q", + k, value)) + } + + // Cannot end in a hyphen + if regexp.MustCompile(`-$`).MatchString(value) { + errors = append(errors, fmt.Errorf( + "%q cannot end with a hyphen: %q", k, value)) + } + + // Cannot start with a number or hyphen + if regexp.MustCompile(`^[0-9-]`).MatchString(value) { + errors = append(errors, fmt.Errorf( + "%q cannot start with a number or hyphen: %q", k, value)) + } + + return +} diff --git a/vendor/vendor.json b/vendor/vendor.json index f7218c5dd..a6c96343f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1001,18 +1001,18 @@ { "checksumSHA1": "iWqEq0BpOtDozH23rMiDJf7ODD8=", "path": "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress", - "revision": "e3dd02da41f1cf1cab57ac9052a8c2641c5faef6", - "revisionTime": "2018-08-15T20:12:32Z", - "version": "=v1.13.0", - "versionExact": "v1.13.0" + "revision": "4f7a9e8cef2cd90866192756d907071a102f1e00", + "revisionTime": "2018-09-14T07:45:51Z", + "version": "=v1.15.0", + "versionExact": "v1.15.0" }, { - "checksumSHA1": "rIJDHa2/RjvrkAwF77DokZIEnsE=", + "checksumSHA1": "w4bPNA3P3mCX0bAFdfdPcNhFOUk=", "path": "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate", - "revision": "e3dd02da41f1cf1cab57ac9052a8c2641c5faef6", - "revisionTime": "2018-08-15T20:12:32Z", - "version": "=v1.13.0", - "versionExact": "v1.13.0" + "revision": "4f7a9e8cef2cd90866192756d907071a102f1e00", + "revisionTime": "2018-09-14T07:45:51Z", + "version": "=v1.15.0", + "versionExact": "v1.15.0" }, { "checksumSHA1": "qgMa75aMGbkFY0jIqqqgVnCUoNA=", From 8d045c0cc6def4210b2c7fd1168c6c75238010b3 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 14 Sep 2018 11:05:55 -0700 Subject: [PATCH 2/3] vended in azurerm utils package --- azurestack/config.go | 2 +- azurestack/data_source_network_interface.go | 2 +- .../data_source_network_security_group.go | 2 +- azurestack/data_source_public_ip.go | 2 +- azurestack/data_source_route_table.go | 2 +- azurestack/data_source_storage_account.go | 2 +- azurestack/data_source_subnet.go | 2 +- azurestack/data_source_virtual_network.go | 2 +- .../data_source_virtual_network_gateway.go | 2 +- azurestack/resource_arm_availability_set.go | 2 +- .../resource_arm_availability_set_test.go | 2 +- azurestack/resource_arm_dns_a_record.go | 2 +- azurestack/resource_arm_dns_zone.go | 2 +- azurestack/resource_arm_loadbalancer.go | 2 +- ...e_arm_loadbalancer_backend_address_pool.go | 2 +- .../resource_arm_loadbalancer_nat_pool.go | 2 +- .../resource_arm_loadbalancer_nat_rule.go | 2 +- azurestack/resource_arm_loadbalancer_probe.go | 2 +- azurestack/resource_arm_loadbalancer_rule.go | 2 +- .../resource_arm_local_network_gateway.go | 2 +- ...resource_arm_local_network_gateway_test.go | 2 +- azurestack/resource_arm_network_interface.go | 2 +- .../resource_arm_network_interface_test.go | 2 +- .../resource_arm_network_security_group.go | 2 +- ...esource_arm_network_security_group_test.go | 2 +- .../resource_arm_network_security_rule.go | 2 +- ...resource_arm_network_security_rule_test.go | 2 +- azurestack/resource_arm_public_ip.go | 2 +- azurestack/resource_arm_resource_group.go | 2 +- .../resource_arm_resource_group_test.go | 2 +- azurestack/resource_arm_route.go | 2 +- azurestack/resource_arm_route_table.go | 2 +- azurestack/resource_arm_route_table_test.go | 2 +- azurestack/resource_arm_route_test.go | 2 +- azurestack/resource_arm_storage_account.go | 2 +- azurestack/resource_arm_subnet.go | 2 +- azurestack/resource_arm_subnet_test.go | 2 +- .../resource_arm_template_deployment.go | 2 +- azurestack/resource_arm_virtual_machine.go | 2 +- .../resource_arm_virtual_machine_extension.go | 2 +- .../resource_arm_virtual_machine_scale_set.go | 2 +- azurestack/resource_arm_virtual_network.go | 2 +- .../resource_arm_virtual_network_gateway.go | 2 +- ..._arm_virtual_network_gateway_connection.go | 2 +- ...virtual_network_gateway_connection_test.go | 2 +- ...source_arm_virtual_network_gateway_test.go | 2 +- azurestack/utils/response_test.go | 39 ------------------- .../azurerm}/utils/response.go | 0 .../azurerm}/utils/utils.go | 4 ++ vendor/vendor.json | 8 ++++ 50 files changed, 58 insertions(+), 85 deletions(-) delete mode 100644 azurestack/utils/response_test.go rename {azurestack => vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm}/utils/response.go (100%) rename {azurestack => vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm}/utils/utils.go (79%) diff --git a/azurestack/config.go b/azurestack/config.go index 31ab1d63f..ae724b3f3 100644 --- a/azurestack/config.go +++ b/azurestack/config.go @@ -21,8 +21,8 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/authentication" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) // ArmClient contains the handles to all the specific Azure Resource Manager diff --git a/azurestack/data_source_network_interface.go b/azurestack/data_source_network_interface.go index edae20ee6..b93aeb78a 100644 --- a/azurestack/data_source_network_interface.go +++ b/azurestack/data_source_network_interface.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmNetworkInterface() *schema.Resource { diff --git a/azurestack/data_source_network_security_group.go b/azurestack/data_source_network_security_group.go index e35787471..7a098ec50 100644 --- a/azurestack/data_source_network_security_group.go +++ b/azurestack/data_source_network_security_group.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmNetworkSecurityGroup() *schema.Resource { diff --git a/azurestack/data_source_public_ip.go b/azurestack/data_source_public_ip.go index eb0da1866..06358611a 100644 --- a/azurestack/data_source_public_ip.go +++ b/azurestack/data_source_public_ip.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmPublicIP() *schema.Resource { diff --git a/azurestack/data_source_route_table.go b/azurestack/data_source_route_table.go index 600b46a6d..73f0e0912 100644 --- a/azurestack/data_source_route_table.go +++ b/azurestack/data_source_route_table.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmRouteTable() *schema.Resource { diff --git a/azurestack/data_source_storage_account.go b/azurestack/data_source_storage_account.go index 96b28e983..44b774594 100644 --- a/azurestack/data_source_storage_account.go +++ b/azurestack/data_source_storage_account.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmStorageAccount() *schema.Resource { diff --git a/azurestack/data_source_subnet.go b/azurestack/data_source_subnet.go index 14a05d95f..f09829b8e 100644 --- a/azurestack/data_source_subnet.go +++ b/azurestack/data_source_subnet.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmSubnet() *schema.Resource { diff --git a/azurestack/data_source_virtual_network.go b/azurestack/data_source_virtual_network.go index ca24b72e6..593b91e2d 100644 --- a/azurestack/data_source_virtual_network.go +++ b/azurestack/data_source_virtual_network.go @@ -5,7 +5,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmVirtualNetwork() *schema.Resource { diff --git a/azurestack/data_source_virtual_network_gateway.go b/azurestack/data_source_virtual_network_gateway.go index 442c1f438..d185971ae 100644 --- a/azurestack/data_source_virtual_network_gateway.go +++ b/azurestack/data_source_virtual_network_gateway.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func dataSourceArmVirtualNetworkGateway() *schema.Resource { diff --git a/azurestack/resource_arm_availability_set.go b/azurestack/resource_arm_availability_set.go index e02a898d9..0440fe6f5 100644 --- a/azurestack/resource_arm_availability_set.go +++ b/azurestack/resource_arm_availability_set.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/compute/mgmt/compute" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmAvailabilitySet() *schema.Resource { diff --git a/azurestack/resource_arm_availability_set_test.go b/azurestack/resource_arm_availability_set_test.go index ffc62ae13..a86023189 100644 --- a/azurestack/resource_arm_availability_set_test.go +++ b/azurestack/resource_arm_availability_set_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func TestAccAzureStackAvailabilitySet_basic(t *testing.T) { diff --git a/azurestack/resource_arm_dns_a_record.go b/azurestack/resource_arm_dns_a_record.go index a82db5158..5d113a4c2 100644 --- a/azurestack/resource_arm_dns_a_record.go +++ b/azurestack/resource_arm_dns_a_record.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmDnsARecord() *schema.Resource { diff --git a/azurestack/resource_arm_dns_zone.go b/azurestack/resource_arm_dns_zone.go index 093db9df9..b8d29ceef 100644 --- a/azurestack/resource_arm_dns_zone.go +++ b/azurestack/resource_arm_dns_zone.go @@ -5,8 +5,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmDnsZone() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer.go b/azurestack/resource_arm_loadbalancer.go index 11feaa032..2676409a8 100644 --- a/azurestack/resource_arm_loadbalancer.go +++ b/azurestack/resource_arm_loadbalancer.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmLoadBalancer() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer_backend_address_pool.go b/azurestack/resource_arm_loadbalancer_backend_address_pool.go index 491fdddad..b01ba6e7d 100644 --- a/azurestack/resource_arm_loadbalancer_backend_address_pool.go +++ b/azurestack/resource_arm_loadbalancer_backend_address_pool.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmLoadBalancerBackendAddressPool() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer_nat_pool.go b/azurestack/resource_arm_loadbalancer_nat_pool.go index 926977e3d..5ecf26b5a 100644 --- a/azurestack/resource_arm_loadbalancer_nat_pool.go +++ b/azurestack/resource_arm_loadbalancer_nat_pool.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmLoadBalancerNatPool() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer_nat_rule.go b/azurestack/resource_arm_loadbalancer_nat_rule.go index e0cbad514..50c70c516 100644 --- a/azurestack/resource_arm_loadbalancer_nat_rule.go +++ b/azurestack/resource_arm_loadbalancer_nat_rule.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmLoadBalancerNatRule() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer_probe.go b/azurestack/resource_arm_loadbalancer_probe.go index 2f00bae9d..c81d15c07 100644 --- a/azurestack/resource_arm_loadbalancer_probe.go +++ b/azurestack/resource_arm_loadbalancer_probe.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmLoadBalancerProbe() *schema.Resource { diff --git a/azurestack/resource_arm_loadbalancer_rule.go b/azurestack/resource_arm_loadbalancer_rule.go index 107390ee1..cbb8596dc 100644 --- a/azurestack/resource_arm_loadbalancer_rule.go +++ b/azurestack/resource_arm_loadbalancer_rule.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmLoadBalancerRule() *schema.Resource { diff --git a/azurestack/resource_arm_local_network_gateway.go b/azurestack/resource_arm_local_network_gateway.go index 288f49f9e..263223108 100644 --- a/azurestack/resource_arm_local_network_gateway.go +++ b/azurestack/resource_arm_local_network_gateway.go @@ -5,8 +5,8 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmLocalNetworkGateway() *schema.Resource { diff --git a/azurestack/resource_arm_local_network_gateway_test.go b/azurestack/resource_arm_local_network_gateway_test.go index 1bcedca0e..cbd38edf0 100644 --- a/azurestack/resource_arm_local_network_gateway_test.go +++ b/azurestack/resource_arm_local_network_gateway_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func TestAccAzureStackLocalNetworkGateway_basic(t *testing.T) { diff --git a/azurestack/resource_arm_network_interface.go b/azurestack/resource_arm_network_interface.go index f9b52bf70..f755a9b61 100644 --- a/azurestack/resource_arm_network_interface.go +++ b/azurestack/resource_arm_network_interface.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmNetworkInterface() *schema.Resource { diff --git a/azurestack/resource_arm_network_interface_test.go b/azurestack/resource_arm_network_interface_test.go index cbef56399..8b9829f03 100644 --- a/azurestack/resource_arm_network_interface_test.go +++ b/azurestack/resource_arm_network_interface_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func init() { diff --git a/azurestack/resource_arm_network_security_group.go b/azurestack/resource_arm_network_security_group.go index 0ddbcad64..a1839f24a 100644 --- a/azurestack/resource_arm_network_security_group.go +++ b/azurestack/resource_arm_network_security_group.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) var networkSecurityGroupResourceName = "azurestack_network_security_group" diff --git a/azurestack/resource_arm_network_security_group_test.go b/azurestack/resource_arm_network_security_group_test.go index e6ec35883..d7c91fe88 100644 --- a/azurestack/resource_arm_network_security_group_test.go +++ b/azurestack/resource_arm_network_security_group_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func TestAccAzureStackNetworkSecurityGroup_basic(t *testing.T) { diff --git a/azurestack/resource_arm_network_security_rule.go b/azurestack/resource_arm_network_security_rule.go index 509e63272..0a25d3180 100644 --- a/azurestack/resource_arm_network_security_rule.go +++ b/azurestack/resource_arm_network_security_rule.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmNetworkSecurityRule() *schema.Resource { diff --git a/azurestack/resource_arm_network_security_rule_test.go b/azurestack/resource_arm_network_security_rule_test.go index 6a59dbdc0..30ab90750 100644 --- a/azurestack/resource_arm_network_security_rule_test.go +++ b/azurestack/resource_arm_network_security_rule_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func TestAccAzureStackNetworkSecurityRule_basic(t *testing.T) { diff --git a/azurestack/resource_arm_public_ip.go b/azurestack/resource_arm_public_ip.go index 52b0fde14..c0e2f5717 100644 --- a/azurestack/resource_arm_public_ip.go +++ b/azurestack/resource_arm_public_ip.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmPublicIp() *schema.Resource { diff --git a/azurestack/resource_arm_resource_group.go b/azurestack/resource_arm_resource_group.go index c1e731e5e..38ff33228 100644 --- a/azurestack/resource_arm_resource_group.go +++ b/azurestack/resource_arm_resource_group.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/resources/mgmt/resources" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmResourceGroup() *schema.Resource { diff --git a/azurestack/resource_arm_resource_group_test.go b/azurestack/resource_arm_resource_group_test.go index bc218fdb9..c2b6e6b8f 100644 --- a/azurestack/resource_arm_resource_group_test.go +++ b/azurestack/resource_arm_resource_group_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func init() { diff --git a/azurestack/resource_arm_route.go b/azurestack/resource_arm_route.go index ed74fd39f..c189f9cf0 100644 --- a/azurestack/resource_arm_route.go +++ b/azurestack/resource_arm_route.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmRoute() *schema.Resource { diff --git a/azurestack/resource_arm_route_table.go b/azurestack/resource_arm_route_table.go index cbccab1a1..56fe0df72 100644 --- a/azurestack/resource_arm_route_table.go +++ b/azurestack/resource_arm_route_table.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) var routeTableResourceName = "azurestack_route_table" diff --git a/azurestack/resource_arm_route_table_test.go b/azurestack/resource_arm_route_table_test.go index 2c1c6de14..b93dce8f0 100644 --- a/azurestack/resource_arm_route_table_test.go +++ b/azurestack/resource_arm_route_table_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func TestAccAzureStackRouteTable_basic(t *testing.T) { diff --git a/azurestack/resource_arm_route_test.go b/azurestack/resource_arm_route_test.go index 7f6017950..ab55a1639 100644 --- a/azurestack/resource_arm_route_test.go +++ b/azurestack/resource_arm_route_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func TestAccAzureStackRoute_basic(t *testing.T) { diff --git a/azurestack/resource_arm_storage_account.go b/azurestack/resource_arm_storage_account.go index f567bbd9b..fd116d1a7 100644 --- a/azurestack/resource_arm_storage_account.go +++ b/azurestack/resource_arm_storage_account.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/storage/mgmt/storage" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) const blobStorageAccountDefaultAccessTier = "Hot" diff --git a/azurestack/resource_arm_subnet.go b/azurestack/resource_arm_subnet.go index ca216c983..f2876bff9 100644 --- a/azurestack/resource_arm_subnet.go +++ b/azurestack/resource_arm_subnet.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) var subnetResourceName = "azurestack_subnet" diff --git a/azurestack/resource_arm_subnet_test.go b/azurestack/resource_arm_subnet_test.go index 20d8db829..283ebe4b5 100644 --- a/azurestack/resource_arm_subnet_test.go +++ b/azurestack/resource_arm_subnet_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func TestAccAzureStackSubnet_basic(t *testing.T) { diff --git a/azurestack/resource_arm_template_deployment.go b/azurestack/resource_arm_template_deployment.go index 7d6d73132..41373c708 100644 --- a/azurestack/resource_arm_template_deployment.go +++ b/azurestack/resource_arm_template_deployment.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmTemplateDeployment() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_machine.go b/azurestack/resource_arm_virtual_machine.go index 16ce4abde..494ae9f05 100644 --- a/azurestack/resource_arm_virtual_machine.go +++ b/azurestack/resource_arm_virtual_machine.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmVirtualMachine() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_machine_extension.go b/azurestack/resource_arm_virtual_machine_extension.go index 20b115b32..7835affe7 100644 --- a/azurestack/resource_arm_virtual_machine_extension.go +++ b/azurestack/resource_arm_virtual_machine_extension.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/structure" "github.com/hashicorp/terraform/helper/validation" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func resourceArmVirtualMachineExtensions() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_machine_scale_set.go b/azurestack/resource_arm_virtual_machine_scale_set.go index eae28b489..3f3299cff 100644 --- a/azurestack/resource_arm_virtual_machine_scale_set.go +++ b/azurestack/resource_arm_virtual_machine_scale_set.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform/helper/structure" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmVirtualMachineScaleSet() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_network.go b/azurestack/resource_arm_virtual_network.go index 9c8f69020..dcf3af454 100644 --- a/azurestack/resource_arm_virtual_network.go +++ b/azurestack/resource_arm_virtual_network.go @@ -10,7 +10,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) var virtualNetworkResourceName = "azurestack_virtual_network" diff --git a/azurestack/resource_arm_virtual_network_gateway.go b/azurestack/resource_arm_virtual_network_gateway.go index 1e5d07a8d..6442fe559 100644 --- a/azurestack/resource_arm_virtual_network_gateway.go +++ b/azurestack/resource_arm_virtual_network_gateway.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmVirtualNetworkGateway() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_network_gateway_connection.go b/azurestack/resource_arm_virtual_network_gateway_connection.go index 8a13c3b5a..a4c901d8f 100644 --- a/azurestack/resource_arm_virtual_network_gateway_connection.go +++ b/azurestack/resource_arm_virtual_network_gateway_connection.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/azure" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" ) func resourceArmVirtualNetworkGatewayConnection() *schema.Resource { diff --git a/azurestack/resource_arm_virtual_network_gateway_connection_test.go b/azurestack/resource_arm_virtual_network_gateway_connection_test.go index 0e627d6ff..1f6d549a6 100644 --- a/azurestack/resource_arm_virtual_network_gateway_connection_test.go +++ b/azurestack/resource_arm_virtual_network_gateway_connection_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func TestAccAzureStackVirtualNetworkGatewayConnection_sitetosite(t *testing.T) { diff --git a/azurestack/resource_arm_virtual_network_gateway_test.go b/azurestack/resource_arm_virtual_network_gateway_test.go index 1c083f445..03d144098 100644 --- a/azurestack/resource_arm_virtual_network_gateway_test.go +++ b/azurestack/resource_arm_virtual_network_gateway_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/utils" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) func TestAccAzureStackVirtualNetworkGateway_basic(t *testing.T) { diff --git a/azurestack/utils/response_test.go b/azurestack/utils/response_test.go deleted file mode 100644 index 809189f51..000000000 --- a/azurestack/utils/response_test.go +++ /dev/null @@ -1,39 +0,0 @@ -package utils - -import ( - "net/http" - "testing" - - "github.com/Azure/go-autorest/autorest" -) - -func TestResponseNotFound_DroppedConnection(t *testing.T) { - resp := autorest.Response{} - if ResponseWasNotFound(resp) { - t.Fatalf("responseWasNotFound should return `false` for a dropped connection") - } -} - -func TestResponseNotFound_StatusCodes(t *testing.T) { - testCases := []struct { - statusCode int - expectedResult bool - }{ - {http.StatusOK, false}, - {http.StatusInternalServerError, false}, - {http.StatusNotFound, true}, - } - - for _, test := range testCases { - resp := autorest.Response{ - Response: &http.Response{ - StatusCode: test.statusCode, - }, - } - result := ResponseWasNotFound(resp) - if test.expectedResult != result { - t.Fatalf("Expected '%+v' for status code '%d' - got '%+v'", - test.expectedResult, test.statusCode, result) - } - } -} diff --git a/azurestack/utils/response.go b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils/response.go similarity index 100% rename from azurestack/utils/response.go rename to vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils/response.go diff --git a/azurestack/utils/utils.go b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils/utils.go similarity index 79% rename from azurestack/utils/utils.go rename to vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils/utils.go index c261f41b2..a522e8866 100644 --- a/azurestack/utils/utils.go +++ b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils/utils.go @@ -12,6 +12,10 @@ func Int64(input int64) *int64 { return &input } +func Float(input float64) *float64 { + return &input +} + func String(input string) *string { return &input } diff --git a/vendor/vendor.json b/vendor/vendor.json index a6c96343f..d998a0e97 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1014,6 +1014,14 @@ "version": "=v1.15.0", "versionExact": "v1.15.0" }, + { + "checksumSHA1": "K1YsBm4r3xOsdl/EhCUU3MOx+sQ=", + "path": "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils", + "revision": "4f7a9e8cef2cd90866192756d907071a102f1e00", + "revisionTime": "2018-09-14T07:45:51Z", + "version": "=v1.15.0", + "versionExact": "v1.15.0" + }, { "checksumSHA1": "qgMa75aMGbkFY0jIqqqgVnCUoNA=", "origin": "github.com/hashicorp/terraform/vendor/github.com/ulikunitz/xz", From 02e4d491885b5b88efe4197210fc5d0fb54887b7 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 14 Sep 2018 11:08:53 -0700 Subject: [PATCH 3/3] vended in azurerm helpers/response package --- azurestack/helpers/response/response_test.go | 65 ------------------- azurestack/resource_arm_dns_zone.go | 2 +- .../resource_arm_local_network_gateway.go | 2 +- ...resource_arm_local_network_gateway_test.go | 2 +- .../resource_arm_network_interface_test.go | 2 +- ...resource_arm_network_security_rule_test.go | 2 +- azurestack/resource_arm_resource_group.go | 2 +- azurestack/resource_arm_route_table.go | 2 +- azurestack/resource_arm_route_table_test.go | 2 +- azurestack/resource_arm_subnet_test.go | 2 +- .../resource_arm_virtual_network_test.go | 2 +- .../azurerm}/helpers/response/response.go | 0 vendor/vendor.json | 8 +++ 13 files changed, 18 insertions(+), 75 deletions(-) delete mode 100644 azurestack/helpers/response/response_test.go rename {azurestack => vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm}/helpers/response/response.go (100%) diff --git a/azurestack/helpers/response/response_test.go b/azurestack/helpers/response/response_test.go deleted file mode 100644 index 6f0e2be81..000000000 --- a/azurestack/helpers/response/response_test.go +++ /dev/null @@ -1,65 +0,0 @@ -package response - -import ( - "net/http" - "testing" -) - -func TestConflict_DroppedConnection(t *testing.T) { - resp := http.Response{} - if WasConflict(&resp) { - t.Fatalf("wasConflict should return `false` for a dropped connection") - } -} - -func TestConflcit_StatusCodes(t *testing.T) { - testCases := []struct { - statusCode int - expectedResult bool - }{ - {http.StatusOK, false}, - {http.StatusInternalServerError, false}, - {http.StatusNotFound, false}, - {http.StatusConflict, true}, - } - - for _, test := range testCases { - resp := http.Response{ - StatusCode: test.statusCode, - } - result := WasConflict(&resp) - if test.expectedResult != result { - t.Fatalf("Expected '%+v' for status code '%d' - got '%+v'", - test.expectedResult, test.statusCode, result) - } - } -} - -func TestNotFound_DroppedConnection(t *testing.T) { - resp := http.Response{} - if WasNotFound(&resp) { - t.Fatalf("wasNotFound should return `false` for a dropped connection") - } -} - -func TestNotFound_StatusCodes(t *testing.T) { - testCases := []struct { - statusCode int - expectedResult bool - }{ - {http.StatusOK, false}, - {http.StatusInternalServerError, false}, - {http.StatusNotFound, true}, - } - - for _, test := range testCases { - resp := http.Response{ - StatusCode: test.statusCode, - } - result := WasNotFound(&resp) - if test.expectedResult != result { - t.Fatalf("Expected '%+v' for status code '%d' - got '%+v'", - test.expectedResult, test.statusCode, result) - } - } -} diff --git a/azurestack/resource_arm_dns_zone.go b/azurestack/resource_arm_dns_zone.go index b8d29ceef..c62ae4f0d 100644 --- a/azurestack/resource_arm_dns_zone.go +++ b/azurestack/resource_arm_dns_zone.go @@ -5,8 +5,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2016-04-01/dns" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func resourceArmDnsZone() *schema.Resource { diff --git a/azurestack/resource_arm_local_network_gateway.go b/azurestack/resource_arm_local_network_gateway.go index 263223108..8270a48d8 100644 --- a/azurestack/resource_arm_local_network_gateway.go +++ b/azurestack/resource_arm_local_network_gateway.go @@ -5,8 +5,8 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/network/mgmt/network" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func resourceArmLocalNetworkGateway() *schema.Resource { diff --git a/azurestack/resource_arm_local_network_gateway_test.go b/azurestack/resource_arm_local_network_gateway_test.go index cbd38edf0..43e5d9df0 100644 --- a/azurestack/resource_arm_local_network_gateway_test.go +++ b/azurestack/resource_arm_local_network_gateway_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func TestAccAzureStackLocalNetworkGateway_basic(t *testing.T) { diff --git a/azurestack/resource_arm_network_interface_test.go b/azurestack/resource_arm_network_interface_test.go index 8b9829f03..6cd242751 100644 --- a/azurestack/resource_arm_network_interface_test.go +++ b/azurestack/resource_arm_network_interface_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func init() { diff --git a/azurestack/resource_arm_network_security_rule_test.go b/azurestack/resource_arm_network_security_rule_test.go index 30ab90750..ccfb831d7 100644 --- a/azurestack/resource_arm_network_security_rule_test.go +++ b/azurestack/resource_arm_network_security_rule_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func TestAccAzureStackNetworkSecurityRule_basic(t *testing.T) { diff --git a/azurestack/resource_arm_resource_group.go b/azurestack/resource_arm_resource_group.go index 38ff33228..11fd91a2f 100644 --- a/azurestack/resource_arm_resource_group.go +++ b/azurestack/resource_arm_resource_group.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2017-03-09/resources/mgmt/resources" "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func resourceArmResourceGroup() *schema.Resource { diff --git a/azurestack/resource_arm_route_table.go b/azurestack/resource_arm_route_table.go index 56fe0df72..499a1e0c7 100644 --- a/azurestack/resource_arm_route_table.go +++ b/azurestack/resource_arm_route_table.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) var routeTableResourceName = "azurestack_route_table" diff --git a/azurestack/resource_arm_route_table_test.go b/azurestack/resource_arm_route_table_test.go index b93dce8f0..a3ccb6822 100644 --- a/azurestack/resource_arm_route_table_test.go +++ b/azurestack/resource_arm_route_table_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func TestAccAzureStackRouteTable_basic(t *testing.T) { diff --git a/azurestack/resource_arm_subnet_test.go b/azurestack/resource_arm_subnet_test.go index 283ebe4b5..49180d017 100644 --- a/azurestack/resource_arm_subnet_test.go +++ b/azurestack/resource_arm_subnet_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" ) func TestAccAzureStackSubnet_basic(t *testing.T) { diff --git a/azurestack/resource_arm_virtual_network_test.go b/azurestack/resource_arm_virtual_network_test.go index 9e771acc0..965790ebf 100644 --- a/azurestack/resource_arm_virtual_network_test.go +++ b/azurestack/resource_arm_virtual_network_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/terraform-providers/terraform-provider-azurestack/azurestack/helpers/response" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response" ) func init() { diff --git a/azurestack/helpers/response/response.go b/vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response/response.go similarity index 100% rename from azurestack/helpers/response/response.go rename to vendor/github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response/response.go diff --git a/vendor/vendor.json b/vendor/vendor.json index d998a0e97..c65773b57 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -998,6 +998,14 @@ "revision": "b061729afc07e77a8aa4fad0a2fd840958f1942a", "revisionTime": "2016-09-27T10:08:44Z" }, + { + "checksumSHA1": "mRk+gm+E3yYDMBnTRkx8IxbOho8=", + "path": "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response", + "revision": "4f7a9e8cef2cd90866192756d907071a102f1e00", + "revisionTime": "2018-09-14T07:45:51Z", + "version": "=v1.15.0", + "versionExact": "v1.15.0" + }, { "checksumSHA1": "iWqEq0BpOtDozH23rMiDJf7ODD8=", "path": "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress",