Skip to content

Commit

Permalink
🐛 Source Okta: fix for failed stream on Json Validation NPE (#15179)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bazarnov
bazarnov authored Aug 2, 2022
1 parent ae58fa5 commit bbbd1ad
Show file tree
Hide file tree
Showing 15 changed files with 630 additions and 407 deletions.
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@
- name: Okta
sourceDefinitionId: 1d4fdb25-64fc-4569-92da-fcdca79a8372
dockerRepository: airbyte/source-okta
dockerImageTag: 0.1.9
dockerImageTag: 0.1.10
documentationUrl: https://docs.airbyte.io/integrations/sources/okta
icon: okta.svg
sourceType: api
Expand Down
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_specs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6027,7 +6027,7 @@
- - "client_secret"
oauthFlowOutputParameters:
- - "access_token"
- dockerImage: "airbyte/source-okta:0.1.9"
- dockerImage: "airbyte/source-okta:0.1.10"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/okta"
connectionSpecification:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-okta/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ RUN pip install .
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.9
LABEL io.airbyte.version=0.1.10
LABEL io.airbyte.name=airbyte/source-okta
3 changes: 2 additions & 1 deletion airbyte-integrations/connectors/source-okta/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ Customize `acceptance-test-config.yml` file to configure tests. See [Source Acce
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.
To run your integration tests with acceptance tests, from the connector root, run
```
python -m pytest integration_tests -p integration_tests.acceptance
docker build . --no-cache -t airbyte/source-okta:dev \
&& python -m pytest -p source_acceptance_test.plugin
```
To run your integration tests with docker

Expand Down
36 changes: 25 additions & 11 deletions airbyte-integrations/connectors/source-okta/source_okta/schemas/custom_roles.json
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,49 @@
{
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"id": {
"type": "string"
"type": ["null", "string"]
},
"label": {
"type": "string"
"type": ["null", "string"]
},
"created": {
"format": "date-time",
"type": "string"
"type": ["null", "string"]
},
"lastUpdated": {
"format": "date-time",
"type": "string"
"type": ["null", "string"]
},
"_links": {
"type": ["null", "object"],
"properties": {
"assignee": {
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"self": {
"$ref": "shared-link.json"
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"href": {
"type": ["null", "string"]
}
}
},
"permissions": {
"$ref": "shared-link.json",
"description": "Gets a list of Permissions that is granted through this assignment"
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"href": {
"type": ["null", "string"]
}
}
}
}
}
},
"type": ["object", "null"]
}
}
},
"type": "object"
}
}
213 changes: 211 additions & 2 deletions airbyte-integrations/connectors/source-okta/source_okta/schemas/group_members.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,212 @@
{
"$ref": "shared-user.json"
}
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"_links": {
"type": ["null", "object"]
},
"activated": {
"format": "date-time",
"type": ["null", "string"]
},
"created": {
"format": "date-time",
"type": ["null", "string"]
},
"credentials": {
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"password": {
"type": ["null", "object"],
"additionalProperties": true,
"properties": {
"hash": {
"type": ["null", "object"],
"properties": {
"algorithm": {
"type": ["null", "string"]
},
"salt": {
"type": ["null", "string"]
},
"saltOrder": {
"type": ["null", "string"]
},
"value": {
"type": ["null", "string"]
},
"workFactor": {
"type": ["null", "integer"]
}
}
},
"hook": {
"type": ["null", "object"],
"properties": {
"type": {
"type": ["null", "string"]
}
}
},
"value": {
"type": ["null", "string"]
}
}
},
"provider": {
"properties": {
"name": {
"type": ["null", "string"]
},
"type": {
"type": ["null", "string"]
}
},
"type": ["null", "object"]
},
"recovery_question": {
"properties": {
"answer": {
"type": ["null", "string"]
},
"question": {
"type": ["null", "string"]
}
},
"type": ["null", "object"]
}
}
},
"id": {
"type": ["null", "string"]
},
"lastLogin": {
"format": "date-time",
"type": ["null", "string"]
},
"lastUpdated": {
"format": "date-time",
"type": ["null", "string"]
},
"passwordChanged": {
"format": "date-time",
"type": ["null", "string"]
},
"profile": {
"additionalProperties": true,
"properties": {
"city": {
"type": ["null", "string"]
},
"costCenter": {
"type": ["null", "string"]
},
"countryCode": {
"type": ["null", "string"]
},
"department": {
"type": ["null", "string"]
},
"displayName": {
"type": ["null", "string"]
},
"division": {
"type": ["null", "string"]
},
"email": {
"type": ["null", "string"]
},
"employeeNumber": {
"type": ["null", "string"]
},
"firstName": {
"type": ["null", "string"]
},
"honorificPrefix": {
"type": ["null", "string"]
},
"honorificSuffix": {
"type": ["null", "string"]
},
"lastName": {
"type": ["null", "string"]
},
"locale": {
"type": ["null", "string"]
},
"login": {
"type": ["null", "string"]
},
"manager": {
"type": ["null", "string"]
},
"managerId": {
"type": ["null", "string"]
},
"middleName": {
"type": ["null", "string"]
},
"mobilePhone": {
"type": ["null", "string"]
},
"nickName": {
"type": ["null", "string"]
},
"organization": {
"type": ["null", "string"]
},
"postalAddress": {
"type": ["null", "string"]
},
"preferredLanguage": {
"type": ["null", "string"]
},
"primaryPhone": {
"type": ["null", "string"]
},
"profileUrl": {
"type": ["null", "string"]
},
"secondEmail": {
"type": ["null", "string"]
},
"state": {
"type": ["null", "string"]
},
"streetAddress": {
"type": ["null", "string"]
},
"timezone": {
"type": ["null", "string"]
},
"title": {
"type": ["null", "string"]
},
"userType": {
"type": ["null", "string"]
},
"zipCode": {
"type": ["null", "string"]
}
},
"type": ["null", "object"]
},
"status": {
"type": ["null", "string"]
},
"statusChanged": {
"format": "date-time",
"type": ["null", "string"]
},
"type": {
"additionalProperties": true,
"properties": {
"id": {
"type": ["null", "string"]
}
},
"type": ["null", "object"]
}
}
}
80 changes: 79 additions & 1 deletion airbyte-integrations/connectors/source-okta/source_okta/schemas/group_role_assignments.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,81 @@
{
"$ref": "shared-role.json"
"type": ["null", "object"],
"properties": {
"id": {
"type": ["null", "string"]
},
"label": {
"type": ["null", "string"]
},
"type": {
"type": ["null", "string"]
},
"status": {
"type": ["null", "string"]
},
"created": {
"format": "date-time",
"type": ["null", "string"]
},
"lastUpdated": {
"format": "date-time",
"type": ["null", "string"]
},
"assignmentType": {
"type": ["null", "string"]
},
"resource-set": {
"type": ["string", "null"]
},
"_links": {
"type": ["object", "null"],
"properties": {
"assignee": {
"type": ["object", "null"],
"properties": {
"assignee": {
"type": ["object", "null"],
"properties": {
"herf": {
"type": ["null", "string"]
}
}
},
"role": {
"type": ["object", "null"],
"properties": {
"herf": {
"type": ["null", "string"]
}
}
},
"resource-set": {
"type": ["object", "null"],
"properties": {
"herf": {
"type": ["null", "string"]
}
}
},
"permissions": {
"type": ["object", "null"],
"properties": {
"herf": {
"type": ["null", "string"]
}
}
},
"member": {
"type": ["object", "null"],
"properties": {
"herf": {
"type": ["null", "string"]
}
}
}
}
}
}
}
}
}
Loading

0 comments on commit bbbd1ad

Please sign in to comment.