Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Allowing azurerm_cdn_endpoint's to be updated #134

Merged
merged 2 commits into from
Jun 27, 2017
Merged

Allowing azurerm_cdn_endpoint's to be updated #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6408714
Refactoring the tests
tombuildsstuff Jun 26, 2017
f878366
Allow updating of CDN Endpoints. Fixes #97
tombuildsstuff Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions azurerm/import_arm_cdn_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package azurerm

import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/acctest"
Expand All @@ -12,7 +11,7 @@ func TestAccAzureRMCdnEndpoint_importWithTags(t *testing.T) {
resourceName := "azurerm_cdn_endpoint.test"

ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMCdnEndpoint_withTags, ri, ri, ri)
config := testAccAzureRMCdnEndpoint_withTags(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down
3 changes: 1 addition & 2 deletions azurerm/import_arm_cdn_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package azurerm

import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/acctest"
Expand All @@ -12,7 +11,7 @@ func TestAccAzureRMCdnProfile_importWithTags(t *testing.T) {
resourceName := "azurerm_cdn_profile.test"

ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMCdnProfile_withTags, ri, ri)
config := testAccAzureRMCdnProfile_withTags(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down
4 changes: 0 additions & 4 deletions azurerm/resource_arm_cdn_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ func resourceArmCdnEndpointRead(d *schema.ResourceData, meta interface{}) error
func resourceArmCdnEndpointUpdate(d *schema.ResourceData, meta interface{}) error {
cdnEndpointsClient := meta.(*ArmClient).cdnEndpointsClient

if !d.HasChange("tags") {
return nil
}

name := d.Get("name").(string)
resGroup := d.Get("resource_group_name").(string)
profileName := d.Get("profile_name").(string)
Expand Down
118 changes: 93 additions & 25 deletions azurerm/resource_arm_cdn_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ import (
)

func TestAccAzureRMCdnEndpoint_basic(t *testing.T) {
resourceName := "azurerm_cdn_endpoint.test"
ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMCdnEndpoint_basic, ri, ri, ri)
config := testAccAzureRMCdnEndpoint_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -22,16 +23,17 @@ func TestAccAzureRMCdnEndpoint_basic(t *testing.T) {
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"),
testCheckAzureRMCdnEndpointExists(resourceName),
),
},
},
})
}

func TestAccAzureRMCdnEndpoint_disappears(t *testing.T) {
resourceName := "azurerm_cdn_endpoint.test"
ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMCdnEndpoint_basic, ri, ri, ri)
config := testAccAzureRMCdnEndpoint_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -41,19 +43,49 @@ func TestAccAzureRMCdnEndpoint_disappears(t *testing.T) {
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"),
testCheckAzureRMCdnEndpointDisappears("azurerm_cdn_endpoint.test"),
testCheckAzureRMCdnEndpointExists(resourceName),
testCheckAzureRMCdnEndpointDisappears(resourceName),
),
ExpectNonEmptyPlan: true,
},
},
})
}

func TestAccAzureRMCdnEndpoint_updateHostHeader(t *testing.T) {
resourceName := "azurerm_cdn_endpoint.test"
ri := acctest.RandInt()
config := testAccAzureRMCdnEndpoint_hostHeader(ri, "www.example.com")
updatedConfig := testAccAzureRMCdnEndpoint_hostHeader(ri, "www.example2.com")

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMCdnEndpointDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "origin_host_header", "www.example.com"),
),
},
{
Config: updatedConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "origin_host_header", "www.example2.com"),
),
},
},
})
}

func TestAccAzureRMCdnEndpoint_withTags(t *testing.T) {
resourceName := "azurerm_cdn_endpoint.test"
ri := acctest.RandInt()
preConfig := fmt.Sprintf(testAccAzureRMCdnEndpoint_withTags, ri, ri, ri)
postConfig := fmt.Sprintf(testAccAzureRMCdnEndpoint_withTagsUpdate, ri, ri, ri)
preConfig := testAccAzureRMCdnEndpoint_withTags(ri)
postConfig := testAccAzureRMCdnEndpoint_withTagsUpdate(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -63,24 +95,19 @@ func TestAccAzureRMCdnEndpoint_withTags(t *testing.T) {
{
Config: preConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"),
resource.TestCheckResourceAttr(
"azurerm_cdn_endpoint.test", "tags.%", "2"),
resource.TestCheckResourceAttr(
"azurerm_cdn_endpoint.test", "tags.environment", "Production"),
resource.TestCheckResourceAttr(
"azurerm_cdn_endpoint.test", "tags.cost_center", "MSFT"),
testCheckAzureRMCdnEndpointExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.environment", "Production"),
resource.TestCheckResourceAttr(resourceName, "tags.cost_center", "MSFT"),
),
},

{
Config: postConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnEndpointExists("azurerm_cdn_endpoint.test"),
resource.TestCheckResourceAttr(
"azurerm_cdn_endpoint.test", "tags.%", "1"),
resource.TestCheckResourceAttr(
"azurerm_cdn_endpoint.test", "tags.environment", "staging"),
testCheckAzureRMCdnEndpointExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.environment", "staging"),
),
},
},
Expand Down Expand Up @@ -169,7 +196,8 @@ func testCheckAzureRMCdnEndpointDestroy(s *terraform.State) error {
return nil
}

