diff options
Diffstat (limited to 'bin/acme/srtool_jira_acme.py')
| -rwxr-xr-x | bin/acme/srtool_jira_acme.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/acme/srtool_jira_acme.py b/bin/acme/srtool_jira_acme.py index f11af1df..313a5f1e 100755 --- a/bin/acme/srtool_jira_acme.py +++ b/bin/acme/srtool_jira_acme.py @@ -53,7 +53,7 @@ import os import sys import re import argparse -import sqlite3 +from common.srtool_sql import * import json from datetime import datetime, date @@ -196,7 +196,7 @@ def do_update_jira(): print("CONNECTION TO JIRA FAILED") return 1 - conn = sqlite3.connect(srtDbName) + conn = SQL_CONNECT() c = conn.cursor() today = datetime.today() @@ -252,7 +252,7 @@ def do_update_jira(): conn.commit() c.close() - conn.close() + SQL_CLOSE_CONN(conn) #############################################################################3 ### @@ -468,7 +468,7 @@ def update_project_issues(project, issues, conn, log): except: cve_name_sort = cve.name - sql = ''' INSERT into orm_cve (name, name_sort, priority, status, comments, comments_private, cve_data_type, cve_data_format, cve_data_version, public, publish_state, publish_date, description, publishedDate, lastModifiedDate, recommend, recommend_list, cvssV3_baseScore, cvssV3_baseSeverity, cvssV2_baseScore, cvssV2_severity, packages, srt_updated) + sql = ''' INSERT INTO orm_cve (name, name_sort, priority, status, comments, comments_private, cve_data_type, cve_data_format, cve_data_version, public, publish_state, publish_date, description, publishedDate, lastModifiedDate, recommend, recommend_list, cvssV3_baseScore, cvssV3_baseSeverity, cvssV2_baseScore, cvssV2_severity, packages, srt_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''' c.execute(sql, (cve_name, cve_name_sort, d.priority, cve_status, '', '', '', '', '', 1, 0, '', 'Created from defect %s' % d.name, '', '', 0, '', '', '', '', '', '', datetime.now().strftime(ORM.DATASOURCE_DATETIME_FORMAT))) @@ -562,7 +562,7 @@ def jira_update_list(jira_list): print("CONNECTION TO JIRA FAILED") return 1 - conn = sqlite3.connect(srtDbName) + conn = SQL_CONNECT() c = conn.cursor() products = c.execute('''SELECT * FROM orm_product''').fetchall() @@ -629,7 +629,7 @@ def jira_add_to_defect_db(jira_name): #try connecting to jira try: jira = JIRA(JIRA_PRODUCTION_LINK, auth=(srt_user, srt_passwd)) - conn = sqlite3.connect(srtDbName) + conn = SQL_CONNECT() c = conn.cursor() except Exception as e: print("xhr_investigation_commit:CONNECTION TO JIRA FAILED:(%s)\n" % e, file=sys.stderr) @@ -679,7 +679,7 @@ def jira_add_to_defect_db(jira_name): c.execute(sql, (d.name, d.summary, d.url, d.priority, d.status, d.resolution, str(d.publish), d.release_version, d.product_id, d.date_created, d.date_updated)) conn.commit() c.close() - conn.close() + SQL_CLOSE_CONN(conn) except Exception as e: print("ERROR:could not find/import defect(%s)" % e, file=sys.stderr) return 1 @@ -701,7 +701,7 @@ JIRA_IS_TEST = True JIRA_IS_SIMULATE = True def simulate_new_defect_name(product_prefix): - conn = sqlite3.connect(srtDbName) + conn = SQL_CONNECT() cur = conn.cursor() sql = "SELECT * FROM orm_srtsetting WHERE name='current_defect_simulation_index'" @@ -715,7 +715,7 @@ def simulate_new_defect_name(product_prefix): sql = '''UPDATE orm_srtsetting SET value=? WHERE id = ?''' cur.execute(sql, (index, cvi[ORM.SRTSETTING_ID])) conn.commit() #commit to db - conn.close() + SQL_CLOSE_CONN(conn) defect_name = "%s-%05d" % (product_prefix,index) return defect_name @@ -746,7 +746,7 @@ def jira_new_defect(product_defect_tags,summary,cve_list,description,reason,prio return 1 #srt_error_log("Jira connection made") - conn = sqlite3.connect(srtDbName) + conn = SQL_CONNECT() c = conn.cursor() # append the jira link to description |