Skip to content
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

Version 2.0.1 - Typo Fix :-/ #4

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ venv*/
.venv*/

# IDEA Stuff
.idea/
.idea/
/_sandbox*.py
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [2.0.1] - 2024-11-05

### Fixed

- Typo in `vault` optional-dependencies (`havc` -> `hvac`)


## [2.0.0] - 2024-11-04

### Changed
Expand Down
2 changes: 1 addition & 1 deletion fidelius/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '2.0.0'
__version__ = '2.0.1'

__author__ = 'Thordur Matthiasson <[email protected]>'
__license__ = 'MIT License'
Expand Down
18 changes: 11 additions & 7 deletions fidelius/gateway/paramstore/_paramstorerepo.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,20 @@ def __init__(self, app_props: FideliusAppProps,
if not self._aws_key_arn:
raise EnvironmentError('Fidelius AwsParamStoreRepo requires the ARN for the KMS key argument when initialising or in the FIDELIUS_AWS_KEY_ARN environment variable')

self._region_name = aws_region_name or os.environ.get('FIDELIUS_AWS_REGION_NAME', None) or os.environ.get('AWS_DEFAULT_REGION', 'eu-west-1')
self._region_name = aws_region_name or os.environ.get('FIDELIUS_AWS_REGION_NAME', None)

self._aws_endpoint_url = aws_endpoint_url or os.environ.get('FIDELIUS_AWS_ENDPOINT_URL', '')
self._aws_endpoint_url = aws_endpoint_url or os.environ.get('FIDELIUS_AWS_ENDPOINT_URL', None)
self._aws_profile_name = aws_profile_name or os.environ.get('FIDELIUS_AWS_PROFILE', None)

self._force_log_secrecy()
self._ssm = boto3.client('ssm',
region_name=self._region_name,
endpoint_url=self._aws_endpoint_url or None,
aws_access_key_id=aws_access_key_id or os.environ.get('FIDELIUS_AWS_ACCESS_KEY_ID', None) or os.environ.get('AWS_ACCESS_KEY_ID', None),
aws_secret_access_key=aws_secret_access_key or os.environ.get('FIDELIUS_AWS_SECRET_ACCESS_KEY', None) or os.environ.get('AWS_SECRET_ACCESS_KEY', None))
self._session = boto3.Session(profile_name=self._aws_profile_name,
region_name=self._region_name,
aws_access_key_id=aws_access_key_id or os.environ.get(
'FIDELIUS_AWS_ACCESS_KEY_ID', None),
aws_secret_access_key=aws_secret_access_key or os.environ.get(
'FIDELIUS_AWS_SECRET_ACCESS_KEY', None))
self._ssm = self._session.client('ssm',
endpoint_url=self._aws_endpoint_url or None)

self._cache: Dict[str, str] = {}
self._loaded_paths: Set[str] = set()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies = [
]

[project.optional-dependencies]
vault = ["havc >= 2.2, <3"]
vault = ["hvac >= 2.2, <3"]
aws = ["boto3 >=1.20, <2"]


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ccptools >=1.1, <2
boto3 >=1.20, <2
hvac >= 2.2, <3
hvac >=2.2, <3
Loading