Skip to content

Commit

Permalink
Do not validate commit ID from within projectfile.
Browse files Browse the repository at this point in the history
Doing so prevents `state reset` to fix a bad ID.

Any runners that need a commit ID get it from localcommit, which raises an invalid commit ID error.
  • Loading branch information
mitchell-as committed Sep 16, 2024
1 parent f9ffd04 commit d36b007
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions pkg/projectfile/projectfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/ActiveState/cli/internal/sliceutils"
"github.com/ActiveState/cli/internal/strutils"
"github.com/ActiveState/cli/pkg/sysinfo"
"github.com/go-openapi/strfmt"
"github.com/google/uuid"
"github.com/imdario/mergo"
"github.com/spf13/cast"
Expand Down Expand Up @@ -660,19 +659,6 @@ func (p *Project) parseURL() (projectURL, error) {
return parseURL(p.Project)
}

func validateUUID(uuidStr string) error {
if ok := strfmt.Default.Validates("uuid", uuidStr); !ok {
return locale.NewError("err_commit_id_invalid", "", uuidStr)
}

var uuid strfmt.UUID
if err := uuid.UnmarshalText([]byte(uuidStr)); err != nil {
return locale.WrapError(err, "err_commit_id_unmarshal", "Failed to unmarshal the commit id {{.V0}} read from activestate.yaml.", uuidStr)
}

return nil
}

func parseURL(rawURL string) (projectURL, error) {
p := projectURL{}

Expand Down Expand Up @@ -701,12 +687,6 @@ func parseURL(rawURL string) (projectURL, error) {
p.LegacyCommitID = c
}

if p.LegacyCommitID != "" {
if err := validateUUID(p.LegacyCommitID); err != nil {
return p, err
}
}

if b := q.Get("branch"); b != "" {
p.BranchName = b
}
Expand Down

0 comments on commit d36b007

Please sign in to comment.