var testAccAzureRMCdnEndpoint_basic = `
func testAccAzureRMCdnEndpoint_basic(rInt int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
Expand All @@ -194,9 +222,46 @@ resource "azurerm_cdn_endpoint" "test" {
http_port = 80
}
}
`
`, rInt, rInt, rInt)
}

func testAccAzureRMCdnEndpoint_hostHeader(rInt int, domain string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
}
resource "azurerm_cdn_profile" "test" {
name = "acctestcdnprof%d"
location = "West US"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "Standard_Verizon"
}
resource "azurerm_cdn_endpoint" "test" {
name = "acctestcdnend%d"
profile_name = "${azurerm_cdn_profile.test.name}"
location = "West US"
resource_group_name = "${azurerm_resource_group.test.name}"
origin_host_header = "%s"
origin {
name = "acceptanceTestCdnOrigin2"
host_name = "www.example.com"
https_port = 443
http_port = 80
}
tags {
environment = "Production"
cost_center = "MSFT"
}
}
`, rInt, rInt, rInt, domain)
}

var testAccAzureRMCdnEndpoint_withTags = `
func testAccAzureRMCdnEndpoint_withTags(rInt int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
Expand Down Expand Up @@ -226,9 +291,11 @@ resource "azurerm_cdn_endpoint" "test" {
cost_center = "MSFT"
}
}
`
`, rInt, rInt, rInt)
}

var testAccAzureRMCdnEndpoint_withTagsUpdate = `
func testAccAzureRMCdnEndpoint_withTagsUpdate(rInt int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
Expand Down Expand Up @@ -257,4 +324,5 @@ resource "azurerm_cdn_endpoint" "test" {
environment = "staging"
}
}
`
`, rInt, rInt, rInt)
}
33 changes: 18 additions & 15 deletions azurerm/resource_arm_cdn_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ func TestResourceAzureRMCdnProfileSKU_validation(t *testing.T) {
}

func TestAccAzureRMCdnProfile_basic(t *testing.T) {

ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMCdnProfile_basic, ri, ri)
config := testAccAzureRMCdnProfile_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -73,8 +72,8 @@ func TestAccAzureRMCdnProfile_basic(t *testing.T) {
func TestAccAzureRMCdnProfile_withTags(t *testing.T) {

ri := acctest.RandInt()
preConfig := fmt.Sprintf(testAccAzureRMCdnProfile_withTags, ri, ri)
postConfig := fmt.Sprintf(testAccAzureRMCdnProfile_withTagsUpdate, ri, ri)
preConfig := testAccAzureRMCdnProfile_withTags(ri)
postConfig := testAccAzureRMCdnProfile_withTagsUpdate(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down Expand Up @@ -109,7 +108,6 @@ func TestAccAzureRMCdnProfile_withTags(t *testing.T) {
}

func TestAccAzureRMCdnProfile_NonStandardCasing(t *testing.T) {

ri := acctest.RandInt()
config := testAccAzureRMCdnProfileNonStandardCasing(ri)

Expand All @@ -118,14 +116,13 @@ func TestAccAzureRMCdnProfile_NonStandardCasing(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMCdnProfileDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMCdnProfileExists("azurerm_cdn_profile.test"),
),
},

resource.TestStep{
{
Config: config,
PlanOnly: true,
ExpectNonEmptyPlan: false,
Expand Down Expand Up @@ -188,7 +185,8 @@ func testCheckAzureRMCdnProfileDestroy(s *terraform.State) error {
return nil
}

var testAccAzureRMCdnProfile_basic = `
func testAccAzureRMCdnProfile_basic(ri int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
Expand All @@ -199,13 +197,16 @@ resource "azurerm_cdn_profile" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "Standard_Verizon"
}
`
`, ri, ri)
}

var testAccAzureRMCdnProfile_withTags = `
func testAccAzureRMCdnProfile_withTags(ri int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
}
resource "azurerm_cdn_profile" "test" {
name = "acctestcdnprof%d"
location = "West US"
Expand All @@ -217,9 +218,10 @@ resource "azurerm_cdn_profile" "test" {
cost_center = "MSFT"
}
}
`

var testAccAzureRMCdnProfile_withTagsUpdate = `
`, ri, ri)
}
func testAccAzureRMCdnProfile_withTagsUpdate(ri int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
Expand All @@ -234,7 +236,8 @@ resource "azurerm_cdn_profile" "test" {
environment = "staging"
}
}
`
`, ri, ri)
}

func testAccAzureRMCdnProfileNonStandardCasing(ri int) string {
return fmt.Sprintf(`
Expand Down