Skip to content

Remove duplicate validation code #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2020
Merged

Remove duplicate validation code #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 4 additions & 31 deletions cmd/src/actions_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,6 @@ Format of the action JSON files:

logger := newActionLogger(*verbose, *keepLogsFlag)

err = validateAction(ctx, action)
if err != nil {
return errors.Wrap(err, "Validation of action failed")
}

// Build Docker images etc.
err = prepareAction(ctx, action)
if err != nil {
Expand Down Expand Up @@ -355,38 +350,16 @@ func validateActionDefinition(def []byte) error {
return errs.ErrorOrNil()
}

func validateAction(ctx context.Context, action Action) error {
for _, step := range action.Steps {
if step.Type == "docker" {
if step.Image == "" {
return fmt.Errorf("docker run step has to specify 'image'")
}

if step.ImageContentDigest != "" {
return errors.New("setting the ImageContentDigest field of a docker run step is not allowed")
}
}

if step.Type == "command" && len(step.Args) < 1 {
return errors.New("command run step has to specify 'args'")
}
}

return nil
}

func prepareAction(ctx context.Context, action Action) error {
// Build any Docker images.
for _, step := range action.Steps {
if step.Type == "docker" {
// Set digests for Docker images so we don't cache action runs in 2 different images with
// the same tag.
if step.Image != "" {
var err error
step.ImageContentDigest, err = getDockerImageContentDigest(ctx, step.Image)
if err != nil {
return errors.Wrap(err, "Failed to get Docker image content digest")
}
var err error
step.ImageContentDigest, err = getDockerImageContentDigest(ctx, step.Image)
if err != nil {
return errors.Wrap(err, "Failed to get Docker image content digest")
}
}
}
Expand Down