Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions cmd/digger/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -987,3 +987,22 @@ func TestGitHubNewPullRequestInMultiEnvProjectContext(t *testing.T) {
assert.Equal(t, 1, len(commandsToRunPerProject))
assert.NoError(t, err)
}

func TestGitHubTestPRCommandCaseInsensitivity(t *testing.T) {
ghEvent := gh_models.IssueCommentEvent{}
ghEvent.Comment.Body = "DiGGeR PlAn"

project := configuration.Project{Name: "test project", Workflow: "default"}
var impactedProjects []configuration.Project
impactedProjects = make([]configuration.Project, 1)
impactedProjects[0] = project
var requestedProject = project
workflows := make(map[string]configuration.Workflow, 1)
workflows["default"] = configuration.Workflow{}

commandsToRunPerProject, _, err := github.ConvertGithubEventToCommands(ghEvent, impactedProjects, &requestedProject, workflows)

assert.Equal(t, 1, len(commandsToRunPerProject))
assert.Equal(t, "digger plan", commandsToRunPerProject[0].Commands[0])
assert.NoError(t, err)
}
5 changes: 1 addition & 4 deletions pkg/azure/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,8 @@ func ConvertAzureEventToCommands(parseAzureContext Azure, impactedProjects []con
}
return commandsPerProject, true, nil
case AzurePrCommented:

diggerCommand := parseAzureContext.Event.(AzureCommentEvent).Resource.Comment.Content

diggerCommand := strings.ToLower(parseAzureContext.Event.(AzureCommentEvent).Resource.Comment.Content)
coversAllImpactedProjects := true

runForProjects := impactedProjects

if requestedProject != nil {
Expand Down
4 changes: 3 additions & 1 deletion pkg/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,10 @@ func ConvertGithubEventToCommands(event models.Event, impactedProjects []configu
}
}

diggerCommand := strings.ToLower(event.Comment.Body)

for _, command := range supportedCommands {
if strings.Contains(event.Comment.Body, command) {
if strings.Contains(diggerCommand, command) {
for _, project := range runForProjects {
workflow, ok := workflows[project.Workflow]
if !ok {
Expand Down
8 changes: 5 additions & 3 deletions pkg/gitlab/gitlab.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ func ProcessGitLabEvent(gitlabContext *GitLabContext, diggerConfig *configuratio

switch gitlabContext.EventType {
case MergeRequestComment:
requestedProject := utils.ParseProjectName(gitlabContext.DiggerCommand)
diggerCommand := strings.ToLower(gitlabContext.DiggerCommand)
requestedProject := utils.ParseProjectName(diggerCommand)

if requestedProject == "" {
return impactedProjects, nil, nil
Expand Down Expand Up @@ -311,15 +312,16 @@ func ConvertGitLabEventToCommands(event GitLabEvent, gitLabContext *GitLabContex
}
}

diggerCommand := strings.ToLower(gitLabContext.DiggerCommand)
for _, command := range supportedCommands {
if strings.Contains(gitLabContext.DiggerCommand, command) {
if strings.Contains(diggerCommand, command) {
for _, project := range runForProjects {
workflow, ok := workflows[project.Workflow]
if !ok {
workflow = workflows["default"]
}
workspace := project.Workspace
workspaceOverride, err := utils.ParseWorkspace(gitLabContext.DiggerCommand)
workspaceOverride, err := utils.ParseWorkspace(diggerCommand)
if err != nil {
return []models.ProjectCommand{}, false, err
}
Expand Down