Skip to content

Commit bbbd1ad

Browse files
author
Baz
authored
🐛 Source Okta: fix for failed stream on Json Validation NPE (#15179)
1 parent ae58fa5 commit bbbd1ad

File tree

15 files changed

+630
-407
lines changed

15 files changed

+630
-407
lines changed

‎airbyte-config/init/src/main/resources/seed/source_definitions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@
628628
- name: Okta
629629
sourceDefinitionId: 1d4fdb25-64fc-4569-92da-fcdca79a8372
630630
dockerRepository: airbyte/source-okta
631-
dockerImageTag: 0.1.9
631+
dockerImageTag: 0.1.10
632632
documentationUrl: https://docs.airbyte.io/integrations/sources/okta
633633
icon: okta.svg
634634
sourceType: api

‎airbyte-config/init/src/main/resources/seed/source_specs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6027,7 +6027,7 @@
60276027
- - "client_secret"
60286028
oauthFlowOutputParameters:
60296029
- - "access_token"
6030-
- dockerImage: "airbyte/source-okta:0.1.9"
6030+
- dockerImage: "airbyte/source-okta:0.1.10"
60316031
spec:
60326032
documentationUrl: "https://docs.airbyte.io/integrations/sources/okta"
60336033
connectionSpecification:

‎airbyte-integrations/connectors/source-okta/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ RUN pip install .
1212
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
1313
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
1414

15-
LABEL io.airbyte.version=0.1.9
15+
LABEL io.airbyte.version=0.1.10
1616
LABEL io.airbyte.name=airbyte/source-okta

‎airbyte-integrations/connectors/source-okta/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ Customize `acceptance-test-config.yml` file to configure tests. See [Source Acce
9999
If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.
100100
To run your integration tests with acceptance tests, from the connector root, run
101101
```
102-
python -m pytest integration_tests -p integration_tests.acceptance
102+
docker build . --no-cache -t airbyte/source-okta:dev \
103+
&& python -m pytest -p source_acceptance_test.plugin
103104
```
104105
To run your integration tests with docker
105106

‎airbyte-integrations/connectors/source-okta/source_okta/schemas/custom_roles.json

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,49 @@
11
{
2+
"type": ["null", "object"],
3+
"additionalProperties": true,
24
"properties": {
35
"id": {
4-
"type": "string"
6+
"type": ["null", "string"]
57
},
68
"label": {
7-
"type": "string"
9+
"type": ["null", "string"]
810
},
911
"created": {
1012
"format": "date-time",
11-
"type": "string"
13+
"type": ["null", "string"]
1214
},
1315
"lastUpdated": {
1416
"format": "date-time",
15-
"type": "string"
17+
"type": ["null", "string"]
1618
},
1719
"_links": {
20+
"type": ["null", "object"],
1821
"properties": {
1922
"assignee": {
23+
"type": ["null", "object"],
24+
"additionalProperties": true,
2025
"properties": {
2126
"self": {
22-
"$ref": "shared-link.json"
27+
"type": ["null", "object"],
28+
"additionalProperties": true,
29+
"properties": {
30+
"href": {
31+
"type": ["null", "string"]
32+
}
33+
}
2334
},
2435
"permissions": {
25-
"$ref": "shared-link.json",
26-
"description": "Gets a list of Permissions that is granted through this assignment"
36+
"type": ["null", "object"],
37+
"additionalProperties": true,
38+
"properties": {
39+
"href": {
40+
"type": ["null", "string"]
41+
}
42+
}
2743
}
2844
}
2945
}
30-
},
31-
"type": ["object", "null"]
46+
}
3247
}
33-
},
34-
"type": "object"
48+
}
3549
}

‎airbyte-integrations/connectors/source-okta/source_okta/schemas/group_members.json

