provider/heroku: Update app test to use new Heroku Space

This commit is contained in:
clint shryock 2017-06-08 15:28:19 -05:00
parent 8c52df5526
commit cd2a0b476b

View File

@ -207,8 +207,8 @@ func TestAccHerokuApp_Organization(t *testing.T) {
func TestAccHerokuApp_Space(t *testing.T) { func TestAccHerokuApp_Space(t *testing.T) {
var app heroku.OrganizationApp var app heroku.OrganizationApp
appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) appName := fmt.Sprintf("tftest-%s", acctest.RandString(10))
org := os.Getenv("HEROKU_ORGANIZATION") org := os.Getenv("HEROKU_SPACES_ORGANIZATION")
space := os.Getenv("HEROKU_SPACE") spaceName := fmt.Sprintf("tftest-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { PreCheck: func() {
@ -216,18 +216,15 @@ func TestAccHerokuApp_Space(t *testing.T) {
if org == "" { if org == "" {
t.Skip("HEROKU_ORGANIZATION is not set; skipping test.") t.Skip("HEROKU_ORGANIZATION is not set; skipping test.")
} }
if space == "" {
t.Skip("HEROKU_SPACE is not set; skipping test.")
}
}, },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: testAccCheckHerokuAppDestroy, CheckDestroy: testAccCheckHerokuAppDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccCheckHerokuAppConfig_space(appName, space, org), Config: testAccCheckHerokuAppConfig_space(appName, spaceName, org),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckHerokuAppExistsOrg("heroku_app.foobar", &app), testAccCheckHerokuAppExistsOrg("heroku_app.foobar", &app),
testAccCheckHerokuAppAttributesOrg(&app, appName, space, org), testAccCheckHerokuAppAttributesOrg(&app, appName, spaceName, org),
), ),
}, },
}, },
@ -260,7 +257,7 @@ func testAccCheckHerokuAppAttributes(app *heroku.App, appName string) resource.T
return fmt.Errorf("Bad region: %s", app.Region.Name) return fmt.Errorf("Bad region: %s", app.Region.Name)
} }
if app.Stack.Name != "cedar-14" { if app.Stack.Name != "heroku-16" {
return fmt.Errorf("Bad stack: %s", app.Stack.Name) return fmt.Errorf("Bad stack: %s", app.Stack.Name)
} }
@ -399,7 +396,7 @@ func testAccCheckHerokuAppAttributesOrg(app *heroku.OrganizationApp, appName, sp
return fmt.Errorf("Bad space: %s", appSpace) return fmt.Errorf("Bad space: %s", appSpace)
} }
if app.Stack.Name != "cedar-14" { if app.Stack.Name != "heroku-16" {
return fmt.Errorf("Bad stack: %s", app.Stack.Name) return fmt.Errorf("Bad stack: %s", app.Stack.Name)
} }
@ -575,11 +572,16 @@ resource "heroku_app" "foobar" {
}`, appName, org) }`, appName, org)
} }
func testAccCheckHerokuAppConfig_space(appName, space, org string) string { func testAccCheckHerokuAppConfig_space(appName, spaceName, org string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "heroku_space" "foobar" {
name = "%s"
organization = "%s"
region = "virginia"
}
resource "heroku_app" "foobar" { resource "heroku_app" "foobar" {
name = "%s" name = "%s"
space = "%s" space = "${heroku_space.foobar.name}"
region = "virginia" region = "virginia"
organization { organization {
@ -589,5 +591,5 @@ resource "heroku_app" "foobar" {
config_vars { config_vars {
FOO = "bar" FOO = "bar"
} }
}`, appName, space, org) }`, spaceName, org, appName, org)
} }