This commit is contained in:
qwerty287 2024-08-14 21:37:05 +02:00 committed by GitHub
parent acd862cac3
commit bcecbbd398
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 23 additions and 21 deletions

View file

@ -65,7 +65,7 @@ func TestStepLabel(t *testing.T) {
} }
func TestTinyPod(t *testing.T) { func TestTinyPod(t *testing.T) {
expected := ` const expected = `
{ {
"metadata": { "metadata": {
"name": "wp-01he8bebctabr3kgk0qj36d2me-0", "name": "wp-01he8bebctabr3kgk0qj36d2me-0",
@ -149,7 +149,7 @@ func TestTinyPod(t *testing.T) {
} }
func TestFullPod(t *testing.T) { func TestFullPod(t *testing.T) {
expected := ` const expected = `
{ {
"metadata": { "metadata": {
"name": "wp-01he8bebctabr3kgk0qj36d2me-0", "name": "wp-01he8bebctabr3kgk0qj36d2me-0",
@ -429,7 +429,7 @@ func TestPodPrivilege(t *testing.T) {
} }
func TestScratchPod(t *testing.T) { func TestScratchPod(t *testing.T) {
expected := ` const expected = `
{ {
"metadata": { "metadata": {
"name": "wp-01he8bebctabr3kgk0qj36d2me-0", "name": "wp-01he8bebctabr3kgk0qj36d2me-0",
@ -474,7 +474,7 @@ func TestScratchPod(t *testing.T) {
} }
func TestSecrets(t *testing.T) { func TestSecrets(t *testing.T) {
expected := ` const expected = `
{ {
"metadata": { "metadata": {
"name": "wp-3kgk0qj36d2me01he8bebctabr-0", "name": "wp-3kgk0qj36d2me01he8bebctabr-0",

View file

@ -172,7 +172,7 @@ func (l *Linter) lintTrusted(config *WorkflowConfig, c *types.Container, area st
if len(c.NetworkMode) != 0 { if len(c.NetworkMode) != 0 {
errors = append(errors, "Insufficient privileges to use network_mode") errors = append(errors, "Insufficient privileges to use network_mode")
} }
if c.Volumes.Volumes != nil && len(c.Volumes.Volumes) != 0 { if len(c.Volumes.Volumes) != 0 {
errors = append(errors, "Insufficient privileges to use volumes") errors = append(errors, "Insufficient privileges to use volumes")
} }
if len(c.Tmpfs) != 0 { if len(c.Tmpfs) != 0 {

View file

@ -138,7 +138,7 @@ func (s *RPC) Update(_ context.Context, strWorkflowID string, state rpc.StepStat
Int64("stepPipelineID", step.PipelineID). Int64("stepPipelineID", step.PipelineID).
Int64("currentPipelineID", currentPipeline.ID). Int64("currentPipelineID", currentPipeline.ID).
Msg(msg) Msg(msg)
return fmt.Errorf(msg) return errors.New(msg)
} }
repo, err := s.store.GetRepo(currentPipeline.RepoID) repo, err := s.store.GetRepo(currentPipeline.RepoID)

View file

@ -16,6 +16,7 @@ package pipeline
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -37,7 +38,7 @@ func Approve(ctx context.Context, store store.Store, currentPipeline *model.Pipe
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName) msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName)
log.Error().Err(err).Str("repo", repo.FullName).Msg(msg) log.Error().Err(err).Str("repo", repo.FullName).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
// fetch the pipeline file from the database // fetch the pipeline file from the database
@ -84,7 +85,7 @@ func Approve(ctx context.Context, store store.Store, currentPipeline *model.Pipe
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to createPipelineItems for %s", repo.FullName) msg := fmt.Sprintf("failure to createPipelineItems for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
// we have no way to link old workflows and steps in database to new engine generated steps, // we have no way to link old workflows and steps in database to new engine generated steps,
@ -100,7 +101,7 @@ func Approve(ctx context.Context, store store.Store, currentPipeline *model.Pipe
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to start pipeline for %s: %v", repo.FullName, err) msg := fmt.Sprintf("failure to start pipeline for %s: %v", repo.FullName, err)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
return currentPipeline, nil return currentPipeline, nil

View file

@ -38,7 +38,7 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to find repo owner via id '%d'", repo.UserID) msg := fmt.Sprintf("failure to find repo owner via id '%d'", repo.UserID)
log.Error().Err(err).Str("repo", repo.FullName).Msg(msg) log.Error().Err(err).Str("repo", repo.FullName).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
if pipeline.Event == model.EventPush || pipeline.Event == model.EventPull || pipeline.Event == model.EventPullClosed { if pipeline.Event == model.EventPush || pipeline.Event == model.EventPull || pipeline.Event == model.EventPullClosed {
@ -57,7 +57,7 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName) msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName)
log.Error().Err(err).Str("repo", repo.FullName).Msg(msg) log.Error().Err(err).Str("repo", repo.FullName).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
// If the forge has a refresh token, the current access token // If the forge has a refresh token, the current access token
@ -117,7 +117,7 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
if err != nil { if err != nil {
msg := fmt.Sprintf("failed to find or persist pipeline config for %s", repo.FullName) msg := fmt.Sprintf("failed to find or persist pipeline config for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
configs = append(configs, config) configs = append(configs, config)
} }
@ -125,7 +125,7 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
if err := linkPipelineConfigs(_store, configs, pipeline.ID); err != nil { if err := linkPipelineConfigs(_store, configs, pipeline.ID); err != nil {
msg := fmt.Sprintf("failed to find or persist pipeline config for %s", repo.FullName) msg := fmt.Sprintf("failed to find or persist pipeline config for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
if err := prepareStart(ctx, _forge, _store, pipeline, repoUser, repo); err != nil { if err := prepareStart(ctx, _forge, _store, pipeline, repoUser, repo); err != nil {
@ -145,7 +145,7 @@ func Create(ctx context.Context, _store store.Store, repo *model.Repo, pipeline
if err != nil { if err != nil {
msg := fmt.Sprintf("failed to start pipeline for %s", repo.FullName) msg := fmt.Sprintf("failed to start pipeline for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
return pipeline, nil return pipeline, nil

View file

@ -16,6 +16,7 @@ package pipeline
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -31,7 +32,7 @@ func Decline(ctx context.Context, store store.Store, pipeline *model.Pipeline, u
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName) msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName)
log.Error().Err(err).Str("repo", repo.FullName).Msg(msg) log.Error().Err(err).Str("repo", repo.FullName).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
if pipeline.Status != model.StatusBlocked { if pipeline.Status != model.StatusBlocked {

View file

@ -33,7 +33,7 @@ func Restart(ctx context.Context, store store.Store, lastPipeline *model.Pipelin
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName) msg := fmt.Sprintf("failure to load forge for repo '%s'", repo.FullName)
log.Error().Err(err).Str("repo", repo.FullName).Msg(msg) log.Error().Err(err).Str("repo", repo.FullName).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
switch lastPipeline.Status { switch lastPipeline.Status {
@ -70,7 +70,7 @@ func Restart(ctx context.Context, store store.Store, lastPipeline *model.Pipelin
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to save pipeline for %s", repo.FullName) msg := fmt.Sprintf("failure to save pipeline for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
if len(configs) == 0 { if len(configs) == 0 {
@ -85,27 +85,27 @@ func Restart(ctx context.Context, store store.Store, lastPipeline *model.Pipelin
if err := linkPipelineConfigs(store, configs, newPipeline.ID); err != nil { if err := linkPipelineConfigs(store, configs, newPipeline.ID); err != nil {
msg := fmt.Sprintf("failure to persist pipeline config for %s.", repo.FullName) msg := fmt.Sprintf("failure to persist pipeline config for %s.", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
newPipeline, pipelineItems, err := createPipelineItems(ctx, forge, store, newPipeline, user, repo, pipelineFiles, envs) newPipeline, pipelineItems, err := createPipelineItems(ctx, forge, store, newPipeline, user, repo, pipelineFiles, envs)
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to createPipelineItems for %s", repo.FullName) msg := fmt.Sprintf("failure to createPipelineItems for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
if err := prepareStart(ctx, forge, store, newPipeline, user, repo); err != nil { if err := prepareStart(ctx, forge, store, newPipeline, user, repo); err != nil {
msg := fmt.Sprintf("failure to prepare pipeline for %s", repo.FullName) msg := fmt.Sprintf("failure to prepare pipeline for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
newPipeline, err = start(ctx, forge, store, newPipeline, user, repo, pipelineItems) newPipeline, err = start(ctx, forge, store, newPipeline, user, repo, pipelineItems)
if err != nil { if err != nil {
msg := fmt.Sprintf("failure to start pipeline for %s", repo.FullName) msg := fmt.Sprintf("failure to start pipeline for %s", repo.FullName)
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
return nil, fmt.Errorf(msg) return nil, errors.New(msg)
} }
return newPipeline, nil return newPipeline, nil