finish testing create config

openziti · Mar 8, 2024 · fce47bc · fce47bc
1 parent a1ea703
commit fce47bc
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/ziti/cmd/create/create_config_controller_test.go b/ziti/cmd/create/create_config_controller_test.go
@@ -140,6 +140,7 @@ func TestCreateConfigControllerTemplateValues(t *testing.T) {
 		".Controller.Ctrl.BindAddress",
 		".Controller.Ctrl.AdvertisedAddress",
 		".Controller.Ctrl.AdvertisedPort",
+		".Controller.Database.DatabaseFile",
 		".Controller.EdgeApi.Address",
 		".Controller.EdgeApi.Port",
 		".Controller.EdgeEnrollment.SigningCert",
@@ -164,6 +165,7 @@ func TestCreateConfigControllerTemplateValues(t *testing.T) {
 		&data.Controller.Ctrl.BindAddress,
 		&data.Controller.Ctrl.AdvertisedAddress,
 		&data.Controller.Ctrl.AdvertisedPort,
+		&data.Controller.Database.DatabaseFile,
 		&data.Controller.EdgeApi.Address,
 		&data.Controller.EdgeApi.Port,
 		&data.Controller.EdgeEnrollment.SigningCert,
@@ -283,6 +285,7 @@ func TestCtrlConfigDefaultsWhenUnset(t *testing.T) {
 		assert.Equal(t, expectedValue, data.Controller.Database.DatabaseFile)
 	})
 
+	// db:
 	t.Run("TestDatabaseFileConfig", func(t *testing.T) {
 		expectedValue := cmdhelper.GetZitiHome() + "/" + constants.DefaultCtrlDatabaseFile
 
@@ -454,10 +457,11 @@ func TestCtrlConfigDefaultsWhenUnset(t *testing.T) {
 	})
 }
 
-func TestCtrlConfigDefaultsWhenBlank(t *testing.T) {
+func TestCtrlConfigDefaultsWhenEmpty(t *testing.T) {
 	keys := map[string]string{
 		"ZITI_PKI_CTRL_CERT":                "",
 		"ZITI_CTRL_EDGE_ADVERTISED_ADDRESS": "",
+		"ZITI_CTRL_DATABASE_FILE":           "",
 		"ZITI_HOME":                         "",
 	}
 	// run the config
@@ -489,6 +493,19 @@ func TestCtrlConfigDefaultsWhenBlank(t *testing.T) {
 		assert.Equal(t, expectedValue, ctrlConfig.Identity.Ca)
 	})
 
+	// db:
+	t.Run("TestDatabaseFileEnv", func(t *testing.T) {
+		expectedValue := constants.DefaultCtrlDatabaseFile
+
+		assert.Equal(t, expectedValue, data.Controller.Database.DatabaseFile)
+	})
+
+	t.Run("TestDatabaseFileConfig", func(t *testing.T) {
+		expectedValue := cmdhelper.GetZitiHome() + "/" + constants.DefaultCtrlDatabaseFile
+
+		assert.Equal(t, expectedValue, ctrlConfig.Db)
+	})
+
 	// ctrl:
 	t.Run("TestBindAddress", func(t *testing.T) {
 		expectedValue := testDefaultCtrlBindAddress