Cleanup services list

.golangci.yaml

@@ -15,7 +15,7 @@ linters:
     # - depguard
     - dogsled
     - dupl
-    - dupword
+    # - dupword
     - durationcheck
     # - err113
     # - errcheck

src/cmd/cli/command/commands.go

@@ -21,6 +21,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc/gcp"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
 	"github.com/DefangLabs/defang/src/pkg/clouds/aws"
+	"github.com/DefangLabs/defang/src/pkg/github"
 	"github.com/DefangLabs/defang/src/pkg/logs"
 	"github.com/DefangLabs/defang/src/pkg/mcp"
 	"github.com/DefangLabs/defang/src/pkg/scope"
@@ -149,7 +150,7 @@ func Execute(ctx context.Context) error {
 	}
 
 	if hasTty && !hideUpdate && pkg.RandomIndex(10) == 0 {
-		if latest, err := GetLatestVersion(ctx); err == nil && isNewer(GetCurrentVersion(), latest) {
+		if latest, err := github.GetLatestReleaseTag(ctx); err == nil && isNewer(GetCurrentVersion(), latest) {
 			term.Debug("Latest Version:", latest, "Current Version:", GetCurrentVersion())
 			fmt.Println("A newer version of the CLI is available at https://github.com/DefangLabs/defang/releases/latest")
 			if pkg.RandomIndex(10) == 0 && !pkg.GetenvBool("DEFANG_HIDE_HINTS") {
@@ -730,7 +731,7 @@ var getVersionCmd = &cobra.Command{
 		fmt.Println(GetCurrentVersion())
 
 		term.Printc(term.BrightCyan, "Latest CLI:    ")
-		ver, err := GetLatestVersion(cmd.Context())
+		ver, err := github.GetLatestReleaseTag(cmd.Context())
 		fmt.Println(ver)
 
 		term.Printc(term.BrightCyan, "Defang Fabric: ")
@@ -808,7 +809,7 @@ var configSetCmd = &cobra.Command{
 			value = strings.TrimSuffix(string(bytes), "\n")
 		} else if random {
 			// Generate a random value for the config
-			value = CreateRandomConfigValue()
+			value = cli.CreateRandomConfigValue()
 			term.Info("Generated random value: " + value)
 		} else {
 			// Prompt for sensitive value

src/cmd/cli/command/compose.go

@@ -26,6 +26,19 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const DEFANG_PORTAL_HOST = "portal.defang.io"
+const SERVICE_PORTAL_URL = "https://" + DEFANG_PORTAL_HOST + "/service"
+
+func printPlaygroundPortalServiceURLs(serviceInfos []*defangv1.ServiceInfo) {
+	// We can only show services deployed to the prod1 defang SaaS environment.
+	if providerID == cliClient.ProviderDefang && cluster == cli.DefaultCluster {
+		term.Info("Monitor your services' status in the defang portal")
+		for _, serviceInfo := range serviceInfos {
+			term.Println("   -", SERVICE_PORTAL_URL+"/"+serviceInfo.Service.Name)
+		}
+	}
+}
+
 func createProjectForDebug(loader *compose.Loader) (*compose.Project, error) {
 	projOpts, err := loader.NewProjectOptions()
 	if err != nil {
@@ -193,7 +206,7 @@ func makeComposeUpCmd() *cobra.Command {
 			}
 
 			// Print the current service states of the deployment
-			err = printServiceStatesAndEndpoints(deploy.Services)
+			err = cli.PrintServiceStatesAndEndpoints(ctx, deploy.Services)
 			if err != nil {
 				return err
 			}

src/cmd/cli/command/compose_test.go

@@ -1,7 +1,14 @@
 package command
 
 import (
+	"bytes"
+	"os"
 	"testing"
+
+	"github.com/DefangLabs/defang/src/pkg/cli"
+	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
+	"github.com/DefangLabs/defang/src/pkg/term"
+	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
 func TestInitializeTailCmd(t *testing.T) {
@@ -14,3 +21,26 @@ func TestInitializeTailCmd(t *testing.T) {
 		}
 	})
 }
+
+func TestPrintPlaygroundPortalServiceURLs(t *testing.T) {
+	defaultTerm := term.DefaultTerm
+	t.Cleanup(func() {
+		term.DefaultTerm = defaultTerm
+	})
+
+	var stdout, stderr bytes.Buffer
+	term.DefaultTerm = term.NewTerm(os.Stdin, &stdout, &stderr)
+
+	providerID = cliClient.ProviderDefang
+	cluster = cli.DefaultCluster
+	printPlaygroundPortalServiceURLs([]*defangv1.ServiceInfo{
+		{
+			Service: &defangv1.Service{Name: "service1"},
+		}})
+	const want = ` * Monitor your services' status in the defang portal
+   - https://portal.defang.io/service/service1
+`
+	if got := stdout.String(); got != want {
+		t.Errorf("got %q, want %q", got, want)
+	}
+}