Skip to content

Add client certificate option #125

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.

Sign up for GitHub

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 2 commits into from
Apr 13, 2025
Merged

Add client certificate option #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a8f75
python: add client certificate config
dkropachev Apr 12, 2025
8d986b9
python: discontinue boto3 and botocore client patching
dkropachev Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions python/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,21 @@ This library periodically syncs list of active nodes with the cluster.
### Create new dynamodb botocore client

```python
import alternator_lb
from alternator_lb import AlternatorLB, Config

lb = alternator_lb.AlternatorLB(['x.x.x.x'], port=9999)
lb = AlternatorLB(Config(nodes=['x.x.x.x'], port=9999))
dynamodb = lb.new_botocore_dynamodb_client()

dynamodb.delete_table(TableName="SomeTable")
```

### Patch existing dynamodb botocore client
### Create new dynamodb boto3 client

```python
import alternator_lb
import botocore.session
from alternator_lb import AlternatorLB, Config

lb = alternator_lb.AlternatorLB(['x.x.x.x'], port=9999)
session = botocore.session.get_session()
dynamodb = session.create_client('dynamodb', region_name='us-east-1')
lb.patch_dynamodb_client(dynamodb)

dynamodb.delete_table(TableName="SomeTable")
```

### Patch existing dynamodb boto3 client

```python
import alternator_lb
import boto3

lb = alternator_lb.AlternatorLB(['x.x.x.x'], port=9999)
dynamodb = boto3.client('dynamodb', region_name='us-east-1')
lb.patch_dynamodb_client(dynamodb)
lb = AlternatorLB(Config(nodes=['x.x.x.x'], port=9999))
dynamodb = lb.new_boto3_dynamodb_client()

dynamodb.delete_table(TableName="SomeTable")
```
Expand Down
18 changes: 13 additions & 5 deletions python/alternator_lb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ class Config:
port: int = 8080
datacenter: str = None
rack: str = None
client_cert: str = None
client_cert_file: str = None
client_key_file: str = None
connect_timeout: int = 3600
max_pool_connections: int = 200
aws_region_name: str = "fake-alternator-lb-region"
aws_access_key_id: str = "fake-alternator-lb-access-key-id"
aws_secret_access_key: str = "fake-alternator-lb-secret-access-key"
Expand Down Expand Up @@ -244,9 +247,14 @@ def _init_botocore_config(self) -> config.Config:
"connect_timeout": self._config.connect_timeout,
"max_pool_connections": self._config.max_pool_connections,
}
if self._config.client_cert_file:
if self._config.client_key_file:
config_params["client_cert"] = (self._config.client_cert_file, self._config.client_key_file)
else:
config_params["client_cert"] = self._config.client_cert_file
return config.Config(**config_params)

def new_botocore_dynamodb_client(self, key: str = "", secret: str = "", region: str = ""):
def new_botocore_dynamodb_client(self, key: str = "", secret: str = "", region: str = "") -> object:
import botocore.session

session = botocore.session.get_session()
Expand All @@ -265,7 +273,7 @@ def new_botocore_dynamodb_client(self, key: str = "", secret: str = "", region:
verify=False,
config=self._init_botocore_config(),
)
self.patch_dynamodb_client(ddb)
self._patch_dynamodb_client(ddb)
return ddb

def new_boto3_dynamodb_client(self, key: str = "", secret: str = "", region: str = ""):
Expand All @@ -286,10 +294,10 @@ def new_boto3_dynamodb_client(self, key: str = "", secret: str = "", region: str
verify=False,
config=self._init_botocore_config(),
)
self.patch_dynamodb_client(ddb)
self._patch_dynamodb_client(ddb)
return ddb

def patch_dynamodb_client(self, client):
def _patch_dynamodb_client(self, client):
from botocore.regions import EndpointRulesetResolver

current_resolver = getattr(client, '_ruleset_resolver', None)
Expand Down
1 change: 1 addition & 0 deletions python/test_integration_boto3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,5 @@ def test_botocore_create_add_delete(self):
def test_boto3_create_add_delete(self):
lb = AlternatorLB(Config(nodes=self.initial_nodes,
port=self.http_port, datacenter="datacenter1"))
lb = AlternatorLB(Config(nodes=self.initial_nodes, port=self.http_port, datacenter="datacenter1"))
self._run_create_add_delete_test(lb.new_boto3_dynamodb_client())