Merge pull request #133 from hossted/fix-dc

Cli fixes for access info path
hossted · Sep 3, 2024 · 25f80b5 · 25f80b5
2 parents 5289917 + 7ab633e
commit 25f80b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/hossted/service/common/common.go b/hossted/service/common/common.go
@@ -27,8 +27,8 @@ var (
 	MIMIR_USERNAME     = "-"
 	HOSSTED_API_URL    = "-"
 	HOSSTED_AUTH_TOKEN = "-"
-	HOSSTED_CLIENT_ID  = "-"
 	HOSSTED_AUTH_URL   = "-"
+	HOSSTED_CLIENT_ID  = "-"
 	///////////////////////////
 	HOSSTED_DEV_API_URL   = "-"
 	MIMIR_DEV_URL         = "-"

diff --git a/hossted/service/compose/activate_compose.go b/hossted/service/compose/activate_compose.go
@@ -110,6 +110,7 @@ func ActivateCompose(composeFilePath string, develMode bool) error {
 		}
 	}
 
+	fmt.Println(osFilePath)
 	osData, err := setClusterInfo(osInfo, osFilePath)
 	if err != nil {
 		return err

diff --git a/hossted/service/compose/reconcile_compose.go b/hossted/service/compose/reconcile_compose.go
@@ -133,7 +133,7 @@ func setClusterInfo(osInfo OsInfo, osFilePath string) (OsInfo, error) {
 		return info, err
 	}
 
-	return osInfo, nil
+	return info, nil
 }
 
 func checkUUID(osFilePath string) (string, error) {
@@ -246,7 +246,7 @@ func sendComposeInfo(appFilePath string, osInfo OsInfo) error {
 	composeUrl := hosstedAPIUrl + "/compose/hosts"
 	containersUrl := hosstedAPIUrl + "/compose/containers"
 
-	access_info := getAccessInfo(osInfo.ProjectName)
+	access_info := getAccessInfo("/opt/" + osInfo.ProjectName + "/.env")
 
 	var data map[string]AppRequest
 	err = json.Unmarshal(composeInfo, &data)
@@ -415,8 +415,6 @@ func prepareComposeRequest(
 		return appsData, isComposeStateChange, err
 	}
 
-	fmt.Println(uniqueProjects)
-
 	// Create a slice of existing apps
 	existingApps := make(map[string]bool)
 	for app := range appsData {