fixup

Author: duanhongyi

go.mod

@@ -5,7 +5,7 @@ go 1.25
 require (
 	github.com/chai2010/gettext-go v1.0.3
 	github.com/containerd/console v1.0.4
-	github.com/drycc/controller-sdk-go v0.0.0-20260324023744-f5a3de0a532e
+	github.com/drycc/controller-sdk-go v0.0.0-20260410005909-366c9e9b1b3b
 	github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf
 	github.com/minio/selfupdate v0.6.0
 	github.com/olekukonko/tablewriter v0.0.5

go.sum

@@ -9,8 +9,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/drycc/controller-sdk-go v0.0.0-20260324023744-f5a3de0a532e h1:4GH098Zz4VsTvk8KfLHQQTP5f/O41i7dk+h/GOYiDy8=
-github.com/drycc/controller-sdk-go v0.0.0-20260324023744-f5a3de0a532e/go.mod h1:eHcmYwg81ASlP55/U587xnBZnZoeZnPHXGeQ8nYWnsg=
+github.com/drycc/controller-sdk-go v0.0.0-20260410005909-366c9e9b1b3b h1:l2Q5y01LeRIbYrIwpgTJdLntPRFokoInbPkV4MKv1Fg=
+github.com/drycc/controller-sdk-go v0.0.0-20260410005909-366c9e9b1b3b/go.mod h1:eHcmYwg81ASlP55/U587xnBZnZoeZnPHXGeQ8nYWnsg=
 github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf h1:CYy3NoPhfFhkGAbEppTOQfY/HC2s0FJDcBgbtRKeweg=
 github.com/drycc/pkg v0.0.0-20250917064731-345368da3dbf/go.mod h1:BrrNrNskHKm+nJYhXfGuI114w8nupi0AMo8QZHID7CM=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=

internal/commands/apps.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/controller-sdk-go/apps"
 	"github.com/drycc/controller-sdk-go/appsettings"
 	"github.com/drycc/controller-sdk-go/domains"
@@ -306,23 +307,10 @@ func (d *DryccCmd) appURL(s *settings.Settings, appID string) (string, error) {
 	if d.checkAPICompatibility(s.Client, err) != nil {
 		return "", err
 	}
-
-	if len(domains) == 0 {
-		return "", nil
-	}
-
-	return expandURL(s.Client.ControllerURL.Host, domains[0].Domain), nil
-}
-
-// expandURL expands an app url if necessary.
-func expandURL(host, u string) string {
-	if strings.Contains(u, ".") {
-		// If domain is a full url.
-		return u
+	for _, domain := range domains {
+		if domain.Ptype == api.PtypeWeb {
+			return domain.Domain, nil
+		}
 	}
-
-	// If domain is a subdomain, look up the controller url and replace the subdomain.
-	parts := strings.Split(host, ".")
-	parts[0] = u
-	return strings.Join(parts, ".")
+	return "", nil
 }

internal/commands/apps_test.go

@@ -271,27 +271,6 @@ func TestAppTransfer(t *testing.T) {
 `, "output")
 }
 
-func TestExpandUrl(t *testing.T) {
-	checks := []expandURLCases{
-		{
-			Input:    "test.com",
-			Expected: "test.com",
-		},
-		{
-			Input:    "test",
-			Expected: "test.foo.com",
-		},
-	}
-
-	for _, check := range checks {
-		out := expandURL("drycc.foo.com", check.Input)
-
-		if out != check.Expected {
-			t.Errorf("Expected %s, Got %s", check.Expected, out)
-		}
-	}
-}
-
 func TestRemoteExists(t *testing.T) {
 	cf, server, err := testutil.NewTestServerAndClient()
 	if err != nil {

internal/commands/keys_test.go

@@ -88,7 +88,7 @@ func TestListKeys(t *testing.T) {
 
 	folder := filepath.Join(name, ".ssh")
 
-	err = os.Mkdir(folder, 0o600)
+	err = os.Mkdir(folder, 0o700)
 	assert.NoError(t, err)
 
 	toWrite := []byte("ssh-rsa abc test@example.com")
@@ -115,7 +115,7 @@ func TestListKeys(t *testing.T) {
 	keys, err := listKeys(io.Discard)
 	assert.NoError(t, err)
 
-	assert.Equal(t, keys, expected, "key")
+	assert.Equal(t, expected, keys, "key")
 
 	var b bytes.Buffer
 	// Write bad ssh key
@@ -301,7 +301,7 @@ func TestKeyAdd(t *testing.T) {
 	assert.NoError(t, err)
 	settings.SetHome(name)
 	folder := filepath.Join(name, ".ssh")
-	err = os.Mkdir(folder, 0o600)
+	err = os.Mkdir(folder, 0o700)
 	assert.NoError(t, err)
 
 	cf, server, err := testutil.NewTestServerAndClient()
@@ -347,7 +347,7 @@ func TestKeyAddName(t *testing.T) {
 	assert.NoError(t, err)
 	settings.SetHome(name)
 	folder := filepath.Join(name, ".ssh")
-	err = os.Mkdir(folder, 0o600)
+	err = os.Mkdir(folder, 0o700)
 	assert.NoError(t, err)
 
 	cf, server, err := testutil.NewTestServerAndClient()

internal/commands/utils.go

@@ -156,10 +156,10 @@ func sortConfigValues(data []api.ConfigValue) []api.ConfigValue {
 
 func sortPtypes(ptypes []string) []string {
 	sort.Slice(ptypes, func(i, j int) bool {
-		if ptypes[i] == "web" {
+		if ptypes[i] == api.PtypeWeb {
 			return true
 		}
-		if ptypes[j] == "web" {
+		if ptypes[j] == api.PtypeWeb {
 			return false
 		}
 		return ptypes[i] < ptypes[j]