فهرست منبع

json unmarshal error

Mohammed Nafees 3 سال پیش
والد
کامیت
e7fa09e916
4فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 2 2
      api/client/environment.go
  2. 1 1
      api/server/handlers/environment/list.go
  3. 2 0
      api/types/environment.go
  4. 3 2
      cli/cmd/apply.go

+ 2 - 2
api/client/environment.go

@@ -10,8 +10,8 @@ import (
 func (c *Client) ListEnvironments(
 	ctx context.Context,
 	projID, clusterID uint,
-) ([]*types.Environment, error) {
-	var resp []*types.Environment
+) (*types.ListEnvironmentsResponse, error) {
+	resp := &types.ListEnvironmentsResponse{}
 
 	err := c.getRequest(
 		fmt.Sprintf("/projects/%d/clusters/%d/environments", projID, clusterID),

+ 1 - 1
api/server/handlers/environment/list.go

@@ -35,7 +35,7 @@ func (c *ListEnvironmentHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	res := make([]*types.Environment, 0)
+	var res types.ListEnvironmentsResponse
 
 	for _, env := range envs {
 		environment := env.ToEnvironmentType()

+ 2 - 0
api/types/environment.go

@@ -110,3 +110,5 @@ type PullRequest struct {
 	BranchFrom string `json:"branch_from"`
 	BranchInto string `json:"branch_into"`
 }
+
+type ListEnvironmentsResponse []*Environment

+ 3 - 2
cli/cmd/apply.go

@@ -721,8 +721,9 @@ func (t *DeploymentHook) PreApply() error {
 		return err
 	}
 
-	for _, env := range envList {
-		fmt.Println(env)
+	envs := *envList
+
+	for _, env := range envs {
 		if env.GitRepoOwner == t.repoOwner && env.GitRepoName == t.repoName && env.GitInstallationID == t.gitInstallationID {
 			t.envID = env.ID
 			break