Skip to content

Commit 840207d

Browse files
authored
Merge pull request ActiveState#3240 from ActiveState/version/0-43-0-RC10
Version 0.43.0-RC10
2 parents 9547b2b + 77ed85b commit 840207d

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

internal/runners/artifacts/artifacts.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package artifacts
22

33
import (
4+
"errors"
45
"fmt"
56
"sort"
67
"strings"
@@ -12,9 +13,11 @@ import (
1213
"github.com/ActiveState/cli/internal/locale"
1314
"github.com/ActiveState/cli/internal/output"
1415
"github.com/ActiveState/cli/internal/primer"
16+
"github.com/ActiveState/cli/internal/rtutils/ptr"
1517
"github.com/ActiveState/cli/internal/runbits/rationalize"
1618
"github.com/ActiveState/cli/pkg/localcommit"
1719
bpModel "github.com/ActiveState/cli/pkg/platform/api/buildplanner/model"
20+
"github.com/ActiveState/cli/pkg/platform/api/buildplanner/request"
1821
"github.com/ActiveState/cli/pkg/platform/authentication"
1922
"github.com/ActiveState/cli/pkg/platform/model"
2023
"github.com/ActiveState/cli/pkg/platform/runtime/buildplan"
@@ -92,12 +95,19 @@ type errInvalidCommitId struct {
9295
id string
9396
}
9497

95-
func rationalizeArtifactsError(err *error, auth *authentication.Auth) {
96-
switch {
97-
case err == nil:
98+
func rationalizeArtifactsError(rerr *error, auth *authentication.Auth) {
99+
if rerr == nil {
98100
return
101+
}
102+
103+
var planningError *bpModel.BuildPlannerError
104+
switch {
105+
case errors.As(*rerr, &planningError):
106+
// Forward API error to user.
107+
*rerr = errs.WrapUserFacing(*rerr, planningError.Error())
108+
99109
default:
100-
rationalizeCommonError(err, auth)
110+
rationalizeCommonError(rerr, auth)
101111
}
102112
}
103113

@@ -253,7 +263,7 @@ func getTerminalArtifactMap(
253263
pb.Stop(message + "\n") // extra empty line
254264
}()
255265

256-
var targetPtr *string
266+
targetPtr := ptr.To(request.TargetAll)
257267
if target != "" {
258268
targetPtr = &target
259269
}

internal/runners/artifacts/download.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/ActiveState/cli/internal/httputil"
1717
"github.com/ActiveState/cli/internal/locale"
1818
"github.com/ActiveState/cli/internal/output"
19+
"github.com/ActiveState/cli/pkg/platform/api/buildplanner/request"
1920
"github.com/ActiveState/cli/pkg/platform/authentication"
2021
"github.com/ActiveState/cli/pkg/platform/model"
2122
"github.com/ActiveState/cli/pkg/platform/runtime/artifact"
@@ -80,8 +81,13 @@ func (d *Download) Run(params *DownloadParams) (rerr error) {
8081
d.out.Notice(locale.Tr("operating_message", d.project.NamespaceString(), d.project.Dir()))
8182
}
8283

84+
target := request.TargetAll
85+
if params.Target != "" {
86+
target = params.Target
87+
}
88+
8389
terminalArtfMap, _, _, err := getTerminalArtifactMap(
84-
d.project, params.Namespace, params.CommitID, params.Target, d.auth, d.out)
90+
d.project, params.Namespace, params.CommitID, target, d.auth, d.out)
8591
if err != nil {
8692
return errs.Wrap(err, "Could not get build plan map")
8793
}

pkg/platform/api/buildplanner/request/buildplan.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"github.com/ActiveState/cli/internal/rtutils/ptr"
66
)
77

8+
const TargetAll = "__all__"
9+
810
func BuildPlan(commitID, organization, project string, target *string) gqlclient.Request {
911
if organization == "" && project == "" {
1012
return BuildPlanByCommitID(commitID, ptr.From(target, ""))

0 commit comments

Comments
 (0)