Skip to content

Commit 7ccb746

Browse files
authored
Return nil when deployment fails (#1369)
1 parent e588c0e commit 7ccb746

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

cli/cmd/deploy.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ func mergeResultMessages(results []schema.DeployResult) string {
251251
}
252252
}
253253

254-
messages := append(okMessages, errMessages...)
255-
256-
return strings.Join(messages, "\n")
254+
return strings.Join(okMessages, "\n") + "\n\n" + strings.Join(errMessages, "\n")
257255
}
258256

259257
func didAllResultsError(results []schema.DeployResult) bool {
@@ -282,7 +280,10 @@ func getAPICommandsMessage(results []schema.DeployResult, envName string) string
282280
items.Add(fmt.Sprintf("cortex get %s%s", apiName, envArg), "(show api info)")
283281

284282
for _, result := range results {
285-
if result.API.Kind == userconfig.RealtimeAPIKind {
283+
if len(result.Error) > 0 {
284+
continue
285+
}
286+
if result.API.API != nil && result.API.Kind == userconfig.RealtimeAPIKind {
286287
items.Add(fmt.Sprintf("cortex logs %s%s", apiName, envArg), "(stream api logs)")
287288
break
288289
}

cli/local/deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func Deploy(env cliconfig.Environment, configPath string, projectFileList []stri
8585
if err != nil {
8686
results[i].Error = errors.Message(err)
8787
} else {
88-
results[i].API = *api
88+
results[i].API = api
8989
}
9090
}
9191

pkg/operator/resources/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func Deploy(projectBytes []byte, configFileName string, configBytes []byte, forc
117117
if err != nil {
118118
results[i].Error = errors.Message(err)
119119
} else {
120-
results[i].API = *api
120+
results[i].API = api
121121
}
122122
}
123123

pkg/operator/schema/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type DeployResponse struct {
4747
}
4848

4949
type DeployResult struct {
50-
API spec.API
50+
API *spec.API
5151
Message string
5252
Error string
5353
}

0 commit comments

Comments
 (0)