Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/configure/profile/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import (
)

var (
tokenFormat = regexp.MustCompile(`^\d+:[0-9a-zA-z]{32}$`)
legacyTokenFormat = regexp.MustCompile(`^\d+:[0-9a-zA-Z]{32}$`)
patTokenFormat = regexp.MustCompile(`^bns_pat_[A-Za-z0-9]{32,}$`)

ErrInvalidToken = errors.New("invalid token")
)
Expand Down Expand Up @@ -257,7 +258,7 @@ func validateToken(input interface{}) error {
return interactive.ErrInvalidValue
}

if !tokenFormat.Match([]byte(value)) {
if !legacyTokenFormat.MatchString(value) && !patTokenFormat.MatchString(value) {
return fmt.Errorf("%w: token is invalid", interactive.ErrInvalidValue)
}

Expand Down
12 changes: 10 additions & 2 deletions cmd/pipeline/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,16 @@ func init() {
}, ", ")

flags.StringArrayVar(&jobs, "job", jobs, "Filter to specific job ID(s) (repeatable)")
flags.StringArrayVar(&jobStatuses, "jobStatus", jobStatuses, fmt.Sprintf("Filter by job status (repeatable); possible values: %s", jobStatusValues))
flags.StringArrayVar(&stepStatuses, "stepStatus", stepStatuses, fmt.Sprintf("Filter by step status (repeatable); possible values: %s", stepStatusValues))
flags.StringArrayVar(&jobStatuses, "job-status", jobStatuses, fmt.Sprintf("Filter by job status (repeatable); possible values: %s", jobStatusValues))
flags.StringArrayVar(&stepStatuses, "step-status", stepStatuses, fmt.Sprintf("Filter by step status (repeatable); possible values: %s", stepStatusValues))

// Backward-compatible aliases for existing automation scripts.
flags.StringArrayVar(&jobStatuses, "jobStatus", jobStatuses, "")
flags.StringArrayVar(&stepStatuses, "stepStatus", stepStatuses, "")
_ = flags.MarkHidden("jobStatus")
_ = flags.MarkHidden("stepStatus")
_ = flags.MarkDeprecated("jobStatus", "use --job-status")
_ = flags.MarkDeprecated("stepStatus", "use --step-status")

mainCmd.AddCommand(command)
}
Loading