DB: Rename var name & Remove new function

* Migration -> Initialization
* Remove GetBoolEnvOrDefault

Author: lkaybob

pkg/db/v1beta1/common/const.go

@@ -47,5 +47,5 @@ const (
 	DefaultPostgreSQLHost     = "katib-postgres"
 	DefaultPostgreSQLPort     = "5432"
 
-	SkipDbMigrationEnvName = "SKIP_DB_MIGRATION"
+	SkipDbInitializationEnvName = "SKIP_DB_INITIALIZATION"
 )

pkg/db/v1beta1/mysql/init.go

@@ -25,9 +25,9 @@ import (
 
 func (d *dbConn) DBInit() {
 	db := d.db
-	skipDbMigration := env.GetBoolEnvOrDefault(common.SkipDbMigrationEnvName, false)
+	skipDbInitialization := env.GetEnvOrDefault(common.SkipDbInitializationEnvName, "false")
 
-	if !skipDbMigration {
+	if skipDbInitialization == "false" {
 		klog.Info("Initializing v1beta1 DB schema")
 
 		_, err := db.Exec(`CREATE TABLE IF NOT EXISTS observation_logs

pkg/db/v1beta1/postgres/init.go

@@ -26,9 +26,9 @@ import (
 
 func (d *dbConn) DBInit() {
 	db := d.db
-	skipDbMigration := env.GetBoolEnvOrDefault(common.SkipDbMigrationEnvName, false)
+	skipDbInitialization := env.GetEnvOrDefault(common.SkipDbInitializationEnvName, "false")
 
-	if !skipDbMigration {
+	if skipDbInitialization == "false" {
 		klog.Info("Initializing v1beta1 DB schema")
 
 		_, err := db.Exec(`CREATE TABLE IF NOT EXISTS observation_logs

pkg/util/v1beta1/env/env.go

@@ -17,9 +17,7 @@ limitations under the License.
 package env
 
 import (
-	"k8s.io/klog"
 	"os"
-	"strconv"
 )
 
 func GetEnvOrDefault(key string, fallback string) string {
@@ -28,14 +26,3 @@ func GetEnvOrDefault(key string, fallback string) string {
 	}
 	return fallback
 }
-
-func GetBoolEnvOrDefault(key string, fallback bool) bool {
-	if value, ok := os.LookupEnv(key); ok {
-		parsedValue, err := strconv.ParseBool(value)
-		if err != nil {
-			klog.Fatalf("Failed converting %s env to bool", key)
-		}
-		return parsedValue
-	}
-	return fallback
-}

pkg/util/v1beta1/env/env_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package env
 
 import (
-	"fmt"
 	"os"
 	"testing"
 )
@@ -36,20 +35,3 @@ func TestGetEnvWithDefault(t *testing.T) {
 		t.Errorf("Expected %s, got %s", expected, v)
 	}
 }
-
-func TestGetBoolEnvWithDefault(t *testing.T) {
-	expected := false
-	key := "TEST"
-	v := GetBoolEnvOrDefault(key, expected)
-	if v != expected {
-		t.Errorf("Expected %t, got %t", expected, v)
-	}
-
-	expected = true
-	envValue := fmt.Sprintf("%t", expected)
-	os.Setenv(key, envValue)
-	v = GetBoolEnvOrDefault(key, false)
-	if v != expected {
-		t.Errorf("Expected %t, got %t", expected, v)
-	}
-}