Merge branch 'develop' into kinesis

leandrodamascena · web-flow · commit 455402a906e7 · 2023-09-14T16:01:34.000+01:00
diff --git a/.github/workflows/publish_v2_layer.yml b/.github/workflows/publish_v2_layer.yml
@@ -117,14 +117,14 @@ jobs:
           pip install --require-hashes -r requirements.txt
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.0.0
+        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v2.0.0
         with:
           platforms: arm64
         # NOTE: we need QEMU to build Layer against a different architecture (e.g., ARM)
 
       - name: Set up Docker Buildx
         id: builder
-        uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2.10.0
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
         with:
           install: true
           driver: docker
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,14 +11,16 @@
 ## Maintenance
 
 * **automation:** remove previous labels when PR is updated ([#3066](https://github.com/aws-powertools/powertools-lambda-python/issues/3066))
-* **deps:** bump squidfunk/mkdocs-material from `dd1770c` to `c4890ab` in /docs ([#3078](https://github.com/aws-powertools/powertools-lambda-python/issues/3078))
 * **deps:** bump actions/dependency-review-action from 3.0.8 to 3.1.0 ([#3071](https://github.com/aws-powertools/powertools-lambda-python/issues/3071))
-* **deps-dev:** bump aws-cdk from 2.95.0 to 2.95.1 ([#3074](https://github.com/aws-powertools/powertools-lambda-python/issues/3074))
+* **deps:** bump squidfunk/mkdocs-material from `dd1770c` to `c4890ab` in /docs ([#3078](https://github.com/aws-powertools/powertools-lambda-python/issues/3078))
 * **deps-dev:** bump ruff from 0.0.287 to 0.0.288 ([#3076](https://github.com/aws-powertools/powertools-lambda-python/issues/3076))
-* **deps-dev:** bump aws-cdk from 2.94.0 to 2.95.0 ([#3070](https://github.com/aws-powertools/powertools-lambda-python/issues/3070))
+* **deps-dev:** bump aws-cdk from 2.95.0 to 2.95.1 ([#3074](https://github.com/aws-powertools/powertools-lambda-python/issues/3074))
 * **deps-dev:** bump hvac from 1.2.0 to 1.2.1 ([#3075](https://github.com/aws-powertools/powertools-lambda-python/issues/3075))
 * **deps-dev:** bump cfn-lint from 0.79.9 to 0.79.10 ([#3077](https://github.com/aws-powertools/powertools-lambda-python/issues/3077))
+* **deps-dev:** bump aws-cdk from 2.94.0 to 2.95.0 ([#3070](https://github.com/aws-powertools/powertools-lambda-python/issues/3070))
 * **deps-dev:** bump ruff from 0.0.288 to 0.0.289 ([#3080](https://github.com/aws-powertools/powertools-lambda-python/issues/3080))
+* **deps-dev:** bump the boto-typing group with 1 update ([#3085](https://github.com/aws-powertools/powertools-lambda-python/issues/3085))
+* **deps-dev:** bump aws-cdk from 2.95.1 to 2.96.0 ([#3087](https://github.com/aws-powertools/powertools-lambda-python/issues/3087))
 
 
 <a name="v2.24.0"></a>
diff --git a/aws_lambda_powertools/utilities/parameters/base.py b/aws_lambda_powertools/utilities/parameters/base.py
@@ -147,7 +147,7 @@ def get(
         return value
 
     @abstractmethod
-    def _get(self, name: str, **sdk_options) -> Union[str, bytes]:
+    def _get(self, name: str, **sdk_options) -> Union[str, bytes, Dict[str, Any]]:
         """
         Retrieve parameter value from the underlying parameter store
         """
diff --git a/examples/parameters/src/custom_provider_vault.py b/examples/parameters/src/custom_provider_vault.py
@@ -1,5 +1,4 @@
-import json
-from typing import Dict
+from typing import Any, Dict
 
 from hvac import Client
 
@@ -8,21 +7,18 @@
 
 class VaultProvider(BaseProvider):
     def __init__(self, vault_url: str, vault_token: str) -> None:
-
         super().__init__()
 
         self.vault_client = Client(url=vault_url, verify=False, timeout=10)
         self.vault_client.token = vault_token
 
-    def _get(self, name: str, **sdk_options) -> str:
-
+    def _get(self, name: str, **sdk_options) -> Dict[str, Any]:
         # for example proposal, the mountpoint is always /secret
         kv_configuration = self.vault_client.secrets.kv.v2.read_secret(path=name)
 
-        return json.dumps(kv_configuration["data"]["data"])
+        return kv_configuration["data"]["data"]
 
     def _get_multiple(self, path: str, **sdk_options) -> Dict[str, str]:
-
         list_secrets = {}
         all_secrets = self.vault_client.secrets.kv.v2.list_secrets(path=path)
 
diff --git a/examples/parameters/src/working_with_own_provider_vault.py b/examples/parameters/src/working_with_own_provider_vault.py
@@ -14,10 +14,9 @@
 
 
 def lambda_handler(event: dict, context: LambdaContext):
-
     try:
         # Retrieve a single parameter
-        endpoint_comments: Any = vault_provider.get("comments_endpoint", transform="json")
+        endpoint_comments: Any = vault_provider.get("comments_endpoint")
 
         # you can get all parameters using get_multiple and specifying vault mount point
         # # for testing purposes we will not use it
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "aws-lambda-powertools-python-e2e",
   "version": "1.0.0",
   "devDependencies": {
-    "aws-cdk": "^2.95.1"
+    "aws-cdk": "^2.96.0"
   },
   "dependencies": {
     "package-lock.json": "^1.0.0"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -66,7 +66,7 @@ mypy-boto3-logs = "^1.28.36"
 mypy-boto3-secretsmanager = "^1.28.36"
 mypy-boto3-ssm = "^1.28.36"
 mypy-boto3-s3 = "^1.28.36"
-mypy-boto3-xray = "^1.28.36"
+mypy-boto3-xray = "^1.28.47"
 types-requests = "^2.31.0"
 typing-extensions = "^4.6.2"
 mkdocs-material = "^9.2.7"
@@ -89,7 +89,7 @@ aws-sdk = ["boto3"]
 datadog=["datadog-lambda"]
 
 [tool.poetry.group.dev.dependencies]
-cfn-lint = "0.79.10"
+cfn-lint = "0.79.11"
 mypy = "^1.1.1"
 types-python-dateutil = "^2.8.19.6"
 httpx = ">=0.23.3,<0.25.0"
