Cr 17130 jira pat 2 (#567)

Author: andrii-codefresh

incubating/jira-issue-manager/script/jira_issue_manager.py

@@ -10,13 +10,14 @@
 from requests.auth import HTTPBasicAuth
 
 class Environment:
-    def __init__(self, jira_base_url, jira_username, jira_api_key, action,
+    def __init__(self, jira_base_url, jira_username, jira_api_key, jira_server_pat, action,
         issue, issue_project, issue_summary, issue_description, issue_type, issue_components, issue_customfields,
         existing_comment_id, comment_body, status, jql_query, jql_query_max_results,
         verbose):
         self.jira_base_url = jira_base_url
         self.jira_username = jira_username
         self.jira_api_key = jira_api_key
+        self.jira_server_pat = jira_server_pat
         self.action = action
         self.issue = issue
         self.issue_project = issue_project
@@ -32,9 +33,23 @@ def __init__(self, jira_base_url, jira_username, jira_api_key, action,
         self.jql_query_max_results = jql_query_max_results
         self.verbose = verbose
 
+def valudate_input(current_environment):
+    if not current_environment.jira_api_key and current_environment.jira_username:
+        raise Exception('JIRA_API_KEY required for basic authentication')
+
+    if current_environment.jira_api_key and not current_environment.jira_username:
+        raise Exception('JIRA_USERNAME required for basic authentication')
+
+    if not current_environment.jira_api_key and not current_environment.jira_server_pat:
+        raise Exception('Credentials not provided')
+
+    if current_environment.jira_api_key and current_environment.jira_server_pat:
+        raise Exception('Only one of JIRA_API_KEY and JIRA_SERVER_PAT allowed')
+
 
 def main():
     current_environment = environment_setup()
+    valudate_input(current_environment)
     authenticated_jira = authentication(current_environment)
     step_action(current_environment.action, authenticated_jira, current_environment)
 
@@ -45,6 +60,7 @@ def environment_setup():
     jira_base_url = StepUtility.getEnvironmentVariable('JIRA_BASE_URL', env)
     jira_username = StepUtility.getEnvironmentVariable('JIRA_USERNAME', env)
     jira_api_key = StepUtility.getEnvironmentVariable('JIRA_API_KEY', env)
+    jira_server_pat = StepUtility.getEnvironmentVariable('JIRA_SERVER_PAT', env)
     action = StepUtility.getEnvironmentVariable('ACTION', env)
 
     # Logic here to use the regex to grab the jira issue key and assign it to issue
@@ -100,6 +116,7 @@ def environment_setup():
         jira_base_url,
         jira_username,
         jira_api_key,
+        jira_server_pat,
         action,
         issue,
         issue_project,
@@ -118,6 +135,14 @@ def environment_setup():
 
 
 def authentication(current_environment):
+    if current_environment.jira_server_pat:
+        # Jira Server authentication with a PAT
+        jira = JIRA(
+            current_environment.jira_base_url,
+            token_auth=current_environment.jira_server_pat
+        )
+        return jira
+
     # Basic authentication with an API Token
     jira = JIRA(
         current_environment.jira_base_url,

incubating/jira-issue-manager/step.yaml

@@ -2,7 +2,7 @@ kind: step-type
 version: '1.0'
 metadata:
   name: jira-issue-manager
-  version: 1.0.10
+  version: 1.0.11
   title: Jira Issue Manager
   isPublic: true
   description: Create, Update, & Validate Jira Issues
@@ -158,9 +158,7 @@ spec:
         "additionalProperties": false,
         "patterns": [],
         "required": [
-            "JIRA_BASE_URL",
-            "JIRA_USERNAME",
-            "JIRA_API_KEY"
+            "JIRA_BASE_URL"
         ],
         "properties": {
             "JIRA_BASE_URL": {
@@ -175,6 +173,10 @@ spec:
                 "type": "string",
                 "description": "Jira API key"
             },
+            "JIRA_SERVER_PAT": {
+                "type": "string",
+                "description": "Jira Personal Access Token for Jira Server"
+            },
             "ACTION": {
                 "type": "string",
                 "description": "Specifies the type of action to perform against your Jira instance - please see the examples and readme"
@@ -243,7 +245,7 @@ spec:
   stepsTemplate: |-
     main:
         name: jira-issue-manager
-        image: quay.io/codefreshplugins/jira-issue-manager:1.0.10
+        image: quay.io/codefreshplugins/jira-issue-manager:1.0.11
         environment:
         [[ range $key, $val := .Arguments ]]
           - '[[ $key ]]=[[ $val ]]'