test: de-duplicate plan definitions

acceptance-tests/cloudsql_mysql_migration_test.go

@@ -17,12 +17,15 @@ import (
 var _ = Describe("MySQL service instance migration", Label("mysql-data-migration"), func() {
 	It("allows access to migrated data", func() {
 		By("creating a service broker with matching config")
-		const mysql56plan = `[{"name":"default","id":"eec62c9b-b25e-4e65-bad5-6b74d90274bf","description":"MySQL v5.6 10GB storage","mysql_version":"MYSQL_5_6","storage_gb":10,"tier":"db-n1-standard-2"}]`
+		const (
+			planVar     = "GSB_SERVICE_CSB_GOOGLE_MYSQL_PLANS"
+			mysql56plan = `[{"name":"default","id":"eec62c9b-b25e-4e65-bad5-6b74d90274bf","description":"MySQL v5.6 10GB storage","mysql_version":"MYSQL_5_6","storage_gb":10,"tier":"db-n1-standard-2"}]`
+		)
 
 		serviceBroker := brokers.Create(
 			brokers.WithPrefix("csb-mysql"),
 			brokers.WithLatestEnv(),
-			brokers.WithEnv(apps.EnvVar{Name: brokers.PlansMySQLVar, Value: mysql56plan}),
+			brokers.WithEnv(apps.EnvVar{Name: planVar, Value: mysql56plan}),
 		)
 		defer serviceBroker.Delete()
 

acceptance-tests/helpers/brokers/create.go

@@ -1,13 +1,13 @@
 package brokers
 
 import (
-	"csbbrokerpakgcp/acceptance-tests/helpers/testpath"
-	"fmt"
-	"strings"
-
 	"csbbrokerpakgcp/acceptance-tests/helpers/apps"
 	"csbbrokerpakgcp/acceptance-tests/helpers/cf"
 	"csbbrokerpakgcp/acceptance-tests/helpers/random"
+	"csbbrokerpakgcp/acceptance-tests/helpers/testpath"
+	"fmt"
+	"path/filepath"
+	"strings"
 )
 
 type Option func(broker *Broker)
@@ -67,9 +67,9 @@ func WithEnv(env ...apps.EnvVar) Option {
 	}
 }
 
-func WithReleasedEnv() Option {
+func WithReleasedEnv(dir string) Option {
 	return func(b *Broker) {
-		b.envExtras = append(b.envExtras, b.releasedEnv()...)
+		b.envExtras = append(b.envExtras, readEnvrcServices(filepath.Join(dir, ".envrc"))...)
 	}
 }
 

acceptance-tests/helpers/brokers/env.go

@@ -1,25 +1,14 @@
 package brokers
 
 import (
+	"csbbrokerpakgcp/acceptance-tests/helpers/apps"
+	"csbbrokerpakgcp/acceptance-tests/helpers/testpath"
 	"fmt"
 	"os"
 
-	"csbbrokerpakgcp/acceptance-tests/helpers/apps"
-
 	"github.com/onsi/ginkgo/v2"
 )
 
-const (
-	plansPostgreSQLVar = "GSB_SERVICE_CSB_GOOGLE_POSTGRES_PLANS"
-	PlansMySQLVar      = "GSB_SERVICE_CSB_GOOGLE_MYSQL_PLANS"
-	plansStorageVar    = "GSB_SERVICE_CSB_GOOGLE_STORAGE_BUCKET_PLANS"
-	plansRedisVar      = "GSB_SERVICE_CSB_GOOGLE_REDIS_PLANS"
-	plansPostgreSQL    = `[{"name":"small","id":"5b45de36-cb90-11ec-a755-77f8be95a49d","description":"PostgreSQL with default version, shared CPU, minimum 0.6GB ram, 10GB storage","metadata":{"displayName":"small"},"tier":"db-f1-micro","storage_gb":10},{"name":"medium","id":"a3359fa6-cb90-11ec-bcb6-cb68544eda78","description":"PostgreSQL with default version, shared CPU, minimum 1.7GB ram, 20GB storage","metadata":{"displayName":"medium"},"tier":"db-g1-small","storage_gb":20},{"name":"large","id":"cd95c5b4-cb90-11ec-a5da-df87b7fb7426","description":"PostgreSQL with default version, minimum 8 cores, minimum 8GB ram, 50GB storage","metadata":{"displayName":"large"},"tier":"db-custom-8-8192","storage_gb":50}]`
-	plansMySQL         = `[{"name":"default","id":"eec62c9b-b25e-4e65-bad5-6b74d90274bf","description":"Default MySQL v8.0 10GB storage","metadata":{"displayName":"default"},"mysql_version":"MYSQL_8_0","storage_gb":10,"tier":"db-n1-standard-2"}]`
-	oldPlansStorage    = `[{"name": "private","id": "bbc4853e-8a63-11ea-a54e-670ca63cee0b","description": "Private Storage bucket", "region": "us-central1", "storage_class": "STANDARD"},{"name": "public-read","id": "c07f21a6-8a63-11ea-bc1b-d38b123189cb","description": "Public-read Storage bucket", "region": "us-central1", "storage_class": "STANDARD"}]`
-	oldBasicPlanRedis  = `[{"name":"basic","id":"6ed44104-8777-4b57-8c03-826b3af7d0be","description":"Cloud Memorystore for Redis service with no failover","metadata":{"display_name":"basic"},"service_tier": "BASIC"}]`
-)
-
 func (b Broker) env() []apps.EnvVar {
 	var result []apps.EnvVar
 
@@ -58,20 +47,6 @@ func (b Broker) env() []apps.EnvVar {
 	return append(result, b.envExtras...)
 }
 
-func (b Broker) releasedEnv() []apps.EnvVar {
-	return []apps.EnvVar{
-		{Name: plansPostgreSQLVar, Value: plansPostgreSQL},
-		{Name: PlansMySQLVar, Value: plansMySQL},
-		{Name: plansStorageVar, Value: oldPlansStorage},
-		{Name: plansRedisVar, Value: oldBasicPlanRedis},
-	}
-}
-
 func (b Broker) latestEnv() []apps.EnvVar {
-	return []apps.EnvVar{
-		{Name: plansPostgreSQLVar, Value: plansPostgreSQL},
-		{Name: PlansMySQLVar, Value: plansMySQL},
-		{Name: plansStorageVar, Value: oldPlansStorage},
-		{Name: plansRedisVar, Value: oldBasicPlanRedis},
-	}
+	return readEnvrcServices(testpath.BrokerpakFile(".envrc"))
 }

acceptance-tests/helpers/brokers/envrc.go

@@ -0,0 +1,39 @@
+package brokers
+
+import (
+	"csbbrokerpakgcp/acceptance-tests/helpers/apps"
+	"encoding/json"
+	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
+	. "github.com/onsi/gomega"
+)
+
+var serviceMatcher = regexp.MustCompile(`^\s*export\s+(GSB_SERVICE_[\w_]+?)='(.*)'\s*$`)
+
+func readEnvrcServices(path string) (result []apps.EnvVar) {
+	data, err := os.ReadFile(path)
+	Expect(err).NotTo(HaveOccurred())
+
+	for _, line := range strings.Split(string(data), "\n") {
+		m := serviceMatcher.FindStringSubmatch(line)
+		const expectedNumberOfMatches = 3
+		if len(m) != expectedNumberOfMatches {
+			continue
+		}
+		name, rawValue := m[1], m[2]
+
+		var r any
+		Expect(json.Unmarshal([]byte(rawValue), &r)).To(Succeed(), func() string {
+			return fmt.Sprintf("JSON parsing error %q for service %q: %s", err, name, rawValue)
+		})
+		tidyValue, err := json.Marshal(r)
+		Expect(err).NotTo(HaveOccurred())
+
+		result = append(result, apps.EnvVar{Name: name, Value: string(tidyValue)})
+	}
+
+	return result
+}

acceptance-tests/upgrade/update_and_upgrade_dataproc_test.go

@@ -20,7 +20,7 @@ var _ = Describe("UpgradeDataprocTest", Label("dataproc"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-dataproc"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/upgrade/update_and_upgrade_mysql_test.go

@@ -18,7 +18,7 @@ var _ = Describe("UpgradeMYSQLTest", Label("mysql"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-mysql"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/upgrade/update_and_upgrade_postgresql_test.go

@@ -17,7 +17,7 @@ var _ = Describe("UpgradePostgreSQLTest", Label("postgresql"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-postgresql"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/upgrade/update_and_upgrade_redis_test.go

@@ -19,7 +19,7 @@ var _ = Describe("UpgradeRedisTest", Label("redis"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-redis"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/upgrade/update_and_upgrade_spanner_test.go

@@ -18,7 +18,7 @@ var _ = Describe("UpgradeSpannerTest", Label("spanner"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-spanner"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/upgrade/update_and_upgrade_storage_test.go

@@ -17,14 +17,14 @@ var _ = Describe("UpgradeStorageTest", Label("storage"), func() {
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-storage"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 
 			By("creating a service")
 			serviceInstance := services.CreateInstance(
 				"csb-google-storage-bucket",
-				"private",
+				"default",
 				services.WithBroker(serviceBroker),
 			)
 			defer serviceInstance.Delete()

acceptance-tests/upgrade/upgrade_stackdrivertrace_test.go

@@ -25,7 +25,7 @@ var _ = Describe("UpgradeStackdrivertraceTest", Label("stackdrivertrace"), func(
 			serviceBroker := brokers.Create(
 				brokers.WithPrefix("csb-stackdrivertrace"),
 				brokers.WithSourceDir(releasedBuildDir),
-				brokers.WithReleasedEnv(),
+				brokers.WithReleasedEnv(releasedBuildDir),
 			)
 			defer serviceBroker.Delete()
 

acceptance-tests/withoutcredhub_test.go

@@ -23,7 +23,7 @@ var _ = Describe("Without CredHub", Label("withoutcredhub"), func() {
 		By("creating a service instance")
 		serviceInstance := services.CreateInstance(
 			"csb-google-storage-bucket",
-			"private",
+			"default",
 			services.WithBroker(broker),
 		)