refactor: deployment API & model for connection pattern & format code (#160)

pan93412 · web-flow · commit 3476d8ba0920 · 2026-01-28T22:48:31.000+08:00
diff --git a/internal/cmd/auth/auth.go b/internal/cmd/auth/auth.go
@@ -22,7 +22,7 @@ func NewCmdAuth(f *cmdutil.Factory) *cobra.Command {
 	cmd.AddCommand(authLoginCmd.NewCmdLogin(f))
 	cmd.AddCommand(authLogoutCmd.NewCmdLogout(f))
 	cmd.AddCommand(authStatusCmd.NewCmdStatus(f))
-	//cmd.AddCommand(authTokenCmd.NewCmdToken(f, nil))
+	// cmd.AddCommand(authTokenCmd.NewCmdToken(f, nil))
 
 	return cmd
 }
diff --git a/internal/cmd/auth/logout/logout.go b/internal/cmd/auth/logout/logout.go
@@ -6,8 +6,7 @@ import (
 	"github.com/zeabur/cli/internal/cmdutil"
 )
 
-type logoutOptions struct {
-}
+type logoutOptions struct{}
 
 func NewCmdLogout(f *cmdutil.Factory) *cobra.Command {
 	opts := &logoutOptions{}
diff --git a/internal/cmd/context/clear/clear.go b/internal/cmd/context/clear/clear.go
@@ -6,8 +6,7 @@ import (
 	"github.com/zeabur/cli/internal/cmdutil"
 )
 
-type Options struct {
-}
+type Options struct{}
 
 func NewCmdClear(f *cmdutil.Factory) *cobra.Command {
 	opts := &Options{}
diff --git a/internal/cmd/context/get/get.go b/internal/cmd/context/get/get.go
@@ -6,8 +6,7 @@ import (
 	"github.com/zeabur/cli/internal/cmdutil"
 )
 
-type Options struct {
-}
+type Options struct{}
 
 func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
 	opts := &Options{}
diff --git a/internal/cmd/deployment/list/list.go b/internal/cmd/deployment/list/list.go
@@ -12,7 +12,7 @@ import (
 )
 
 type Options struct {
-	//todo: support service name
+	// todo: support service name
 	serviceID     string
 	serviceName   string
 	environmentID string
diff --git a/internal/cmd/project/get/get.go b/internal/cmd/project/get/get.go
@@ -3,6 +3,7 @@ package get
 import (
 	"context"
 	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/zeabur/cli/internal/util"
 
diff --git a/internal/cmd/project/list/list.go b/internal/cmd/project/list/list.go
@@ -2,13 +2,13 @@ package list
 
 import (
 	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/zeabur/cli/internal/cmdutil"
 )
 
-type Options struct {
-}
+type Options struct{}
 
 func NewCmdList(f *cmdutil.Factory) *cobra.Command {
 	opts := Options{}
diff --git a/internal/cmd/service/list/list.go b/internal/cmd/service/list/list.go
@@ -3,6 +3,7 @@ package list
 import (
 	"context"
 	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/zeabur/cli/internal/cmdutil"
 	"github.com/zeabur/cli/internal/util"
diff --git a/internal/cmd/template/delete/delete.go b/internal/cmd/template/delete/delete.go
@@ -35,7 +35,6 @@ func runDelete(f *cmdutil.Factory, opts Options) error {
 		return runDeleteInteractive(f, opts)
 	}
 	return runDeleteNonInteractive(f, opts)
-
 }
 
 func runDeleteInteractive(f *cmdutil.Factory, opts Options) error {
diff --git a/internal/cmd/template/get/get.go b/internal/cmd/template/get/get.go
@@ -35,7 +35,6 @@ func runGet(f *cmdutil.Factory, opts Options) error {
 		return runGetInteractive(f, opts)
 	}
 	return runGetNonInteractive(f, opts)
-
 }
 
 func runGetInteractive(f *cmdutil.Factory, opts Options) error {
diff --git a/internal/cmd/template/list/list.go b/internal/cmd/template/list/list.go
@@ -7,8 +7,7 @@ import (
 	"github.com/zeabur/cli/internal/cmdutil"
 )
 
-type Options struct {
-}
+type Options struct{}
 
 func NewCmdList(f *cmdutil.Factory) *cobra.Command {
 	opts := Options{}
diff --git a/internal/cmd/upload/upload.go b/internal/cmd/upload/upload.go
@@ -19,8 +19,7 @@ import (
 	"github.com/zeabur/cli/pkg/constant"
 )
 
-type Options struct {
-}
+type Options struct{}
 
 func NewCmdUpload(f *cmdutil.Factory) *cobra.Command {
 	opts := &Options{}
diff --git a/internal/cmdutil/constants.go b/internal/cmdutil/constants.go
@@ -1,9 +1,10 @@
 package cmdutil
 
 import (
+	"time"
+
 	"github.com/briandowns/spinner"
 	"github.com/fatih/color"
-	"time"
 )
 
 var (
diff --git a/internal/util/pack.go b/internal/util/pack.go
@@ -145,7 +145,6 @@ func PackZipWithoutGitIgnoreFiles() ([]byte, error) {
 
 		return nil
 	})
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/util/project.go b/internal/util/project.go
@@ -3,6 +3,7 @@ package util
 import (
 	"context"
 	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/zeabur/cli/pkg/api"
 	"github.com/zeabur/cli/pkg/config"
diff --git a/internal/util/runE.go b/internal/util/runE.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"errors"
+
 	"github.com/spf13/cobra"
 	"github.com/zeabur/cli/internal/cmdutil"
 	"github.com/zeabur/cli/pkg/zcontext"
diff --git a/internal/util/service.go b/internal/util/service.go
@@ -3,6 +3,7 @@ package util
 import (
 	"context"
 	"fmt"
+
 	"github.com/spf13/cobra"
 	"github.com/zeabur/cli/pkg/api"
 	"github.com/zeabur/cli/pkg/config"
diff --git a/pkg/api/deployment.go b/pkg/api/deployment.go
@@ -2,23 +2,22 @@ package api
 
 import (
 	"context"
+
 	"github.com/zeabur/cli/pkg/model"
 )
 
-func (c *client) ListDeployments(ctx context.Context, serviceID string, environmentID string, skip, limit int) (*model.Connection[model.Deployment], error) {
-	skip, limit = normalizePagination(skip, limit)
+func (c *client) ListDeployments(ctx context.Context, serviceID string, environmentID string, perPage int) (*model.DeploymentConnection, error) {
+	_, perPage = normalizePagination(0, perPage)
 
 	var query struct {
-		Deployments model.Connection[model.Deployment] `graphql:"deployments(serviceID: $serviceID, environmentID: $environmentID, skip: $skip, limit: $limit)"`
+		Deployments model.DeploymentConnection `graphql:"deployments(serviceID: $serviceID, environmentID: $environmentID, perPage: $perPage)"`
 	}
 
 	err := c.Query(ctx, &query, V{
 		"serviceID":     ObjectID(serviceID),
 		"environmentID": ObjectID(environmentID),
-		"skip":          skip,
-		"limit":         limit,
+		"perPage":       perPage,
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -27,11 +26,17 @@ func (c *client) ListDeployments(ctx context.Context, serviceID string, environm
 }
 
 func (c *client) ListAllDeployments(ctx context.Context, serviceID string, environmentID string) (model.Deployments, error) {
-	query := func(skip, limit int) (*model.Connection[model.Deployment], error) {
-		return c.ListDeployments(ctx, serviceID, environmentID, skip, limit)
+	conn, err := c.ListDeployments(ctx, serviceID, environmentID, 5)
+	if err != nil {
+		return nil, err
+	}
+
+	deployments := make(model.Deployments, 0, len(conn.Edges))
+	for _, edge := range conn.Edges {
+		deployments = append(deployments, edge.Node)
 	}
 
-	return listAll(query)
+	return deployments, nil
 }
 
 func (c *client) GetDeployment(ctx context.Context, id string) (*model.Deployment, error) {
@@ -48,7 +53,7 @@ func (c *client) GetDeployment(ctx context.Context, id string) (*model.Deploymen
 }
 
 func (c *client) GetLatestDeployment(ctx context.Context, serviceID string, environmentID string) (*model.Deployment, bool, error) {
-	deployments, err := c.ListDeployments(ctx, serviceID, environmentID, 0, 1)
+	deployments, err := c.ListDeployments(ctx, serviceID, environmentID, 1)
 	if err != nil {
 		return nil, false, err
 	}
diff --git a/pkg/api/domain.go b/pkg/api/domain.go
@@ -23,7 +23,6 @@ func (c *client) AddDomain(ctx context.Context, serviceID string, environmentID
 			"domain":        domain,
 			"redirectTo":    options[0],
 		})
-
 		if err != nil {
 			return nil, err
 		}
@@ -43,7 +42,6 @@ func (c *client) AddDomain(ctx context.Context, serviceID string, environmentID
 		"isGenerated":   isGenerated,
 		"domain":        domain,
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +60,6 @@ func (c *client) ListDomains(ctx context.Context, serviceID string, environmentI
 		"environmentID": ObjectID(environmentID),
 		"id":            ObjectID(serviceID),
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -78,7 +75,6 @@ func (c *client) RemoveDomain(ctx context.Context, domain string) (bool, error)
 	err := c.Mutate(ctx, &mutation, V{
 		"domain": domain,
 	})
-
 	if err != nil {
 		return false, err
 	}
@@ -99,7 +95,6 @@ func (c *client) CheckDomainAvailable(ctx context.Context, domain string, isGene
 		"isGenerated": isGenerated,
 		"region":      region,
 	})
-
 	if err != nil {
 		return false, "", err
 	}
diff --git a/pkg/api/environment.go b/pkg/api/environment.go
@@ -14,7 +14,6 @@ func (c *client) ListEnvironments(ctx context.Context, projectID string) (model.
 	err := c.Query(ctx, &query, V{
 		"projectID": ObjectID(projectID),
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -30,7 +29,6 @@ func (c *client) GetEnvironment(ctx context.Context, id string) (*model.Environm
 	err := c.Query(ctx, &query, V{
 		"id": ObjectID(id),
 	})
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/api/git.go b/pkg/api/git.go
@@ -26,7 +26,7 @@ func (c *client) GetRepoBranches(ctx context.Context, repoOwner string, repoName
 }
 
 func (c *client) GetRepoID(repoOwner string, repoName string) (int, error) {
-	//TODO: Deal with GitHub Auth, reading token env and set HTTP client header
+	// TODO: Deal with GitHub Auth, reading token env and set HTTP client header
 	client := github.NewClient(nil)
 
 	repo, _, err := client.Repositories.Get(context.Background(), repoOwner, repoName)
diff --git a/pkg/api/interface.go b/pkg/api/interface.go
@@ -83,7 +83,7 @@ type (
 	}
 
 	DeploymentAPI interface {
-		ListDeployments(ctx context.Context, serviceID string, environmentID string, skip, limit int) (*model.Connection[model.Deployment], error)
+		ListDeployments(ctx context.Context, serviceID string, environmentID string, perPage int) (*model.DeploymentConnection, error)
 		ListAllDeployments(ctx context.Context, serviceID string, environmentID string) (model.Deployments, error)
 		GetDeployment(ctx context.Context, id string) (*model.Deployment, error)
 		GetLatestDeployment(ctx context.Context, serviceID string, environmentID string) (*model.Deployment, bool, error)
diff --git a/pkg/api/log.go b/pkg/api/log.go
@@ -47,7 +47,6 @@ func (c *client) getRuntimeLogsByServiceIDAndEnvironmentID(ctx context.Context,
 		"serviceID":     ObjectID(serviceID),
 		"environmentID": ObjectID(environmentID),
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +62,6 @@ func (c *client) GetBuildLogs(ctx context.Context, deploymentID string) (model.L
 	err := c.Query(ctx, &query, V{
 		"deploymentID": ObjectID(deploymentID),
 	})
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/api/project.go b/pkg/api/project.go
@@ -85,7 +85,6 @@ func (c *client) getProjectByID(ctx context.Context, id string) (*model.Project,
 	err := c.Query(ctx, &query, V{
 		"id": ObjectID(id),
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +93,8 @@ func (c *client) getProjectByID(ctx context.Context, id string) (*model.Project,
 }
 
 func (c *client) getProjectByOwnerUsernameAndProject(ctx context.Context,
-	ownerUsername string, projectName string) (*model.Project, error) {
+	ownerUsername string, projectName string,
+) (*model.Project, error) {
 	var query struct {
 		Project model.Project `graphql:"project(owner: $owner, name: $name)"`
 	}
@@ -103,7 +103,6 @@ func (c *client) getProjectByOwnerUsernameAndProject(ctx context.Context,
 		"owner": ownerUsername,
 		"name":  projectName,
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +136,6 @@ func (c *client) DeleteProject(ctx context.Context, id string) error {
 	err := c.Mutate(ctx, &mutation, V{
 		"id": ObjectID(id),
 	})
-
 	if err != nil {
 		return err
 	}
diff --git a/pkg/api/service.go b/pkg/api/service.go
diff --git a/pkg/api/variable.go b/pkg/api/variable.go
diff --git a/pkg/config/init.go b/pkg/config/init.go
diff --git a/pkg/fill/fill.go b/pkg/fill/fill.go
diff --git a/pkg/model/deployment.go b/pkg/model/deployment.go
diff --git a/pkg/model/domain.go b/pkg/model/domain.go
diff --git a/pkg/model/project.go b/pkg/model/project.go
diff --git a/pkg/model/user.go b/pkg/model/user.go
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
diff --git a/pkg/prompt/prompter.go b/pkg/prompt/prompter.go

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func NewCmdAuth(f cmdutil.Factory) cobra.Command {`
`22`	`22`	`cmd.AddCommand(authLoginCmd.NewCmdLogin(f))`
`23`	`23`	`cmd.AddCommand(authLogoutCmd.NewCmdLogout(f))`
`24`	`24`	`cmd.AddCommand(authStatusCmd.NewCmdStatus(f))`
`25`		`- //cmd.AddCommand(authTokenCmd.NewCmdToken(f, nil))`
	`25`	`+ // cmd.AddCommand(authTokenCmd.NewCmdToken(f, nil))`
`26`	`26`
`27`	`27`	`return cmd`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ import (`
`6`	`6`	`"github.com/zeabur/cli/internal/cmdutil"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type logoutOptions struct {`
`10`		`-}`
	`9`	`+type logoutOptions struct{}`
`11`	`10`
`12`	`11`	`func NewCmdLogout(f cmdutil.Factory) cobra.Command {`
`13`	`12`	`opts := &logoutOptions{}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ import (`
`6`	`6`	`"github.com/zeabur/cli/internal/cmdutil"`
`7`	`7`	`)`
`8`	`8`
`9`		`-type Options struct {`
`10`		`-}`
	`9`	`+type Options struct{}`
`11`	`10`
`12`	`11`	`func NewCmdClear(f cmdutil.Factory) cobra.Command {`
`13`	`12`	`opts := &Options{}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type Options struct {`
`15`		`- //todo: support service name`
	`15`	`+ // todo: support service name`
`16`	`16`	`serviceID string`
`17`	`17`	`serviceName string`
`18`	`18`	`environmentID string`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ func runDelete(f *cmdutil.Factory, opts Options) error {`
`35`	`35`	`return runDeleteInteractive(f, opts)`
`36`	`36`	`}`
`37`	`37`	`return runDeleteNonInteractive(f, opts)`
`38`		`-`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`func runDeleteInteractive(f *cmdutil.Factory, opts Options) error {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ func runGet(f *cmdutil.Factory, opts Options) error {`
`35`	`35`	`return runGetInteractive(f, opts)`
`36`	`36`	`}`
`37`	`37`	`return runGetNonInteractive(f, opts)`
`38`		`-`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`func runGetInteractive(f *cmdutil.Factory, opts Options) error {`