Tweak environment variable names (#2)

silas · Oct 15, 2024 · 661d0ec · 661d0ec
1 parent 90e47d0
commit 661d0ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/internal/cmd/upgrade.go b/internal/cmd/upgrade.go
@@ -6,9 +6,10 @@ import (
 
 func newUpgrade() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "upgrade",
-		Short: "Run all schema upgrades",
-		Args:  args(),
+		Use:     "upgrade",
+		Short:   "Run all schema upgrades",
+		Aliases: []string{"up"},
+		Args:    args(),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			m, err := newMigrations(cmd, true)
 			if err != nil {

diff --git a/internal/cmd/util.go b/internal/cmd/util.go
@@ -63,7 +63,10 @@ func newMigrations(cmd *cobra.Command, load bool) (*migrations.Migrations, error
 		m.Config.Project = project
 	}
 	if m.Config.Project == "" {
-		m.Config.Project = os.Getenv(constants.EnvProject)
+		m.Config.Project = os.Getenv(constants.EnvProjectId)
+	}
+	if m.Config.Project == "" {
+		m.Config.Project = os.Getenv(constants.EnvGoogleCloudProject)
 	}
 
 	instanceId, err := cmd.Flags().GetString(flagInstance)
@@ -74,7 +77,7 @@ func newMigrations(cmd *cobra.Command, load bool) (*migrations.Migrations, error
 		m.Config.InstanceId = instanceId
 	}
 	if m.Config.InstanceId == "" {
-		m.Config.InstanceId = os.Getenv(constants.EnvInstance)
+		m.Config.InstanceId = os.Getenv(constants.EnvInstanceId)
 	}
 
 	databaseId, err := cmd.Flags().GetString(flagDatabase)
@@ -85,7 +88,7 @@ func newMigrations(cmd *cobra.Command, load bool) (*migrations.Migrations, error
 		m.Config.DatabaseId = databaseId
 	}
 	if m.Config.DatabaseId == "" {
-		m.Config.DatabaseId = os.Getenv(constants.EnvDatabase)
+		m.Config.DatabaseId = os.Getenv(constants.EnvDatabaseId)
 	}
 
 	if flagSet(cmd, flagEmulator) {

diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -8,7 +8,8 @@ const (
 
 	EnvEmulatorHost        = "SPANNER_EMULATOR_HOST"
 	EnvEmulatorHostDefault = "127.0.0.1:9010"
-	EnvProject             = "SPANNER_PROJECT"
-	EnvInstance            = "SPANNER_INSTANCE"
-	EnvDatabase            = "SPANNER_DATABASE"
+	EnvGoogleCloudProject  = "GOOGLE_CLOUD_PROJECT"
+	EnvProjectId           = "SPANNER_PROJECT_ID"
+	EnvInstanceId          = "SPANNER_INSTANCE_ID"
+	EnvDatabaseId          = "SPANNER_DATABASE_ID"
 )