Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch terraform SDK to v0.12-early9 #2968

Merged
merged 31 commits into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ca8d74c
switch to terraform v0.12-early4
katbyte Feb 28, 2019
1842c1a
Merge branch 'refactor/tag-blocks' into 012/early4
katbyte Feb 28, 2019
f75aa2e
changed map tf syntac to =
katbyte Feb 28, 2019
a5a5cf9
Merge branch 'refactor/tf-maps-to-12' into 012/early4
katbyte Feb 28, 2019
8a0e651
base64encode(file -> filebase64
katbyte Feb 28, 2019
8d0a4da
Merge branch 'master' into 012/early4
katbyte Feb 28, 2019
92a9dd6
Merge branch 'master' into 012/early4
katbyte Feb 28, 2019
af1ac83
fix some more filebase64 issues
katbyte Mar 1, 2019
a71d9a6
Merge branch 'master' into 012/early4
katbyte Mar 2, 2019
a502af9
Merge branch 'master' into 012/early4
katbyte Mar 4, 2019
95c400c
azurerm_template_deployment: fix true/false checks
katbyte Mar 5, 2019
e7356b2
git merge master
katbyte Mar 6, 2019
d9c4a7b
Updating to master of github.com/hashicorp/terraform
tombuildsstuff Mar 15, 2019
a3d2c5e
`go mod vendor`
tombuildsstuff Mar 15, 2019
e06933e
`go mod tidy`
tombuildsstuff Mar 15, 2019
9f011f2
fix TestAccAzureRMVirtualMachineScaleSet_upgradeModeUpdate test
katbyte Mar 18, 2019
c7d6b09
go get github.com/hashicorp/terraform@pluginsdk-v0.12-early5
katbyte Mar 19, 2019
6aa2d0d
remove loadbalancer _reapply tests
katbyte Mar 19, 2019
15d4b8a
merge master -S
katbyte Apr 16, 2019
92da03a
upgrade terraform to early7
katbyte Apr 17, 2019
721aa30
git merge master -S
katbyte Apr 17, 2019
d0769de
go mod tidy; go mod vendor
katbyte Apr 17, 2019
5a50dc5
go get github.com/hashicorp/terraform@pluginsdk-v0.12-early8; go mod …
katbyte Apr 17, 2019
66ea83a
base64encode(file -> filebase64
katbyte Apr 18, 2019
6f6bd08
Merge branch 'master' into 012/early4
katbyte Apr 18, 2019
b2783e4
Merge branch 'master' into 012/early4
katbyte Apr 23, 2019
e174e94
merge master -S
katbyte Apr 25, 2019
510d734
go mod tidy; go mod vendor
katbyte Apr 25, 2019
bd9ce68
go get github.com/hashicorp/terraform@pluginsdk-v0.12-early9; go mod …
katbyte Apr 25, 2019
c47102d
Merge branch 'master' into 012/early4
katbyte Apr 25, 2019
a72373c
remove \ file
katbyte Apr 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion azurerm/data_source_batch_certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.pfx"))}"
certificate = "${filebase64("testdata/batch_certificate.pfx")}"
format = "Pfx"
password = "terraform"
thumbprint = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/data_source_batch_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.pfx"))}"
certificate = "${filebase64("testdata/batch_certificate.pfx")}"
format = "Pfx"
password = "terraform"
thumbprint = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_api_management_certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ resource "azurerm_api_management_certificate" "test" {
name = "example-cert"
api_management_name = "${azurerm_api_management.test.name}"
resource_group_name = "${azurerm_resource_group.test.name}"
data = "${base64encode(file("testdata/keyvaultcert.pfx"))}"
data = "${filebase64("testdata/keyvaultcert.pfx")}"
password = ""
}
`, rInt, location, rInt)
Expand Down
10 changes: 5 additions & 5 deletions azurerm/resource_arm_api_management_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,13 @@ resource "azurerm_api_management" "test" {
}

certificate {
encoded_certificate = "${base64encode(file("testdata/api_management_api_test.pfx"))}"
encoded_certificate = "${filebase64("testdata/api_management_api_test.pfx")}"
certificate_password = "terraform"
store_name = "CertificateAuthority"
}

certificate {
encoded_certificate = "${base64encode(file("testdata/api_management_api_test.pfx"))}"
encoded_certificate = "${filebase64("testdata/api_management_api_test.pfx")}"
certificate_password = "terraform"
store_name = "Root"
}
Expand All @@ -482,22 +482,22 @@ resource "azurerm_api_management" "test" {
hostname_configuration {
proxy {
host_name = "api.terraform.io"
certificate = "${base64encode(file("testdata/api_management_api_test.pfx"))}"
certificate = "${filebase64("testdata/api_management_api_test.pfx")}"
certificate_password = "terraform"
default_ssl_binding = true
negotiate_client_certificate = false
}

proxy {
host_name = "api2.terraform.io"
certificate = "${base64encode(file("testdata/api_management_api2_test.pfx"))}"
certificate = "${filebase64("testdata/api_management_api2_test.pfx")}"
certificate_password = "terraform"
negotiate_client_certificate = true
}

portal {
host_name = "portal.terraform.io"
certificate = "${base64encode(file("testdata/api_management_portal_test.pfx"))}"
certificate = "${filebase64("testdata/api_management_portal_test.pfx")}"
certificate_password = "terraform"
}
}
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_application_gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ resource "azurerm_application_gateway" "test" {

ssl_certificate {
name = "${local.ssl_certificate_name}"
data = "${file("testdata/application_gateway_test.pfx")}"
data = "${filebase64("testdata/application_gateway_test.pfx")}"
password = "terraform"
}
}
Expand Down Expand Up @@ -1905,7 +1905,7 @@ resource "azurerm_application_gateway" "test" {

ssl_certificate {
name = "${local.ssl_certificate_name}"
data = "${file("testdata/application_gateway_test_2.pfx")}"
data = "${filebase64("testdata/application_gateway_test_2.pfx")}"
password = "hello-world"
}
}
Expand Down
8 changes: 4 additions & 4 deletions azurerm/resource_arm_batch_certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.pfx"))}"
certificate = "${filebase64("testdata/batch_certificate.pfx")}"
format = "Pfx"
password = "terraform"
thumbprint = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
Expand All @@ -155,7 +155,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.pfx"))}"
certificate = "${filebase64("testdata/batch_certificate.pfx")}"
format = "Pfx"
thumbprint = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
thumbprint_algorithm = "SHA1"
Expand All @@ -179,7 +179,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.cer"))}"
certificate = "${filebase64("testdata/batch_certificate.cer")}"
format = "Cer"
thumbprint = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
thumbprint_algorithm = "SHA1"
Expand All @@ -203,7 +203,7 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.cer"))}"
certificate = "${filebase64("testdata/batch_certificate.cer")}"
format = "Cer"
password = "should not have a password for Cer"
thumbprint = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_batch_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,15 +871,15 @@ resource "azurerm_batch_account" "test" {
resource "azurerm_batch_certificate" "testcer" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.cer"))}"
certificate = "${filebase64("testdata/batch_certificate.cer")}"
format = "Cer"
thumbprint = "312d31a79fa0cef49c00f769afc2b73e9f4edf34" # deliberately using lowercase here as verification
thumbprint_algorithm = "SHA1"
}
resource "azurerm_batch_certificate" "testpfx" {
resource_group_name = "${azurerm_resource_group.test.name}"
account_name = "${azurerm_batch_account.test.name}"
certificate = "${base64encode(file("testdata/batch_certificate.pfx"))}"
certificate = "${filebase64("testdata/batch_certificate.pfx")}"
format = "Pfx"
password = "terraform"
thumbprint = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
Expand Down
6 changes: 3 additions & 3 deletions azurerm/resource_arm_key_vault_certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ resource "azurerm_key_vault_certificate" "test" {
key_vault_id = "${azurerm_key_vault.test.id}"

certificate {
contents = "${base64encode(file("testdata/keyvaultcert.pfx"))}"
contents = "${filebase64("testdata/keyvaultcert.pfx")}"
password = ""
}

Expand Down Expand Up @@ -470,7 +470,7 @@ resource "azurerm_key_vault_certificate" "test" {
vault_uri = "${azurerm_key_vault.test.vault_uri}"

certificate {
contents = "${base64encode(file("testdata/keyvaultcert.pfx"))}"
contents = "${filebase64("testdata/keyvaultcert.pfx")}"
password = ""
}

Expand Down Expand Up @@ -504,7 +504,7 @@ resource "azurerm_key_vault_certificate" "import" {
key_vault_id = "${azurerm_key_vault.test.id}"

certificate {
contents = "${base64encode(file("testdata/keyvaultcert.pfx"))}"
contents = "${filebase64("testdata/keyvaultcert.pfx")}"
password = ""
}

Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_loadbalancer_backend_address_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,40 +103,6 @@ func TestAccAzureRMLoadBalancerBackEndAddressPool_removal(t *testing.T) {
})
}

func TestAccAzureRMLoadBalancerBackEndAddressPool_reapply(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
addressPoolName := fmt.Sprintf("%d-address-pool", ri)

deleteAddressPoolState := func(s *terraform.State) error {
return s.Remove("azurerm_lb_backend_address_pool.test")
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLoadBalancerDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLoadBalancerBackEndAddressPool_basic(ri, addressPoolName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerBackEndAddressPoolExists(addressPoolName, &lb),
deleteAddressPoolState,
),
ExpectNonEmptyPlan: true,
},
{
Config: testAccAzureRMLoadBalancerBackEndAddressPool_basic(ri, addressPoolName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerBackEndAddressPoolExists(addressPoolName, &lb),
),
},
},
})
}

func TestAccAzureRMLoadBalancerBackEndAddressPool_disappears(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_loadbalancer_nat_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,40 +145,6 @@ func TestAccAzureRMLoadBalancerNatPool_update(t *testing.T) {
})
}

func TestAccAzureRMLoadBalancerNatPool_reapply(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
natPoolName := fmt.Sprintf("NatPool-%d", ri)

deleteNatPoolState := func(s *terraform.State) error {
return s.Remove("azurerm_lb_nat_pool.test")
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLoadBalancerDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLoadBalancerNatPool_basic(ri, natPoolName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerNatPoolExists(natPoolName, &lb),
deleteNatPoolState,
),
ExpectNonEmptyPlan: true,
},
{
Config: testAccAzureRMLoadBalancerNatPool_basic(ri, natPoolName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerNatPoolExists(natPoolName, &lb),
),
},
},
})
}

func TestAccAzureRMLoadBalancerNatPool_disappears(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_loadbalancer_nat_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,40 +147,6 @@ func TestAccAzureRMLoadBalancerNatRule_update(t *testing.T) {
})
}

func TestAccAzureRMLoadBalancerNatRule_reapply(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
natRuleName := fmt.Sprintf("NatRule-%d", ri)

deleteNatRuleState := func(s *terraform.State) error {
return s.Remove("azurerm_lb_nat_rule.test")
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLoadBalancerDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLoadBalancerNatRule_basic(ri, natRuleName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerNatRuleExists(natRuleName, &lb),
deleteNatRuleState,
),
ExpectNonEmptyPlan: true,
},
{
Config: testAccAzureRMLoadBalancerNatRule_basic(ri, natRuleName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerNatRuleExists(natRuleName, &lb),
),
},
},
})
}

func TestAccAzureRMLoadBalancerNatRule_disappears(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_loadbalancer_outbound_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,40 +145,6 @@ func TestAccAzureRMLoadBalancerOutboundRule_update(t *testing.T) {
})
}

func TestAccAzureRMLoadBalancerOutboundRule_reapply(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
outboundRuleName := fmt.Sprintf("OutboundRule-%d", ri)

deleteOutboundRuleState := func(s *terraform.State) error {
return s.Remove("azurerm_lb_outbound_rule.test")
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLoadBalancerDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLoadBalancerOutboundRule_basic(ri, outboundRuleName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerOutboundRuleExists(outboundRuleName, &lb),
deleteOutboundRuleState,
),
ExpectNonEmptyPlan: true,
},
{
Config: testAccAzureRMLoadBalancerOutboundRule_basic(ri, outboundRuleName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerOutboundRuleExists(outboundRuleName, &lb),
),
},
},
})
}

func TestAccAzureRMLoadBalancerOutboundRule_disappears(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_loadbalancer_probe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,40 +176,6 @@ func TestAccAzureRMLoadBalancerProbe_updateProtocol(t *testing.T) {
})
}

func TestAccAzureRMLoadBalancerProbe_reapply(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
probeName := fmt.Sprintf("probe-%d", ri)

deleteProbeState := func(s *terraform.State) error {
return s.Remove("azurerm_lb_probe.test")
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMLoadBalancerDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMLoadBalancerProbe_basic(ri, probeName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerProbeExists(probeName, &lb),
deleteProbeState,
),
ExpectNonEmptyPlan: true,
},
{
Config: testAccAzureRMLoadBalancerProbe_basic(ri, probeName, testLocation()),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLoadBalancerExists("azurerm_lb.test", &lb),
testCheckAzureRMLoadBalancerProbeExists(probeName, &lb),
),
},
},
})
}

func TestAccAzureRMLoadBalancerProbe_disappears(t *testing.T) {
var lb network.LoadBalancer
ri := tf.AccRandTimeInt()
Expand Down
Loading