-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🎉 Source Okta: add GroupMembers stream #14380
Merged
marcosmarxm
merged 7 commits into
airbytehq:master
from
YiyangLi:YL_add-group_members-to-okta_source
Jul 12, 2022
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0145ca6
add Group_Members stream to okta source
YiyangLi 57d0bf4
add tests and fix logs schema
YiyangLi 0dea6f2
last polish before submit the PR
YiyangLi aa5bd8b
address comments::
YiyangLi c84d548
add use_cache to Group_Members
YiyangLi 52d30c3
change configured_catalog to test
marcosmarxm caf1f03
auto-bump connector version
octavia-squidington-iii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
airbyte-integrations/connectors/source-okta/integration_tests/abnormal_state.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| { | ||
| "users": { "lastUpdated": "3021-09-08T07:04:28.000Z" }, | ||
| "groups": { "lastUpdated": "3021-09-08T07:04:28.000Z" } | ||
| "groups": { "lastUpdated": "3021-09-08T07:04:28.000Z" }, | ||
| "group_members": { "id": "00uzzzzzzzzzzzzzzzzz" }, | ||
| "logs": { "published": "3021-09-08T07:04:28.000Z" } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
airbyte-integrations/connectors/source-okta/sample_files/config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "base_url": "https://myorg.okta.com", | ||
| "token": "xyz123foo325a.fbar" | ||
| } |
3 changes: 3 additions & 0 deletions
3
airbyte-integrations/connectors/source-okta/source_okta/schemas/group_members.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "$ref": "users.json" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
230 changes: 230 additions & 0 deletions
230
airbyte-integrations/connectors/source-okta/source_okta/schemas/shared/users.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| { | ||
| "properties": { | ||
| "_links": { | ||
| "additionalProperties": { | ||
| "type": ["object", "null"] | ||
| }, | ||
| "type": ["object", "null"] | ||
| }, | ||
| "activated": { | ||
| "format": "date-time", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "created": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "credentials": { | ||
| "properties": { | ||
| "password": { | ||
| "properties": { | ||
| "hash": { | ||
| "properties": { | ||
| "algorithm": { | ||
| "enum": ["BCRYPT", "SHA-512", "SHA-256", "SHA-1", "MD5"], | ||
| "type": ["string", "null"] | ||
| }, | ||
| "salt": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "saltOrder": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "value": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "workFactor": { | ||
| "type": ["integer", "null"] | ||
| } | ||
| }, | ||
| "type": ["object", "null"] | ||
| }, | ||
| "hook": { | ||
| "properties": { | ||
| "type": { | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": ["object", "null"] | ||
| }, | ||
| "value": { | ||
| "format": "password", | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": ["object", "null"] | ||
| }, | ||
| "provider": { | ||
| "properties": { | ||
| "name": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "type": { | ||
| "enum": [ | ||
| "ACTIVE_DIRECTORY", | ||
| "FEDERATION", | ||
| "LDAP", | ||
| "OKTA", | ||
| "SOCIAL", | ||
| "IMPORT" | ||
| ], | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": ["object", "null"] | ||
| }, | ||
| "recovery_question": { | ||
| "properties": { | ||
| "answer": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "question": { | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": ["object", "null"] | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "lastLogin": { | ||
| "format": "date-time", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "lastUpdated": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "passwordChanged": { | ||
| "format": "date-time", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "profile": { | ||
| "properties": { | ||
| "city": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "costCenter": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "countryCode": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "department": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "displayName": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "division": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "email": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "employeeNumber": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "firstName": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "honorificPrefix": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "honorificSuffix": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "lastName": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "locale": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "login": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "manager": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "managerId": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "middleName": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "mobilePhone": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "nickName": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "organization": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "postalAddress": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "preferredLanguage": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "primaryPhone": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "profileUrl": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "secondEmail": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "state": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "streetAddress": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "timezone": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "title": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "userType": { | ||
| "type": ["string", "null"] | ||
| }, | ||
| "zipCode": { | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "status": { | ||
| "enum": [ | ||
| "ACTIVE", | ||
| "DEPROVISIONED", | ||
| "LOCKED_OUT", | ||
| "PASSWORD_EXPIRED", | ||
| "PROVISIONED", | ||
| "RECOVERY", | ||
| "STAGED", | ||
| "SUSPENDED" | ||
| ], | ||
| "type": "string" | ||
| }, | ||
| "statusChanged": { | ||
| "format": "date-time", | ||
| "type": ["string", "null"] | ||
| }, | ||
| "type": { | ||
| "properties": { | ||
| "id": { | ||
| "type": ["string", "null"] | ||
| } | ||
| }, | ||
| "type": "object" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to highlight here for the connectors platform team. I am new to python, I learned that
nullisNonein python. In fact,nullis not recommended in the enum array. If I don't add this line, the acceptance test will throw an error because the value is null in one of the logs.Though the value type is
["string", "null"], it doesn't acceptnullorNone🤷 . Specifically, the method frompython-jsonschemathrows an error:https://github.com/python-jsonschema/jsonschema/blob/main/jsonschema/_validators.py#L279-L285
I am pretty sure the acceptance test is not 100% at the current
masterbranch. I want to achieve it, so I apply this duck tape.