Fix tail without project

DefangLabs · Jan 10, 2025 · 4f21c1d · 4f21c1d
1 parent acde940
commit 4f21c1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/cmd/cli/command/commands.go b/src/cmd/cli/command/commands.go
@@ -1139,16 +1139,16 @@ func canIUseProvider(ctx context.Context, provider cliClient.Provider, projectNa
 }
 
 func determineProviderID(ctx context.Context, loader cliClient.Loader) (string, error) {
-	var projName string
+	var projectName string
 	if loader != nil {
 		var err error
-		projName, err = loader.LoadProjectName(ctx)
+		projectName, err = loader.LoadProjectName(ctx)
 		if err != nil {
 			term.Warn("Unable to load project:", err)
 		}
 
-		if projName != "" && !RootCmd.PersistentFlags().Changed("provider") { // If user manually selected auto provider, do not load from remote
-			resp, err := client.GetSelectedProvider(ctx, &defangv1.GetSelectedProviderRequest{Project: projName})
+		if projectName != "" && !RootCmd.PersistentFlags().Changed("provider") { // If user manually selected auto provider, do not load from remote
+			resp, err := client.GetSelectedProvider(ctx, &defangv1.GetSelectedProviderRequest{Project: projectName})
 			if err != nil {
 				term.Warn("Unable to get selected provider:", err)
 			} else if resp.Provider != defangv1.Provider_PROVIDER_UNSPECIFIED {
@@ -1190,11 +1190,11 @@ func determineProviderID(ctx context.Context, loader cliClient.Loader) (string,
 	}
 
 	// Save the selected provider to the fabric
-	if projName != "" {
-		if err := client.SetSelectedProvider(ctx, &defangv1.SetSelectedProviderRequest{Project: projName, Provider: providerID.EnumValue()}); err != nil {
+	if projectName != "" {
+		if err := client.SetSelectedProvider(ctx, &defangv1.SetSelectedProviderRequest{Project: projectName, Provider: providerID.EnumValue()}); err != nil {
 			term.Warn("Unable to save selected provider to defang server:", err)
 		} else {
-			term.Printf("%v is now the default provider for project %v and will auto-select next time if no other provider is specified. Use --provider=auto to reselect.", providerID, projName)
+			term.Printf("%v is now the default provider for project %v and will auto-select next time if no other provider is specified. Use --provider=auto to reselect.", providerID, projectName)
 		}
 	}
 	return "interactive prompt", nil

diff --git a/src/cmd/cli/command/compose.go b/src/cmd/cli/command/compose.go
@@ -475,12 +475,12 @@ func makeComposeLogsCmd() *cobra.Command {
 			term.Debug("logType", logType)
 
 			loader := configureLoader(cmd)
-			projectName, err := loader.LoadProjectName(cmd.Context())
+			provider, err := getProvider(cmd.Context(), loader)
 			if err != nil {
 				return err
 			}
 
-			provider, err := getProvider(cmd.Context(), loader)
+			projectName, err := cliClient.LoadProjectNameWithFallback(cmd.Context(), loader, provider)
 			if err != nil {
 				return err
 			}