Skip to content

Google Directory: Fix crash when a group don't have members #6930

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

Merged
merged 1 commit into from
Oct 21, 2021

Conversation

nauxliu
Copy link
Contributor

@nauxliu nauxliu commented Oct 9, 2021

What

When a group don't have members, this connector will crash

Example response:

# Nomal Response
{'kind': 'admin#directory#members', 'etag': '"g2-xxxxxxxxxxxxxx/xxxxxxxxxxx"', 'members': [{'kind': 'admin#directory#member', 'etag': '"g2-xxxxxxxxxxxxxx/xxxxxxxxxxx"', 'id': '103861707823939549040', 'email': '[email protected]', 'role': 'MEMBER', 'type': 'USER', 'status': 'ACTIVE'}]}

# Response without members
{'kind': 'admin#directory#members', 'etag': '"g2-xxxxxxxxxxxxxxxxxxxxxxxxxxx"'}

The crash log:

2021-10-08 18:38:48 INFO  Starting syncing SourceGoogleDirectory
2021-10-08 18:38:48 INFO  Syncing group_members stream
2021-10-08 18:38:55 ERROR Encountered an exception while reading stream SourceGoogleDirectory
Traceback (most recent call last):
  File "/usr/local/lib/python3.7/site-packages/base_python/source.py", line 88, in read
    yield from self._read_stream(logger=logger, client=client, configured_stream=configured_stream, state=total_state)
  File "/usr/local/lib/python3.7/site-packages/base_python/source.py", line 107, in _read_stream
    for record in client.read_stream(configured_stream.stream):
  File "/usr/local/lib/python3.7/site-packages/base_python/client.py", line 166, in read_stream
    for message in method(fields=fields):
  File "/usr/local/lib/python3.7/site-packages/source_google_directory/api.py", line 131, in list
    yield from self.read(partial(self._api_get, resource="members"), params=params)
  File "/usr/local/lib/python3.7/site-packages/source_google_directory/api.py", line 97, in read
    yield from self.process_response(batch)
  File "/usr/local/lib/python3.7/site-packages/source_google_directory/api.py", line 125, in process_response
    return response["members"]
KeyError: 'members'

How

Return an empty dict when members does not exist.

Recommended reading order

  1. x.java
  2. y.python

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/SUMMARY.md
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions
  • Connector added to connector index like described here

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • Credentials added to Github CI. Instructions.
  • /test connector=connectors/<name> command is passing.
  • New Connector version released on Dockerhub by running the /publish command described here

Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions
  • Connector version bumped like described here

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • Credentials added to Github CI. Instructions.
  • /test connector=connectors/<name> command is passing.
  • New Connector version released on Dockerhub by running the /publish command described here

Connector Generator

  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed.

@github-actions github-actions bot added the area/connectors Connector related issues label Oct 9, 2021
@nauxliu
Copy link
Contributor Author

nauxliu commented Oct 9, 2021

@sherifnada Hey, could you take a look?

@marcosmarxm
Copy link
Member

sorry @nauxliu we're going to review today this contribution!

@marcosmarxm marcosmarxm self-assigned this Oct 12, 2021
@vitaliizazmic vitaliizazmic self-requested a review October 12, 2021 17:54
Copy link
Contributor

@sherifnada sherifnada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @nauxliu !

@vitaliizazmic can you make sure the team publishes this PR? (no need to do it yourself, feel free to ask the team for help)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/connectors Connector related issues community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants