Skip to content

Commit e988d6e

Browse files
Merge pull request #74 from atlassian/BIF-1852-parser-fix
BIF-1852 fix parser to allow unknown arguments for parsing
2 parents e768d89 + 8ceb4c2 commit e988d6e

File tree

23 files changed

+46
-23
lines changed

23 files changed

+46
-23
lines changed

bmc-footprints-v11/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
parser.add_argument('-incidentWorkspaceId', '--incidentWorkspaceId', help='Incident Workspace ID', required=False)
1818
parser.add_argument('-problemWorkspaceId', '--problemWorkspaceId', help='Problem Workspace ID', required=False)
1919

20-
args = vars(parser.parse_args())
20+
args, unknown = parser.parse_known_args()
21+
args = vars(args)
2122

2223
queue_message_string = args['queuePayload']
2324
queue_message = json.loads(queue_message_string)

bmc-footprints-v12/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
parser.add_argument('-password', '--password', help='Password', required=False)
1919
parser.add_argument('-workspaceName', '--workspaceName', help='Workspace Name', required=False)
2020

21-
args = vars(parser.parse_args())
21+
args, unknown = parser.parse_known_args()
22+
args = vars(args)
2223

2324
queue_message_string = args['queuePayload']
2425
queue_message = json.loads(queue_message_string)

bmc-remedy/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
parser.add_argument('-midtierServerUrl', '--midtierServerUrl', help='MidTier Server Url', required=False)
1717
parser.add_argument('-serverName', '--serverName', help='Server name', required=False)
1818

19-
args = vars(parser.parse_args())
19+
args, unknown = parser.parse_known_args()
20+
args = vars(args)
2021

2122
queue_message_string = args['payload']
2223
queue_message = json.loads(queue_message_string)

cherwell/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
parser.add_argument('-password', '--password', help='Password', required=False)
3030
parser.add_argument('-apiUrl', '--apiUrl', help='API Url', required=False)
3131
parser.add_argument('-clientId', '--clientId', help='Client Id', required=False)
32-
args = vars(parser.parse_args())
32+
args, unknown = parser.parse_known_args()
33+
args = vars(args)
3334

3435
queue_message_string = args.get('payload')
3536
queue_message = json.loads(queue_message_string)

icinga/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
parser.add_argument('-expire_acknowledgement_after', '-expire_acknowledgement_after',
3030
help='Removes acknowledgement after given value (in minutes.)', required=False)
3131

32-
args = vars(parser.parse_args())
32+
args, unknown = parser.parse_known_args()
33+
args = vars(args)
3334

3435
queue_message_string = args['queuePayload']
3536
queue_message = json.loads(queue_message_string)

icinga2/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
help='Removes acknowledgement after given value (in minutes.)', required=False)
2626
parser.add_argument('-insecure', '--insecure', help='Skip verifying SSL certificate', required=False)
2727

28-
args = vars(parser.parse_args())
28+
args, unknown = parser.parse_known_args()
29+
args = vars(args)
2930

3031
queue_message_string = args['queuePayload']
3132
queue_message = json.loads(queue_message_string)

jec/scripts/http.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
parser.add_argument('-headers', '--headers', type=json.loads, required=False)
1414
parser.add_argument('-params', '--params', type=json.loads, required=False)
1515
parser.add_argument('-body', '--body', required=False)
16-
args = vars(parser.parse_args())
16+
args, unknown = parser.parse_known_args()
17+
args = vars(args)
1718

1819
raw_message = args['queuePayload']
1920
raw_message = raw_message.strip()

jira-service-management/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
parser.add_argument('-password', '--password', help='Password', required=False)
1717
parser.add_argument('-key', '--key', help='Project key', required=False)
1818
parser.add_argument('-issueTypeName', '--issueTypeName', help='Issue Type', required=False)
19-
args = vars(parser.parse_args())
19+
args, unknown = parser.parse_known_args()
20+
args = vars(args)
2021

2122
logging.basicConfig(stream=sys.stdout, level=args['logLevel'])
2223

jira-software/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
parser.add_argument('-url', '--url', help='URL', required=False)
1717
parser.add_argument('-projectKey', '--projectKey', help='Project Key', required=False)
1818
parser.add_argument('-issueTypeName', '--issueTypeName', help='Issue Type', required=False)
19-
args = vars(parser.parse_args())
19+
args, unknown = parser.parse_known_args()
20+
args = vars(args)
2021

2122
logging.basicConfig(stream=sys.stdout, level=args['logLevel'])
2223

librenms/scripts/jec_action_executor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
parser.add_argument('-apiToken', '--apiToken', help='Api Token', required=False)
1515
parser.add_argument('-timeout', '--timeout', help='Timeout', required=False)
1616

17-
args = vars(parser.parse_args())
17+
args, unknown = parser.parse_known_args()
18+
args = vars(args)
1819

1920
logging.basicConfig(stream=sys.stdout, level=args['logLevel'])
2021

0 commit comments

Comments
 (0)