Skip to content

Commit

Permalink
eliminate usage of diggerconfig in comment updater provider (#1680)
Browse files Browse the repository at this point in the history
  • Loading branch information
motatoes authored Aug 27, 2024
1 parent 9b72be0 commit ce37338
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
10 changes: 3 additions & 7 deletions cli/pkg/spec/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,14 @@ func RunSpec(

// TODO: avoid calling GetChangedFilesHere, avoid loading digger config entirely
// also see below TODO to leverage variables provider and avoid passing it to commentUpdaterProvider
changedFiles, err := prService.GetChangedFiles(*spec.Job.PullRequestNumber)
if err != nil {
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get changed files: %v", err), 1)
}
diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, changedFiles)
diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, []string{})
if err != nil {
usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
}
log.Printf("Digger digger_config read successfully\n")

// TODO: instead of passing diggerConfig we simply pass the renderMode needed by comment updater provider
commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
// TODO: render mode being passable from the string
commentUpdater, err := commentUpdaterProvider.Get(digger_config.CommentRenderModeBasic)
if err != nil {
message := fmt.Sprintf("could not get comment updater: %v", err)
reportError(spec, backendApi, message, err)
Expand Down
8 changes: 4 additions & 4 deletions ee/cli/pkg/comment_updater/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
type CommentUpdaterProviderAdvanced struct {
}

func (c CommentUpdaterProviderAdvanced) Get(config digger_config.DiggerConfig) (comment_updater.CommentUpdater, error) {
if config.CommentRenderMode == digger_config.CommentRenderModeBasic {
func (c CommentUpdaterProviderAdvanced) Get(renderMode string) (comment_updater.CommentUpdater, error) {
if renderMode == digger_config.CommentRenderModeBasic {
return comment_updater.BasicCommentUpdater{}, nil
} else if config.CommentRenderMode == digger_config.CommentRenderModeGroupByModule {
} else if renderMode == digger_config.CommentRenderModeGroupByModule {
commentUpdater := comment_updater.BasicCommentUpdater{}
return commentUpdater, nil
} else {
return nil, fmt.Errorf("Unknown comment render mode found: %v", config.CommentRenderMode)
return nil, fmt.Errorf("Unknown comment render mode found: %v", renderMode)
}
}
10 changes: 5 additions & 5 deletions libs/comment_utils/summary/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import (
)

type CommentUpdaterProvider interface {
Get(config digger_config.DiggerConfig) (CommentUpdater, error)
Get(renderMode string) (CommentUpdater, error)
}

type CommentUpdaterProviderBasic struct{}

func (c CommentUpdaterProviderBasic) Get(config digger_config.DiggerConfig) (CommentUpdater, error) {
if config.CommentRenderMode == digger_config.CommentRenderModeBasic {
func (c CommentUpdaterProviderBasic) Get(renderMode string) (CommentUpdater, error) {
if renderMode == digger_config.CommentRenderModeBasic {
return BasicCommentUpdater{}, nil
} else if config.CommentRenderMode == digger_config.CommentRenderModeGroupByModule {
} else if renderMode == digger_config.CommentRenderModeGroupByModule {

commentUpdater := BasicCommentUpdater{}
return commentUpdater, nil
} else {
return nil, fmt.Errorf("Unknown comment render mode found: %v", config.CommentRenderMode)
return nil, fmt.Errorf("Unknown comment render mode found: %v", renderMode)
}
}

0 comments on commit ce37338

Please sign in to comment.