Skip to content
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

Jump to bottom

Refactor return type of ApplyTransformer #885

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Refactor return type of ApplyTransformer #885

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
18 changes: 9 additions & 9 deletions services/cd-service/pkg/repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ func (r *repository) applyElements(elements []element, allowFetchAndReset bool)
var changes = &TransformerResult{}
for i := 0; i < len(elements); {
e := elements[i]
applyErr, subChanges := r.ApplyTransformers(e.ctx, e.transformers...)
subChanges, applyErr := r.ApplyTransformers(e.ctx, e.transformers...)
changes.Combine(subChanges)
if applyErr != nil {
if errors.Is(applyErr, invalidJson) && allowFetchAndReset {
Expand Down Expand Up @@ -708,22 +708,22 @@ func CombineArray(others []*TransformerResult) *TransformerResult {
return r
}

func (r *repository) ApplyTransformers(ctx context.Context, transformers ...Transformer) (error, *TransformerResult) {
func (r *repository) ApplyTransformers(ctx context.Context, transformers ...Transformer) (*TransformerResult, error) {
commitMsg, state, changes, err := r.ApplyTransformersInternal(ctx, transformers...)
if err != nil {
return err, nil
return nil, err
}
err = UpdateDatadogMetrics(state)
if err != nil {
return err, nil
return nil, err
}
if err := r.afterTransform(ctx, *state); err != nil {
return grpc.InternalError(ctx, fmt.Errorf("%s: %w", "failure in afterTransform", err)), nil
return nil, grpc.InternalError(ctx, fmt.Errorf("%s: %w", "failure in afterTransform", err))
}

treeId, err := state.Filesystem.(*fs.TreeBuilderFS).Insert()
if err != nil {
return &InternalError{inner: err}, nil
return nil, &InternalError{inner: err}
}
committer := &git.Signature{
Name: r.config.CommitterName,
Expand All @@ -733,7 +733,7 @@ func (r *repository) ApplyTransformers(ctx context.Context, transformers ...Tran

user, err := auth.ReadUserFromContext(ctx)
if err != nil {
return err, nil
return nil, err
}

author := &git.Signature{
Expand All @@ -758,7 +758,7 @@ func (r *repository) ApplyTransformers(ctx context.Context, transformers ...Tran
rev,
)
if err != nil {
return grpc.InternalError(ctx, fmt.Errorf("%s: %w", "createCommitFromIds failed", err)), nil
return nil, grpc.InternalError(ctx, fmt.Errorf("%s: %w", "createCommitFromIds failed", err))
}
result := CombineArray(changes)
result.Commits = &CommitIds{
Expand All @@ -768,7 +768,7 @@ func (r *repository) ApplyTransformers(ctx context.Context, transformers ...Tran
if oldCommitId != nil {
result.Commits.Previous = oldCommitId
}
return nil, result
return result, nil
}

func (r *repository) FetchAndReset(ctx context.Context) error {
Expand Down