implement jira v3 and auth changes (#1022)

* implement jira v3 and auth changes

Signed-off-by: Frank Jogeleit <[email protected]>

* update tests

Signed-off-by: Frank Jogeleit <[email protected]>

---------

Signed-off-by: Frank Jogeleit <[email protected]>

Author: fjogeleit

charts/policy-reporter/Chart.yaml

@@ -5,8 +5,8 @@ description: |
   It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
 type: application
-version: 3.2.2
-appVersion: 3.2.1
+version: 3.2.3
+appVersion: 3.2.2
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
 home: https://kyverno.github.io/policy-reporter

charts/policy-reporter/README.md

@@ -3,7 +3,7 @@
 Policy Reporter watches for PolicyReport Resources.
 It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
-![Version: 3.2.2](https://img.shields.io/badge/Version-3.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.1](https://img.shields.io/badge/AppVersion-3.2.1-informational?style=flat-square)
+![Version: 3.2.3](https://img.shields.io/badge/Version-3.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.2](https://img.shields.io/badge/AppVersion-3.2.2-informational?style=flat-square)
 
 ## Documentation
 
@@ -257,9 +257,11 @@ Open `http://localhost:8082/` in your browser.
 | target.jira.username | string | `""` | JIRA username |
 | target.jira.password | string | `""` | JIRA password (use password or apiToken, not both) |
 | target.jira.apiToken | string | `""` | JIRA API token (use password or apiToken, not both) |
+| target.jira.apiVersion | string | `"v3"` | JIRA static labels |
 | target.jira.projectKey | string | `""` | JIRA project key |
 | target.jira.issueType | string | `""` | JIRA issue type (default: "Bug") |
 | target.jira.components | list | `[]` | JIRA component names list |
+| target.jira.labels | list | `[]` | JIRA static labels |
 | target.jira.summaryTemplate | string | `""` | JIRA summary go template, available values: result, customfield default: "{{ if result.ResourceString }}{{ result.ResourceString }}: {{ end }}Policy Violation: {{ result.Policy }}" |
 | target.jira.certificate | string | `""` | Server Certificate file path Can be added under extraVolumes |
 | target.jira.skipTLS | bool | `false` | Skip TLS verification |

charts/policy-reporter/templates/_helpers.tpl

@@ -224,10 +224,20 @@ config:
   username: {{ .username | quote }}
   password: {{ .password | quote }}
   apiToken: {{ .apiToken | quote }}
+  apiVersion: {{ .apiVersion | quote }}
+  summaryTemplate: {{ .summaryTemplate | quote }}
   projectKey: {{ .projectKey | quote }}
   issueType: {{ .issueType | quote }}
   certificate: {{ .certificate | quote }}
   skipTLS: {{ .skipTLS }}
+  {{- with .labels }}
+  labels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .components }}
+  components:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{ include "target" . }}
 {{- end }}
 

charts/policy-reporter/templates/policyreporter.kyverno.io_targetconfigs.yaml

@@ -224,6 +224,8 @@ spec:
                 properties:
                   apiToken:
                     type: string
+                  apiVersion:
+                    type: string
                   certificate:
                     type: string
                   components:
@@ -234,6 +236,10 @@ spec:
                     type: string
                   issueType:
                     type: string
+                  labels:
+                    items:
+                      type: string
+                    type: array
                   password:
                     type: string
                   projectKey:

charts/policy-reporter/values.yaml

@@ -630,12 +630,16 @@ target:
     password: ""
     # -- JIRA API token (use password or apiToken, not both)
     apiToken: ""
+    # -- JIRA static labels
+    apiVersion: "v3"
     # -- JIRA project key
     projectKey: ""
     # -- JIRA issue type (default: "Bug")
     issueType: ""
     # -- JIRA component names list
     components: []
+    # -- JIRA static labels
+    labels: []
     # -- JIRA summary go template, available values: result, customfield
     # default: "{{ if result.ResourceString }}{{ result.ResourceString }}: {{ end }}Policy Violation: {{ result.Policy }}"
     summaryTemplate: ""

config/crds/policyreporter.kyverno.io_targetconfigs.yaml

@@ -223,6 +223,8 @@ spec:
                 properties:
                   apiToken:
                     type: string
+                  apiVersion:
+                    type: string
                   certificate:
                     type: string
                   components:
@@ -233,6 +235,10 @@ spec:
                     type: string
                   issueType:
                     type: string
+                  labels:
+                    items:
+                      type: string
+                    type: array
                   password:
                     type: string
                   projectKey:

pkg/crd/api/targetconfig/v1alpha1/configs.go

@@ -45,6 +45,10 @@ type JiraOptions struct {
 	// +optional
 	SummaryTemplate string `mapstructure:"summaryTemplate" json:"summaryTemplate"`
 	// +optional
+	APIVersion string `mapstructure:"apiVersion" json:"apiVersion"`
+	// +optional
+	Labels []string `mapstructure:"labels" json:"labels"`
+	// +optional
 	Components []string `mapstructure:"components" json:"components"`
 	// +optional
 	SkipTLS bool `mapstructure:"skipTLS" json:"skipTLS"`

pkg/target/factory/factory.go

@@ -635,6 +635,8 @@ func (f *TargetFactory) CreateJiraTarget(config, parent *targetconfig.Config[v1a
 		IssueType:       config.Config.IssueType,
 		Components:      config.Config.Components,
 		SummaryTemplate: config.Config.SummaryTemplate,
+		APIVersion:      config.Config.APIToken,
+		Labels:          config.Config.Labels,
 		SkipTLS:         config.Config.SkipTLS,
 		Certificate:     config.Config.Certificate,
 		CustomFields:    config.CustomFields,