Skip to content

Commit d473568

Browse files
viveksynghviveksyngh
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3938171 + 25bf9e3 commit d473568

File tree

5 files changed

+112
-110
lines changed

5 files changed

+112
-110
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ workflows:
120120
- deploy:
121121
requires:
122122
- build_and_test_python27
123+
- build_and_test_python36
123124
filters:
124125
branches:
125126
only: master

‎config.schema.yaml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
---
2-
url:
3-
description: "URL of the JIRA instance (e.g. ``https://myproject.atlassian.net``)"
4-
type: "string"
5-
secret: false
6-
required: true
7-
verify:
8-
description: "Verify SSL certificate. Set to False to disable verification. Default True"
9-
type: boolean
10-
default: True
11-
auth_method:
12-
description: "Authentication method to use - oauth or basic"
13-
type: "string"
14-
secret: false
15-
required: true
16-
default: "oauth"
17-
enum:
18-
- oauth
19-
- basic
20-
username:
21-
description: "Username if using the basic auth_method"
22-
type: "string"
23-
secret: false
24-
required: false
25-
password:
26-
description: "Password if using the basic auth_method"
27-
type: "string"
28-
secret: true
29-
required: false
30-
rsa_cert_file:
31-
description: "Path to a private key file, e.g. /home/vagrant/jira.pem"
32-
type: "string"
33-
secret: false
34-
required: false
35-
oauth_token:
36-
description: "OAuth token"
37-
type: "string"
38-
secret: true
39-
required: false
40-
oauth_secret:
41-
description: "OAuth secret"
42-
type: "string"
43-
secret: true
44-
required: false
45-
consumer_key:
46-
description: "Consumer key"
47-
type: "string"
48-
secret: true
49-
required: false
50-
poll_interval:
51-
description: "Polling interval - default 30s"
52-
type: "integer"
53-
secret: false
54-
required: false
55-
default: 30
56-
project:
57-
description: "Project to be used as default for actions that don't require or allow a project"
58-
type: "string"
59-
secret: false
60-
required: true
61-
validate:
62-
description: "If true it will validate your credentials first."
63-
type: boolean
64-
default: false
65-
required: false
66-
client_cert_file:
67-
description: "Path to a client cert file, e.g. /home/jiracerts/username.cer"
68-
type: "string"
69-
secret: false
70-
required: false
71-
client_key_file:
72-
description: "Path to a client key file, e.g. /home/jiracerts/username.key"
73-
type: "string"
74-
secret: false
75-
required: false
2+
url:
3+
description: "URL of the JIRA instance (e.g. ``https://myproject.atlassian.net``)"
4+
type: "string"
5+
secret: false
6+
required: true
7+
verify:
8+
description: "Verify SSL certificate. Set to False to disable verification. Default True"
9+
type: boolean
10+
default: True
11+
auth_method:
12+
description: "Authentication method to use - oauth or basic"
13+
type: "string"
14+
secret: false
15+
required: true
16+
default: "oauth"
17+
enum:
18+
- oauth
19+
- basic
20+
username:
21+
description: "Username if using the basic auth_method"
22+
type: "string"
23+
secret: false
24+
required: false
25+
password:
26+
description: "Password if using the basic auth_method"
27+
type: "string"
28+
secret: true
29+
required: false
30+
rsa_cert_file:
31+
description: "Path to a private key file, e.g. /home/vagrant/jira.pem"
32+
type: "string"
33+
secret: false
34+
required: false
35+
oauth_token:
36+
description: "OAuth token"
37+
type: "string"
38+
secret: true
39+
required: false
40+
oauth_secret:
41+
description: "OAuth secret"
42+
type: "string"
43+
secret: true
44+
required: false
45+
consumer_key:
46+
description: "Consumer key"
47+
type: "string"
48+
secret: true
49+
required: false
50+
poll_interval:
51+
description: "Polling interval - default 30s"
52+
type: "integer"
53+
secret: false
54+
required: false
55+
default: 30
56+
project:
57+
description: "Project to be used as default for actions that don't require or allow a project"
58+
type: "string"
59+
secret: false
60+
required: true
61+
validate:
62+
description: "If true it will validate your credentials first."
63+
type: boolean
64+
default: false
65+
required: false
66+
client_cert_file:
67+
description: "Path to a client cert file, e.g. /home/jiracerts/username.cer"
68+
type: "string"
69+
secret: false
70+
required: false
71+
client_key_file:
72+
description: "Path to a client key file, e.g. /home/jiracerts/username.key"
73+
type: "string"
74+
secret: false
75+
required: false

‎sensors/jira_sensor.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class JIRASensor(PollingSensor):
1313
'''
1414

1515
def __init__(self, sensor_service, config=None, poll_interval=5):
16-
super(JIRASensor, self).__init__(
17-
sensor_service=sensor_service, config=config, poll_interval=poll_interval
18-
)
16+
super(JIRASensor, self).__init__(sensor_service=sensor_service,
17+
config=config,
18+
poll_interval=poll_interval)
1919

2020
self._jira_url = None
2121
# The Consumer Key created while setting up the 'Incoming Authentication' in

‎sensors/jira_sensor.yaml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
---
2-
class_name: "JIRASensor"
3-
entry_point: "jira_sensor.py"
4-
description: "Sensor which monitors JIRA for new tickets"
5-
poll_interval: 30
6-
trigger_types:
7-
- name: "issues_tracker"
8-
description: "Trigger which indicates that a new issue has been created"
9-
payload_schema:
10-
type: "object"
11-
properties:
12-
project:
13-
type: "string"
14-
issue_name:
15-
type: "string"
16-
issue_url:
17-
type: "string"
18-
created:
19-
type: "string"
20-
assignee:
21-
type: "string"
22-
fix_versions:
23-
type: "list"
24-
issue_type:
25-
type: "string"
2+
class_name: "JIRASensor"
3+
entry_point: "jira_sensor.py"
4+
description: "Sensor which monitors JIRA for new tickets"
5+
poll_interval: 30
6+
trigger_types:
7+
-
8+
name: "issues_tracker"
9+
description: "Trigger which indicates that a new issue has been created"
10+
payload_schema:
11+
type: "object"
12+
properties:
13+
project:
14+
type: "string"
15+
issue_name:
16+
type: "string"
17+
issue_url:
18+
type: "string"
19+
created:
20+
type: "string"
21+
assignee:
22+
type: "string"
23+
fix_versions:
24+
type: "string"
25+
issue_type:
26+
type: "string"

‎tests/fixtures/full_auth_passwd.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
url: "https://company.atlassian.net"
3-
auth_method: "basic"
4-
username: "user"
5-
password: "passwd"
6-
poll_interval: 30
7-
project: "MY_PROJECT"
8-
verify: True
9-
client_cert_file: ""
10-
client_key_file: ""
2+
url: "https://company.atlassian.net"
3+
auth_method: "basic"
4+
username: "user"
5+
password: "passwd"
6+
poll_interval: 30
7+
project: "MY_PROJECT"
8+
verify: True
9+
client_cert_file: ""
10+
client_key_file: ""

0 commit comments

Comments
 (0)