Merge branch 'MightyMoud:main' into main

MightyMoud · Sep 23, 2024 · 7fcf887 · 7fcf887
2 parents b3fcba5 + 88f7fe8
commit 7fcf887
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/cmd/compose.go b/cmd/compose.go
@@ -107,7 +107,7 @@ to quickly create a Cobra application.`,
 		if utils.FileExists(fmt.Sprintf("./%s", envFileName)) {
 			hasEnvFile = true
 			pterm.Info.Printfln("Env file detected - Loading env vars from %s", envFileName)
-			res := utils.HandleEnvFile(envFileName, envVariables, dockerEnvProperty, &envFileChecksum)
+			res := utils.HandleEnvFile(envFileName, envVariables, &dockerEnvProperty, &envFileChecksum)
 			fmt.Println(res)
 			fmt.Println(dockerEnvProperty)
 			defer os.Remove("encrypted.env")

diff --git a/cmd/launch.go b/cmd/launch.go
@@ -40,6 +40,12 @@ var launchCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
+		if utils.FileExists("./sidekick.yml") {
+			pterm.Error.Println("Sidekick config exits in this project.")
+			pterm.Info.Println("You can deploy a new version of your application with Sidekick deploy.")
+			os.Exit(1)
+		}
+
 		if utils.FileExists("./Dockerfile") {
 			pterm.Info.Println("Dockerfile detected - scanning file for details")
 		} else {
@@ -93,13 +99,11 @@ var launchCmd = &cobra.Command{
 		if utils.FileExists(fmt.Sprintf("./%s", envFileName)) {
 			hasEnvFile = true
 			pterm.Info.Printfln("Env file detected - Loading env vars from %s", envFileName)
-			utils.HandleEnvFile(envFileName, envVariables, dockerEnvProperty, &envFileChecksum)
+			utils.HandleEnvFile(envFileName, envVariables, &dockerEnvProperty, &envFileChecksum)
 			defer os.Remove("encrypted.env")
 		} else {
 			pterm.Info.Println("No env file detected - Skipping env parsing")
 		}
-		fmt.Println("Env is:")
-		fmt.Println(dockerEnvProperty)
 
 		// make a docker service
 		imageName := appName

diff --git a/cmd/preview.go b/cmd/preview.go
@@ -93,7 +93,7 @@ to quickly create a Cobra application.`,
 		dockerEnvProperty := []string{}
 		envFileChecksum := ""
 		if appConfig.Env.File != "" {
-			envErr := utils.HandleEnvFile(appConfig.Env.File, envVariables, dockerEnvProperty, &envFileChecksum)
+			envErr := utils.HandleEnvFile(appConfig.Env.File, envVariables, &dockerEnvProperty, &envFileChecksum)
 			if envErr != nil {
 				panic(envErr)
 			}

diff --git a/utils/utils.go b/utils/utils.go
@@ -277,7 +277,7 @@ func LoadAppConfig() (SidekickAppConfig, error) {
 	return appConfigFile, nil
 }
 
-func HandleEnvFile(envFileName string, envVariables []string, dockerEnvProperty []string, envFileChecksum *string) error {
+func HandleEnvFile(envFileName string, envVariables []string, dockerEnvProperty *[]string, envFileChecksum *string) error {
 	envFileContent, envFileErr := os.ReadFile(fmt.Sprintf("./%s", envFileName))
 	if envFileErr != nil {
 		pterm.Error.Println("Unable to process your env file")
@@ -290,7 +290,7 @@ func HandleEnvFile(envFileName string, envVariables []string, dockerEnvProperty
 	}
 
 	for _, envVar := range envVariables {
-		dockerEnvProperty = append(dockerEnvProperty, fmt.Sprintf("%s=${%s}", envVar, envVar))
+		*dockerEnvProperty = append(*dockerEnvProperty, fmt.Sprintf("%s=${%s}", envVar, envVar))
 	}
 	// calculate and store the hash of env file to re-encrypt later on when changed
 	*envFileChecksum = fmt.Sprintf("%x", md5.Sum(envFileContent))