-
Notifications
You must be signed in to change notification settings - Fork 69
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
feat: boto3 connector #1655
Open
pnadolny13
wants to merge
12
commits into
main
Choose a base branch
from
boto_connector
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat: boto3 connector #1655
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a712e15
add boto connector and tests
pnadolny13 6e577de
lint
pnadolny13 9bc73f5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 7555c30
revert lock file
pnadolny13 11cd27e
Merge branch 'main' into boto_connector
pnadolny13 0e7be4a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 61d14bf
remove unused boto3 in test dependencies
pnadolny13 ebd6290
Merge branch 'boto_connector' of https://github.com/meltano/sdk into …
pnadolny13 85ee1dd
fix some flake8 complaints
pnadolny13 c28d1bb
Merge branch 'main' into boto_connector
edgarrmondragon 17bc938
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 9f65e3c
Merge branch 'main' into boto_connector
pnadolny13 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,6 +54,7 @@ | |
"flake8-annotations", | ||
"flake8-docstrings", | ||
"mypy", | ||
"moto", | ||
] | ||
|
||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,272 @@ | ||
"""AWS Boto3 Connector.""" | ||
|
||
from __future__ import annotations | ||
|
||
import logging | ||
import os | ||
|
||
from singer_sdk import typing as th # JSON schema typing helpers | ||
|
||
try: | ||
import boto3 | ||
except ImportError: | ||
msg = "boto3 is required for this authenticator. Please install it with `poetry add boto3`." | ||
raise Exception( | ||
msg, | ||
) | ||
|
||
AWS_AUTH_CONFIG = th.PropertiesList( | ||
th.Property( | ||
"aws_access_key_id", | ||
th.StringType, | ||
secret=True, | ||
description="The access key for your AWS account.", | ||
), | ||
th.Property( | ||
"aws_secret_access_key", | ||
th.StringType, | ||
secret=True, | ||
description="The secret key for your AWS account.", | ||
), | ||
th.Property( | ||
"aws_session_token", | ||
th.StringType, | ||
secret=True, | ||
description=( | ||
"The session key for your AWS account. This is only needed when" | ||
" you are using temporary credentials." | ||
), | ||
), | ||
th.Property( | ||
"aws_profile", | ||
th.StringType, | ||
description=( | ||
"The AWS credentials profile name to use. The profile must be " | ||
"configured and accessible." | ||
), | ||
), | ||
th.Property( | ||
"aws_default_region", | ||
th.StringType, | ||
description="The default AWS region name (e.g. us-east-1) ", | ||
), | ||
th.Property( | ||
"aws_endpoint_url", | ||
th.StringType, | ||
description="The complete URL to use for the constructed client.", | ||
), | ||
th.Property( | ||
"aws_assume_role_arn", | ||
th.StringType, | ||
description="The role ARN to assume.", | ||
), | ||
th.Property( | ||
"use_aws_env_vars", | ||
th.BooleanType, | ||
default=False, | ||
description=("Whether to retrieve aws credentials from environment variables."), | ||
), | ||
).to_dict() | ||
|
||
|
||
class AWSBoto3Connector: | ||
"""Base class for AWS boto3-based connectors. | ||
|
||
The connector class serves as a wrapper around boto3 package. | ||
|
||
The functions of the connector are: | ||
- initializing a client, resource, or session with a simple interface | ||
- accessing AWS credentials via config, env vars, or profile | ||
- supports assuming roles | ||
- enables configurable endpoint_url for testing | ||
""" | ||
|
||
def __init__( | ||
self: AWSBoto3Connector, | ||
config: dict, | ||
service_name: str, | ||
) -> None: | ||
"""Initialize the AWSBotoAuthenticator. | ||
|
||
Args: | ||
config (dict): The config for the connector. | ||
service_name (str): The name of the AWS service. | ||
""" | ||
self._service_name = service_name | ||
self._config = config | ||
self._client = None | ||
self._resource = None | ||
# config for use environment variables | ||
if config.get("use_aws_env_vars"): | ||
self.aws_access_key_id = os.environ.get("AWS_ACCESS_KEY_ID") | ||
self.aws_secret_access_key = os.environ.get("AWS_SECRET_ACCESS_KEY") | ||
self.aws_session_token = os.environ.get("AWS_SESSION_TOKEN") | ||
self.aws_profile = os.environ.get("AWS_PROFILE") | ||
self.aws_default_region = os.environ.get("AWS_DEFAULT_REGION") | ||
else: | ||
self.aws_access_key_id = config.get("aws_access_key_id") | ||
self.aws_secret_access_key = config.get("aws_secret_access_key") | ||
self.aws_session_token = config.get("aws_session_token") | ||
self.aws_profile = config.get("aws_profile") | ||
self.aws_default_region = config.get("aws_default_region") | ||
|
||
self.aws_endpoint_url = config.get("aws_endpoint_url") | ||
self.aws_assume_role_arn = config.get("aws_assume_role_arn") | ||
|
||
@property | ||
def config(self: AWSBoto3Connector) -> dict: | ||
"""If set, provides access to the tap or target config. | ||
|
||
Returns: | ||
The settings as a dict. | ||
""" | ||
return self._config | ||
|
||
@property | ||
def logger(self: AWSBoto3Connector) -> logging.Logger: | ||
"""Get logger. | ||
|
||
Returns: | ||
Plugin logger. | ||
""" | ||
return logging.getLogger("aws_boto_connector") | ||
|
||
@property | ||
def client(self: AWSBoto3Connector) -> boto3.client: | ||
"""Return the boto3 client for the service. | ||
|
||
Returns: | ||
boto3.client: The boto3 client for the service. | ||
""" | ||
if self._client: | ||
return self._client | ||
else: | ||
session = self._get_session() | ||
self._client = self._get_client(session, self._service_name) | ||
return self._client | ||
|
||
@property | ||
def resource(self: AWSBoto3Connector) -> boto3.resource: | ||
"""Return the boto3 resource for the service. | ||
|
||
Returns: | ||
boto3.resource: The boto3 resource for the service. | ||
""" | ||
if self._resource: | ||
return self._resource | ||
else: | ||
session = self._get_session() | ||
self._resource = self._get_resource(session, self._service_name) | ||
return self._resource | ||
|
||
def _get_session(self: AWSBoto3Connector) -> boto3.session: | ||
"""Return the boto3 session. | ||
|
||
Returns: | ||
boto3.session: The boto3 session. | ||
""" | ||
session = None | ||
if ( | ||
self.aws_access_key_id | ||
and self.aws_secret_access_key | ||
and self.aws_session_token | ||
and self.aws_default_region | ||
): | ||
session = boto3.Session( | ||
aws_access_key_id=self.aws_access_key_id, | ||
aws_secret_access_key=self.aws_secret_access_key, | ||
aws_session_token=self.aws_session_token, | ||
region_name=self.aws_default_region, | ||
) | ||
self.logger.info( | ||
"Authenticating using access key id, secret access key, and " | ||
"session token.", | ||
) | ||
elif ( | ||
self.aws_access_key_id | ||
and self.aws_secret_access_key | ||
and self.aws_default_region | ||
): | ||
session = boto3.Session( | ||
aws_access_key_id=self.aws_access_key_id, | ||
aws_secret_access_key=self.aws_secret_access_key, | ||
region_name=self.aws_default_region, | ||
) | ||
self.logger.info( | ||
"Authenticating using access key id and secret access key.", | ||
) | ||
elif self.aws_profile: | ||
session = boto3.Session(profile_name=self.aws_profile) | ||
self.logger.info("Authenticating using profile.") | ||
else: | ||
session = boto3.Session() | ||
self.logger.info("Authenticating using implicit pre-installed credentials.") | ||
|
||
if self.aws_assume_role_arn: | ||
session = self._assume_role(session, self.aws_assume_role_arn) | ||
return session | ||
|
||
def _factory( | ||
self: AWSBoto3Connector, | ||
aws_obj: boto3.resource | boto3.client, | ||
service_name: str, | ||
) -> boto3.resource | boto3.client: | ||
if self.aws_endpoint_url: | ||
return aws_obj( | ||
service_name, | ||
endpoint_url=self.aws_endpoint_url, | ||
) | ||
else: | ||
return aws_obj( | ||
service_name, | ||
) | ||
|
||
def _get_resource( | ||
self: AWSBoto3Connector, | ||
session: boto3.session, | ||
service_name: str, | ||
) -> boto3.resource: | ||
"""Return the boto3 resource for the service. | ||
|
||
Args: | ||
session (boto3.session.Session): The boto3 session. | ||
service_name (str): The name of the AWS service. | ||
|
||
Returns: | ||
boto3.resource: The boto3 resource for the service. | ||
""" | ||
return self._factory(session.resource, service_name) | ||
|
||
def _get_client( | ||
self: AWSBoto3Connector, | ||
session: boto3.session.Session, | ||
service_name: str, | ||
) -> boto3.client: | ||
"""Return the boto3 client for the service. | ||
|
||
Args: | ||
session (boto3.session.Session): The boto3 session. | ||
service_name (str): The name of the AWS service. | ||
|
||
Returns: | ||
boto3.client: The boto3 client for the service. | ||
""" | ||
return self._factory(session.client, service_name) | ||
|
||
def _assume_role( | ||
self: AWSBoto3Connector, | ||
session: boto3.session.Session, | ||
role_arn: str, | ||
) -> boto3.session.Session: | ||
# TODO: use for auto refresh https://github.com/benkehoe/aws-assume-role-lib | ||
sts_client = self._get_client(session, "sts") | ||
response = sts_client.assume_role( | ||
RoleArn=role_arn, | ||
RoleSessionName="tap-dynamodb", | ||
) | ||
return boto3.Session( | ||
aws_access_key_id=response["Credentials"]["AccessKeyId"], | ||
aws_secret_access_key=response["Credentials"]["SecretAccessKey"], | ||
aws_session_token=response["Credentials"]["SessionToken"], | ||
region_name=self.aws_default_region, | ||
) |
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.
Would it make sense for users to want to use a mix of env vars and JSON config? For example, set
AWS_ACCESS_KEY_ID
andAWS_SECRET_ACCESS_KEY
in their environment but switch regions via the config file.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.
@edgarrmondragon potentially, I dont know all the common patterns people use but my vision for this was to try to make it more explicit where AWS credentials are coming from. I find that having so many variations of where credentials come from (json, profiles, env vars, machine inheritances) and potentially mixing them makes it confusing and sometimes leads to a tap using credentials you weren't intending to use. What do you think about that? Am I exaggerating the challenge a bit?
In tap-dynamodb I was raising an error if credentials weren't provided but some users need to use implicit credentials MeltanoLabs/tap-dynamodb#14. This has me thinking about adding a config option like
use_implicit_credentials=True
, meaning the user needs to explicitly tell the tap that it should use a naked call likeboto3.Session()
with no args/kwargs to defer to the boto hierarchy of searching for credentials on the machine.I'm also almost in favor of eliminating the
use_aws_env_vars
option and requiring that all users configure them via their meltano.yml. If they want to access env vars they should use templating in their meltano.yml explicitly.Any thoughts?