From a7d26fa12d0e81e2fbd2f9ad507798b9d57abb83 Mon Sep 17 00:00:00 2001 From: Mars Hall Date: Wed, 24 May 2023 14:32:07 -0700 Subject: [PATCH] Fix tests by using default stack for apps, no longer requiring test updates as stacks are end-of-lifed --- heroku/data_source_heroku_app_test.go | 15 +++---- heroku/import_heroku_app_test.go | 3 +- heroku/resource_heroku_app_test.go | 57 +++++++++------------------ heroku/resource_heroku_slug_test.go | 1 - 4 files changed, 24 insertions(+), 52 deletions(-) diff --git a/heroku/data_source_heroku_app_test.go b/heroku/data_source_heroku_app_test.go index 7ef3a228..a911ade4 100644 --- a/heroku/data_source_heroku_app_test.go +++ b/heroku/data_source_heroku_app_test.go @@ -11,7 +11,6 @@ import ( func TestAccDatasourceHerokuApp_Basic(t *testing.T) { appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-20" gitUrl := fmt.Sprintf("https://git.heroku.com/%s.git", appName) resource.Test(t, resource.TestCase{ @@ -19,14 +18,12 @@ func TestAccDatasourceHerokuApp_Basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppWithDatasource_basic(appName, appStack), + Config: testAccCheckHerokuAppWithDatasource_basic(appName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "data.heroku_app.foobar", "name", appName), resource.TestCheckResourceAttrSet( "data.heroku_app.foobar", "id"), - resource.TestCheckResourceAttr( - "data.heroku_app.foobar", "stack", appStack), resource.TestCheckResourceAttr( "data.heroku_app.foobar", "region", "us"), resource.TestCheckResourceAttr( @@ -72,11 +69,10 @@ func TestAccDatasourceHerokuApp_Organization(t *testing.T) { }) } -func testAccCheckHerokuApp_basic(appName string, stack string) string { +func testAccCheckHerokuApp_basic(appName string) string { return fmt.Sprintf(` resource "heroku_app" "foobar" { name = "%s" - stack = "%s" region = "us" buildpacks = [ @@ -87,14 +83,13 @@ resource "heroku_app" "foobar" { FOO = "bar" } } -`, appName, stack) +`, appName) } -func testAccCheckHerokuAppWithDatasource_basic(appName string, stack string) string { +func testAccCheckHerokuAppWithDatasource_basic(appName string) string { return fmt.Sprintf(` resource "heroku_app" "foobar" { name = "%s" - stack = "%s" region = "us" buildpacks = [ @@ -110,7 +105,7 @@ resource "heroku_app" "foobar" { data "heroku_app" "foobar" { name = "${heroku_app.foobar.name}" } -`, appName, stack) +`, appName) } func testAccCheckHerokuApp_organization(appName, orgName string) string { diff --git a/heroku/import_heroku_app_test.go b/heroku/import_heroku_app_test.go index 96a32b02..87a7f2ec 100644 --- a/heroku/import_heroku_app_test.go +++ b/heroku/import_heroku_app_test.go @@ -10,7 +10,6 @@ import ( func TestAccHerokuApp_importBasic(t *testing.T) { appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-20" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -18,7 +17,7 @@ func TestAccHerokuApp_importBasic(t *testing.T) { CheckDestroy: testAccCheckHerokuAppDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_basic(appName, appStack), + Config: testAccCheckHerokuAppConfig_basic(appName), }, { ResourceName: "heroku_app.foobar", diff --git a/heroku/resource_heroku_app_test.go b/heroku/resource_heroku_app_test.go index 2ed0ba69..017e7f30 100644 --- a/heroku/resource_heroku_app_test.go +++ b/heroku/resource_heroku_app_test.go @@ -20,7 +20,6 @@ import ( func TestAccHerokuApp_Basic(t *testing.T) { var app heroku.App appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-20" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -28,10 +27,10 @@ func TestAccHerokuApp_Basic(t *testing.T) { CheckDestroy: testAccCheckHerokuAppDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_basic(appName, appStack), + Config: testAccCheckHerokuAppConfig_basic(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAppExists("heroku_app.foobar", &app), - testAccCheckHerokuAppAttributes(&app, appName, "heroku-20"), + testAccCheckHerokuAppAttributes(&app, appName), resource.TestCheckResourceAttr( "heroku_app.foobar", "name", appName), resource.TestCheckResourceAttrSet( @@ -60,14 +59,13 @@ func TestAccHerokuApp_Basic(t *testing.T) { func TestAccHerokuApp_DontSetAllConfigVars(t *testing.T) { appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-20" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, ProviderFactories: testAccProviderFactories, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_DontSetConfigVars(appName, appStack), + Config: testAccCheckHerokuAppConfig_DontSetConfigVars(appName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "heroku_app.foobar", "name", appName), @@ -88,7 +86,6 @@ func TestAccHerokuApp_DontSetAllConfigVars(t *testing.T) { func TestAccHerokuApp_Disappears(t *testing.T) { var app heroku.App appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-18" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -96,7 +93,7 @@ func TestAccHerokuApp_Disappears(t *testing.T) { CheckDestroy: testAccCheckHerokuAppDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_basic(appName, appStack), + Config: testAccCheckHerokuAppConfig_basic(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAppExists("heroku_app.foobar", &app), testAccCheckHerokuAppDisappears(appName), @@ -111,8 +108,6 @@ func TestAccHerokuApp_Change(t *testing.T) { var app heroku.App appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) appName2 := fmt.Sprintf("%s-v2", appName) - appStack := "heroku-18" - appStack2 := "heroku-20" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -120,27 +115,23 @@ func TestAccHerokuApp_Change(t *testing.T) { CheckDestroy: testAccCheckHerokuAppDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_basic(appName, appStack), + Config: testAccCheckHerokuAppConfig_basic(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAppExists("heroku_app.foobar", &app), - testAccCheckHerokuAppAttributes(&app, appName, appStack), + testAccCheckHerokuAppAttributes(&app, appName), resource.TestCheckResourceAttr( "heroku_app.foobar", "name", appName), - resource.TestCheckResourceAttr( - "heroku_app.foobar", "stack", appStack), resource.TestCheckResourceAttr( "heroku_app.foobar", "config_vars.FOO", "bar"), ), }, { - Config: testAccCheckHerokuAppConfig_updated(appName2, appStack2), + Config: testAccCheckHerokuAppConfig_updated(appName2), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAppExists("heroku_app.foobar", &app), - testAccCheckHerokuAppAttributesUpdated(&app, appName2, appStack2), + testAccCheckHerokuAppAttributesUpdated(&app, appName2), resource.TestCheckResourceAttr( "heroku_app.foobar", "name", appName2), - resource.TestCheckResourceAttr( - "heroku_app.foobar", "stack", appStack2), resource.TestCheckResourceAttr( "heroku_app.foobar", "config_vars.FOO", "bing"), resource.TestCheckResourceAttr( @@ -154,7 +145,6 @@ func TestAccHerokuApp_Change(t *testing.T) { func TestAccHerokuApp_NukeVars(t *testing.T) { var app heroku.App appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) - appStack := "heroku-20" resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -162,10 +152,10 @@ func TestAccHerokuApp_NukeVars(t *testing.T) { CheckDestroy: testAccCheckHerokuAppDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckHerokuAppConfig_basic(appName, appStack), + Config: testAccCheckHerokuAppConfig_basic(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAppExists("heroku_app.foobar", &app), - testAccCheckHerokuAppAttributes(&app, appName, "heroku-20"), + testAccCheckHerokuAppAttributes(&app, appName), resource.TestCheckResourceAttr( "heroku_app.foobar", "name", appName), resource.TestCheckResourceAttr( @@ -504,7 +494,7 @@ func testAccCheckHerokuAppDestroy(s *terraform.State) error { return nil } -func testAccCheckHerokuAppAttributes(app *heroku.App, appName, stackName string) resource.TestCheckFunc { +func testAccCheckHerokuAppAttributes(app *heroku.App, appName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := testAccProvider.Meta().(*Config).Api @@ -512,10 +502,6 @@ func testAccCheckHerokuAppAttributes(app *heroku.App, appName, stackName string) return fmt.Errorf("Bad region: %s", app.Region.Name) } - if app.BuildStack.Name != stackName { - return fmt.Errorf("Bad stack: %s", app.BuildStack.Name) - } - if app.Name != appName { return fmt.Errorf("Bad name: %s", app.Name) } @@ -533,14 +519,10 @@ func testAccCheckHerokuAppAttributes(app *heroku.App, appName, stackName string) } } -func testAccCheckHerokuAppAttributesUpdated(app *heroku.App, appName, stackName string) resource.TestCheckFunc { +func testAccCheckHerokuAppAttributesUpdated(app *heroku.App, appName string) resource.TestCheckFunc { return func(s *terraform.State) error { client := testAccProvider.Meta().(*Config).Api - if app.BuildStack.Name != stackName { - return fmt.Errorf("Bad stack: %s", app.BuildStack.Name) - } - if app.Name != appName { return fmt.Errorf("Bad name: %s", app.Name) } @@ -776,17 +758,16 @@ func testAccCheckHerokuAppDisappears(appName string) resource.TestCheckFunc { } } -func testAccCheckHerokuAppConfig_basic(appName, appStack string) string { +func testAccCheckHerokuAppConfig_basic(appName string) string { return fmt.Sprintf(` resource "heroku_app" "foobar" { name = "%s" - stack = "%s" region = "us" config_vars = { FOO = "bar" } -}`, appName, appStack) +}`, appName) } func testAccCheckHerokuAppConfig_go(appName string) string { @@ -812,18 +793,17 @@ resource "heroku_app" "foobar" { }`, appName) } -func testAccCheckHerokuAppConfig_updated(appName, appStack string) string { +func testAccCheckHerokuAppConfig_updated(appName string) string { return fmt.Sprintf(` resource "heroku_app" "foobar" { name = "%s" - stack = "%s" region = "us" config_vars = { FOO = "bing" BAZ = "bar" } -}`, appName, appStack) +}`, appName) } func testAccCheckHerokuAppConfig_no_vars(appName string) string { @@ -1009,7 +989,7 @@ resource "heroku_app" "foobar" { }`, appName, org, locked) } -func testAccCheckHerokuAppConfig_DontSetConfigVars(appName, appStack string) string { +func testAccCheckHerokuAppConfig_DontSetConfigVars(appName string) string { return fmt.Sprintf(` provider "heroku" { customizations { @@ -1019,11 +999,10 @@ provider "heroku" { resource "heroku_app" "foobar" { name = "%s" - stack = "%s" region = "us" config_vars = { FOO = "bar" } -}`, appName, appStack) +}`, appName) } diff --git a/heroku/resource_heroku_slug_test.go b/heroku/resource_heroku_slug_test.go index 171cf3ae..640c9321 100644 --- a/heroku/resource_heroku_slug_test.go +++ b/heroku/resource_heroku_slug_test.go @@ -237,7 +237,6 @@ resource "heroku_slug" "foobar" { test = "echo 'Just a test'" diag = "echo 'Just diagnosis'" } - stack = "heroku-18" }`, appName) }