fix jira override behaviour (#135)

Author: jonathanlam

pkg/merger/merger.go

@@ -50,6 +50,22 @@ func MergeConfigFiles(
 			if config.Integrations.Jira == nil {
 				config.Integrations.Jira = extraConfig.Integrations.Jira
 			} else {
+				if extraConfig.Integrations.Jira.ProjectKey != "" {
+					config.Integrations.Jira.ProjectKey = extraConfig.Integrations.Jira.ProjectKey
+				}
+				if extraConfig.Integrations.Jira.IssueType != "" {
+					config.Integrations.Jira.IssueType = extraConfig.Integrations.Jira.IssueType
+				}
+				if extraConfig.Integrations.Jira.OnFixTransition != "" {
+					config.Integrations.Jira.OnFixTransition = extraConfig.Integrations.Jira.OnFixTransition
+				}
+				if extraConfig.Integrations.Jira.Disabled {
+					config.Integrations.Jira.Disabled = extraConfig.Integrations.Jira.Disabled
+				}
+				if extraConfig.Integrations.Jira.SeverityThreshold != "" {
+					config.Integrations.Jira.SeverityThreshold = extraConfig.Integrations.Jira.SeverityThreshold
+				}
+
 				if extraConfig.Integrations.Jira.Priorities != nil {
 					config.Integrations.Jira.Priorities = extraConfig.Integrations.Jira.Priorities
 				}

pkg/merger/merger_test.go

@@ -524,6 +524,36 @@ func TestMergeJira(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "Jira repo config with project key overriding",
+			globalConfig: &models.Configuration{
+				Integrations: models.Integrations{
+					Jira: &models.Jira{
+						ProjectKey: "projectkey1",
+						IssueType:  "issuetype1",
+					},
+				},
+			},
+			repoConfig: &models.Configuration{
+				Integrations: models.Integrations{
+					Jira: &models.Jira{
+						ProjectKey: "projectkey2",
+					},
+				},
+			},
+			expected: &models.Configuration{
+				EnablePullRequestReviews: models.Bool(true),
+				EnableIssueDashboards:    models.Bool(true),
+				SeverityThreshold:        parser.DefaultSeverityThreshold,
+				PriorityThreshold:        parser.DefaultPriorityThreshold,
+				Integrations: models.Integrations{
+					Jira: &models.Jira{
+						ProjectKey: "projectkey2",
+						IssueType:  "issuetype1",
+					},
+				},
+			},
+		},
 		{
 			name: "secrets custom patterns global",
 			globalConfig: &models.Configuration{