Skip to content

Commit ce37338

Browse files
authored
eliminate usage of diggerconfig in comment updater provider (#1680)
1 parent 9b72be0 commit ce37338

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

cli/pkg/spec/spec.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,14 @@ func RunSpec(
8080

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

93-
// TODO: instead of passing diggerConfig we simply pass the renderMode needed by comment updater provider
94-
commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
89+
// TODO: render mode being passable from the string
90+
commentUpdater, err := commentUpdaterProvider.Get(digger_config.CommentRenderModeBasic)
9591
if err != nil {
9692
message := fmt.Sprintf("could not get comment updater: %v", err)
9793
reportError(spec, backendApi, message, err)

ee/cli/pkg/comment_updater/provider.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
type CommentUpdaterProviderAdvanced struct {
1010
}
1111

12-
func (c CommentUpdaterProviderAdvanced) Get(config digger_config.DiggerConfig) (comment_updater.CommentUpdater, error) {
13-
if config.CommentRenderMode == digger_config.CommentRenderModeBasic {
12+
func (c CommentUpdaterProviderAdvanced) Get(renderMode string) (comment_updater.CommentUpdater, error) {
13+
if renderMode == digger_config.CommentRenderModeBasic {
1414
return comment_updater.BasicCommentUpdater{}, nil
15-
} else if config.CommentRenderMode == digger_config.CommentRenderModeGroupByModule {
15+
} else if renderMode == digger_config.CommentRenderModeGroupByModule {
1616
commentUpdater := comment_updater.BasicCommentUpdater{}
1717
return commentUpdater, nil
1818
} else {
19-
return nil, fmt.Errorf("Unknown comment render mode found: %v", config.CommentRenderMode)
19+
return nil, fmt.Errorf("Unknown comment render mode found: %v", renderMode)
2020
}
2121
}

libs/comment_utils/summary/provider.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import (
66
)
77

88
type CommentUpdaterProvider interface {
9-
Get(config digger_config.DiggerConfig) (CommentUpdater, error)
9+
Get(renderMode string) (CommentUpdater, error)
1010
}
1111

1212
type CommentUpdaterProviderBasic struct{}
1313

14-
func (c CommentUpdaterProviderBasic) Get(config digger_config.DiggerConfig) (CommentUpdater, error) {
15-
if config.CommentRenderMode == digger_config.CommentRenderModeBasic {
14+
func (c CommentUpdaterProviderBasic) Get(renderMode string) (CommentUpdater, error) {
15+
if renderMode == digger_config.CommentRenderModeBasic {
1616
return BasicCommentUpdater{}, nil
17-
} else if config.CommentRenderMode == digger_config.CommentRenderModeGroupByModule {
17+
} else if renderMode == digger_config.CommentRenderModeGroupByModule {
1818

1919
commentUpdater := BasicCommentUpdater{}
2020
return commentUpdater, nil
2121
} else {
22-
return nil, fmt.Errorf("Unknown comment render mode found: %v", config.CommentRenderMode)
22+
return nil, fmt.Errorf("Unknown comment render mode found: %v", renderMode)
2323
}
2424
}

0 commit comments

Comments
 (0)