From ff6a4850a5863436a037e0148887d6fc5f400cdc Mon Sep 17 00:00:00 2001 From: Mars Hall Date: Wed, 17 Jul 2024 09:09:14 -0700 Subject: [PATCH] Remove or replace references to the Postgres "mini" plan (#387) * Remove or replace references to the Postgres "mini" plan * Some test assertions require the default postgres plan name * Distinguish the user-set Add-on attribute from the Add-on's provisioned plan --- docs/resources/addon.md | 2 +- .../resource_heroku_addon_attachment_test.go | 4 ++-- heroku/resource_heroku_addon_test.go | 22 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/resources/addon.md b/docs/resources/addon.md index c4656240..c7fb64e0 100644 --- a/docs/resources/addon.md +++ b/docs/resources/addon.md @@ -22,7 +22,7 @@ resource "heroku_app" "default" { # Create a database, and configure the app to use it resource "heroku_addon" "database" { app_id = heroku_app.default.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql:standard-0" } ``` diff --git a/heroku/resource_heroku_addon_attachment_test.go b/heroku/resource_heroku_addon_attachment_test.go index fe811843..51e86bd2 100644 --- a/heroku/resource_heroku_addon_attachment_test.go +++ b/heroku/resource_heroku_addon_attachment_test.go @@ -55,7 +55,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "foobar" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" } resource "heroku_addon_attachment" "foobar" { @@ -74,7 +74,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "foobar" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" } resource "heroku_addon_attachment" "foobar" { diff --git a/heroku/resource_heroku_addon_test.go b/heroku/resource_heroku_addon_test.go index 0e1e166e..bc898b2d 100644 --- a/heroku/resource_heroku_addon_test.go +++ b/heroku/resource_heroku_addon_test.go @@ -50,22 +50,22 @@ func TestAccHerokuAddon_noPlan(t *testing.T) { Config: testAccCheckHerokuAddonConfig_no_plan(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAddonExists("heroku_addon.foobar", &addon), - testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:mini"), + testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:essential-0"), resource.TestCheckResourceAttrSet( "heroku_addon.foobar", "app_id"), resource.TestCheckResourceAttr( - "heroku_addon.foobar", "plan", "heroku-postgresql:mini"), + "heroku_addon.foobar", "plan", "heroku-postgresql"), ), }, { Config: testAccCheckHerokuAddonConfig_no_plan(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAddonExists("heroku_addon.foobar", &addon), - testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:mini"), + testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:essential-0"), resource.TestCheckResourceAttrSet( "heroku_addon.foobar", "app_id"), resource.TestCheckResourceAttr( - "heroku_addon.foobar", "plan", "heroku-postgresql:mini"), + "heroku_addon.foobar", "plan", "heroku-postgresql"), ), }, }, @@ -85,7 +85,7 @@ func TestAccHerokuAddon_ConfigVarValues(t *testing.T) { Config: testAccCheckHerokuAddonConfig_configVarValues(appName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAddonExists("heroku_addon.pg", &addon), - testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:mini"), + testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:essential-0"), testAccCheckHerokuAddonConfigVarValueHasDatabaseURL("heroku_addon.pg", &addon), ), }, @@ -123,11 +123,11 @@ func TestAccHerokuAddon_CustomName(t *testing.T) { Config: testAccCheckHerokuAddonConfig_CustomName(appName, customName), Check: resource.ComposeTestCheckFunc( testAccCheckHerokuAddonExists("heroku_addon.foobar", &addon), - testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:mini"), + testAccCheckHerokuAddonPlan(&addon, "heroku-postgresql:essential-0"), resource.TestCheckResourceAttrSet( "heroku_addon.foobar", "app_id"), resource.TestCheckResourceAttr( - "heroku_addon.foobar", "plan", "heroku-postgresql:mini"), + "heroku_addon.foobar", "plan", "heroku-postgresql"), resource.TestCheckResourceAttr( "heroku_addon.foobar", "name", customName), ), @@ -325,7 +325,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "pg" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" }`, appName) } @@ -344,7 +344,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "pg" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" }`, appName) } @@ -357,7 +357,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "foobar" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" }`, appName) } @@ -370,7 +370,7 @@ resource "heroku_app" "foobar" { resource "heroku_addon" "foobar" { app_id = heroku_app.foobar.id - plan = "heroku-postgresql:mini" + plan = "heroku-postgresql" name = "%s" }`, appName, customAddonName) }