Lines changed: 211 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,212 @@
11
{
2-
"$ref": "shared-user.json"
3-
}
2+
"type": ["null", "object"],
3+
"additionalProperties": true,
4+
"properties": {
5+
"_links": {
6+
"type": ["null", "object"]
7+
},
8+
"activated": {
9+
"format": "date-time",
10+
"type": ["null", "string"]
11+
},
12+
"created": {
13+
"format": "date-time",
14+
"type": ["null", "string"]
15+
},
16+
"credentials": {
17+
"type": ["null", "object"],
18+
"additionalProperties": true,
19+
"properties": {
20+
"password": {
21+
"type": ["null", "object"],
22+
"additionalProperties": true,
23+
"properties": {
24+
"hash": {
25+
"type": ["null", "object"],
26+
"properties": {
27+
"algorithm": {
28+
"type": ["null", "string"]
29+
},
30+
"salt": {
31+
"type": ["null", "string"]
32+
},
33+
"saltOrder": {
34+
"type": ["null", "string"]
35+
},
36+
"value": {
37+
"type": ["null", "string"]
38+
},
39+
"workFactor": {
40+
"type": ["null", "integer"]
41+
}
42+
}
43+
},
44+
"hook": {
45+
"type": ["null", "object"],
46+
"properties": {
47+
"type": {
48+
"type": ["null", "string"]
49+
}
50+
}
51+
},
52+
"value": {
53+
"type": ["null", "string"]
54+
}
55+
}
56+
},
57+
"provider": {
58+
"properties": {
59+
"name": {
60+
"type": ["null", "string"]
61+
},
62+
"type": {
63+
"type": ["null", "string"]
64+
}
65+
},
66+
"type": ["null", "object"]
67+
},
68+
"recovery_question": {
69+
"properties": {
70+
"answer": {
71+
"type": ["null", "string"]
72+
},
73+
"question": {
74+
"type": ["null", "string"]
75+
}
76+
},
77+
"type": ["null", "object"]
78+
}
79+
}
80+
},
81+
"id": {
82+
"type": ["null", "string"]
83+
},
84+
"lastLogin": {
85+
"format": "date-time",
86+
"type": ["null", "string"]
87+
},
88+
"lastUpdated": {
89+
"format": "date-time",
90+
"type": ["null", "string"]
91+
},
92+
"passwordChanged": {
93+
"format": "date-time",
94+
"type": ["null", "string"]
95+
},
96+
"profile": {
97+
"additionalProperties": true,
98+
"properties": {
99+
"city": {
100+
"type": ["null", "string"]
101+
},
102+
"costCenter": {
103+
"type": ["null", "string"]
104+
},
105+
"countryCode": {
106+
"type": ["null", "string"]
107+
},
108+
"department": {
109+
"type": ["null", "string"]
110+
},
111+
"displayName": {
112+
"type": ["null", "string"]
113+
},
114+
"division": {
115+
"type": ["null", "string"]
116+
},
117+
"email": {
118+
"type": ["null", "string"]
119+
},
120+
"employeeNumber": {
121+
"type": ["null", "string"]
122+
},
123+
"firstName": {
124+
"type": ["null", "string"]
125+
},
126+
"honorificPrefix": {
127+
"type": ["null", "string"]
128+
},
129+
"honorificSuffix": {
130+
"type": ["null", "string"]
131+
},
132+
"lastName": {
133+
"type": ["null", "string"]
134+
},
135+
"locale": {
136+
"type": ["null", "string"]
137+
},
138+
"login": {
139+
"type": ["null", "string"]
140+
},
141+
"manager": {
142+
"type": ["null", "string"]
143+
},
144+
"managerId": {
145+
"type": ["null", "string"]
146+
},
147+
"middleName": {
148+
"type": ["null", "string"]
149+
},
150+
"mobilePhone": {
151+
"type": ["null", "string"]
152+
},
153+
"nickName": {
154+
"type": ["null", "string"]
155+
},
156+
"organization": {
157+
"type": ["null", "string"]
158+
},
159+
"postalAddress": {
160+
"type": ["null", "string"]
161+
},
162+
"preferredLanguage": {
163+
"type": ["null", "string"]
164+
},
165+
"primaryPhone": {
166+
"type": ["null", "string"]
167+
},
168+
"profileUrl": {
169+
"type": ["null", "string"]
170+
},
171+
"secondEmail": {
172+
"type": ["null", "string"]
173+
},
174+
"state": {
175+
"type": ["null", "string"]
176+
},
177+
"streetAddress": {
178+
"type": ["null", "string"]
179+
},
180+
"timezone": {
181+
"type": ["null", "string"]
182+
},
183+
"title": {
184+
"type": ["null", "string"]
185+
},
186+
"userType": {
187+
"type": ["null", "string"]
188+
},
189+
"zipCode": {
190+
"type": ["null", "string"]
191+
}
192+
},
193+
"type": ["null", "object"]
194+
},
195+
"status": {
196+
"type": ["null", "string"]
197+
},
198+
"statusChanged": {
199+
"format": "date-time",
200+
"type": ["null", "string"]
201+
},
202+
"type": {
203+
"additionalProperties": true,
204+
"properties": {
205+
"id": {
206+
"type": ["null", "string"]
207+
}
208+
},
209+
"type": ["null", "object"]
210+
}
211+
}
212+
}

‎airbyte-integrations/connectors/source-okta/source_okta/schemas/group_role_assignments.json

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,81 @@
11
{
2-
"$ref": "shared-role.json"
2+
"type": ["null", "object"],
3+
"properties": {
4+
"id": {
5+
"type": ["null", "string"]
6+
},
7+
"label": {
8+
"type": ["null", "string"]
9+
},
10+
"type": {
11+
"type": ["null", "string"]
12+
},
13+
"status": {
14+
"type": ["null", "string"]
15+
},
16+
"created": {
17+
"format": "date-time",
18+
"type": ["null", "string"]
19+
},
20+
"lastUpdated": {
21+
"format": "date-time",
22+
"type": ["null", "string"]
23+
},
24+
"assignmentType": {
25+
"type": ["null", "string"]
26+
},
27+
"resource-set": {
28+
"type": ["string", "null"]
29+
},
30+
"_links": {
31+
"type": ["object", "null"],
32+
"properties": {
33+
"assignee": {
34+
"type": ["object", "null"],
35+
"properties": {
36+
"assignee": {
37+
"type": ["object", "null"],
38+
"properties": {
39+
"herf": {
40+
"type": ["null", "string"]
41+
}
42+
}
43+
},
44+
"role": {
45+
"type": ["object", "null"],
46+
"properties": {
47+
"herf": {
48+
"type": ["null", "string"]
49+
}
50+
}
51+
},
52+
"resource-set": {
53+
"type": ["object", "null"],
54+
"properties": {
55+
"herf": {
56+
"type": ["null", "string"]
57+
}
58+
}
59+
},
60+
"permissions": {
61+
"type": ["object", "null"],
62+
"properties": {
63+
"herf": {
64+
"type": ["null", "string"]
65+
}
66+
}
67+
},
68+
"member": {
69+
"type": ["object", "null"],
70+
"properties": {
71+
"herf": {
72+
"type": ["null", "string"]
73+
}
74+
}
75+
}
76+
}
77+
}
78+
}
79+
}
80+
}
381
}

0 commit comments

Comments
 (0)