From 9136f555a04eeb4709628c2c63b448c6ce0caa31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:05:37 +0000 Subject: [PATCH] chore(deps): update minor-grouped | datasource | package | from | to | | ---------------- | ----------------------------------------------- | -------- | -------- | | github-tags | aws/aws-cli | 2.19.4 | 2.21.3 | | github-tags | camunda/camunda-tf-eks-module | 3.0.1 | 3.1.0 | | go | github.com/aws/aws-sdk-go-v2/service/ec2 | v1.187.1 | v1.189.0 | | go | github.com/aws/aws-sdk-go-v2/service/iam | v1.37.4 | v1.38.0 | | go | github.com/aws/aws-sdk-go-v2/service/opensearch | v1.43.2 | v1.44.0 | | go | github.com/aws/aws-sdk-go-v2/service/s3 | v1.66.3 | v1.67.0 | | go | github.com/aws/aws-sdk-go-v2/service/sts | v1.32.4 | v1.33.0 | | github-tags | renovatebot/pre-commit-hooks | 39.9.2 | 39.17.1 | | terraform-module | terraform-aws-modules/iam/aws | 5.47.1 | 5.48.0 | --- .github/actions/aurora-manage-cluster/action.yml | 2 +- .github/actions/eks-manage-cluster/action.yml | 2 +- .github/actions/opensearch-manage-cluster/action.yml | 2 +- .pre-commit-config.yaml | 2 +- .tool-versions | 2 +- examples/camunda-8.6-irsa/cluster.tf | 2 +- examples/camunda-8.6-irsa/db.tf | 2 +- examples/camunda-8.6-irsa/opensearch.tf | 2 +- examples/camunda-8.6/cluster.tf | 2 +- examples/camunda-8.6/db.tf | 2 +- examples/camunda-8.6/opensearch.tf | 2 +- examples/camunda-8.7-irsa/cluster.tf | 2 +- examples/camunda-8.7-irsa/db.tf | 2 +- examples/camunda-8.7-irsa/opensearch.tf | 2 +- examples/camunda-8.7/cluster.tf | 2 +- examples/camunda-8.7/db.tf | 2 +- examples/camunda-8.7/opensearch.tf | 2 +- modules/eks-cluster/iam.tf | 6 +++--- test/src/go.mod | 10 +++++----- test/src/go.sum | 10 ++++++++++ 20 files changed, 35 insertions(+), 25 deletions(-) diff --git a/.github/actions/aurora-manage-cluster/action.yml b/.github/actions/aurora-manage-cluster/action.yml index 082234b1..53ecc582 100644 --- a/.github/actions/aurora-manage-cluster/action.yml +++ b/.github/actions/aurora-manage-cluster/action.yml @@ -109,7 +109,7 @@ runs: id: utility # see https://github.com/orgs/community/discussions/41927 it's not possible to optimize this yet # steps.uses cannot access the github context. - uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@cb0339f42cdc1b45d876216ba0d8622804186efc # 3.0.1 + uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@4335797c2b885b6b08503567dbb45fe66c465d57 # 3.1.0 with: awscli-version: ${{ inputs.awscli-version }} terraform-version: ${{ inputs.terraform-version }} diff --git a/.github/actions/eks-manage-cluster/action.yml b/.github/actions/eks-manage-cluster/action.yml index 73755e00..562648fd 100644 --- a/.github/actions/eks-manage-cluster/action.yml +++ b/.github/actions/eks-manage-cluster/action.yml @@ -88,7 +88,7 @@ runs: # see https://github.com/orgs/community/discussions/41927 it's not possible to optimize this yet # steps.uses cannot access the github context. # uses: ${{ github.action_repository }}/utility-action@${{ github.action_ref }} - uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@cb0339f42cdc1b45d876216ba0d8622804186efc # 3.0.1 + uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@4335797c2b885b6b08503567dbb45fe66c465d57 # 3.1.0 with: awscli-version: ${{ inputs.awscli-version }} terraform-version: ${{ inputs.terraform-version }} diff --git a/.github/actions/opensearch-manage-cluster/action.yml b/.github/actions/opensearch-manage-cluster/action.yml index fab0c7db..b3611774 100644 --- a/.github/actions/opensearch-manage-cluster/action.yml +++ b/.github/actions/opensearch-manage-cluster/action.yml @@ -105,7 +105,7 @@ runs: steps: - name: Use Utility Actions id: utility - uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@cb0339f42cdc1b45d876216ba0d8622804186efc # 3.0.1 + uses: camunda/camunda-tf-eks-module/.github/actions/utility-action@4335797c2b885b6b08503567dbb45fe66c465d57 # 3.1.0 with: awscli-version: ${{ inputs.awscli-version }} terraform-version: ${{ inputs.tf-terraform-version }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b489d408..dd11eb9f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - id: actionlint-docker - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 39.9.2 + rev: 39.17.1 hooks: - id: renovate-config-validator args: [--strict] diff --git a/.tool-versions b/.tool-versions index db413ecb..d26a6d4e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -13,7 +13,7 @@ # check it with # diff <(sed '/^#/d; /^$/d' .tool-versions | sort) <(sed '/^#/d; /^$/d' .tool-versions) && echo ".tool-versions is sorted correctly" || echo ".tool-versions is not sorted correctly" -awscli 2.19.4 +awscli 2.21.3 # renovate: datasource=github-tags depName=eksctl-io/eksctl eksctl 0.194.0 diff --git a/examples/camunda-8.6-irsa/cluster.tf b/examples/camunda-8.6-irsa/cluster.tf index 5b43ec8f..1e5c445f 100644 --- a/examples/camunda-8.6-irsa/cluster.tf +++ b/examples/camunda-8.6-irsa/cluster.tf @@ -4,7 +4,7 @@ locals { } module "eks_cluster" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.1.0" name = local.eks_cluster_name region = local.eks_cluster_region diff --git a/examples/camunda-8.6-irsa/db.tf b/examples/camunda-8.6-irsa/db.tf index 90676584..2360ca9b 100644 --- a/examples/camunda-8.6-irsa/db.tf +++ b/examples/camunda-8.6-irsa/db.tf @@ -24,7 +24,7 @@ locals { } module "postgresql" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.1.0" engine_version = "15.8" auto_minor_version_upgrade = false cluster_name = local.aurora_cluster_name diff --git a/examples/camunda-8.6-irsa/opensearch.tf b/examples/camunda-8.6-irsa/opensearch.tf index fafd1a2e..ae2d69a3 100644 --- a/examples/camunda-8.6-irsa/opensearch.tf +++ b/examples/camunda-8.6-irsa/opensearch.tf @@ -15,7 +15,7 @@ locals { } module "opensearch_domain" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.1.0" domain_name = local.opensearch_domain_name engine_version = "2.15" diff --git a/examples/camunda-8.6/cluster.tf b/examples/camunda-8.6/cluster.tf index 41d1a417..7b257fe0 100644 --- a/examples/camunda-8.6/cluster.tf +++ b/examples/camunda-8.6/cluster.tf @@ -4,7 +4,7 @@ locals { } module "eks_cluster" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.1.0" name = local.eks_cluster_name region = local.eks_cluster_region diff --git a/examples/camunda-8.6/db.tf b/examples/camunda-8.6/db.tf index a01f63fa..7c42ec29 100644 --- a/examples/camunda-8.6/db.tf +++ b/examples/camunda-8.6/db.tf @@ -19,7 +19,7 @@ locals { } module "postgresql" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.1.0" engine_version = "15.8" auto_minor_version_upgrade = false cluster_name = local.aurora_cluster_name diff --git a/examples/camunda-8.6/opensearch.tf b/examples/camunda-8.6/opensearch.tf index 4cfb809a..6952a02a 100644 --- a/examples/camunda-8.6/opensearch.tf +++ b/examples/camunda-8.6/opensearch.tf @@ -3,7 +3,7 @@ locals { } module "opensearch_domain" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.1.0" domain_name = local.opensearch_domain_name engine_version = "2.15" diff --git a/examples/camunda-8.7-irsa/cluster.tf b/examples/camunda-8.7-irsa/cluster.tf index 5b43ec8f..1e5c445f 100644 --- a/examples/camunda-8.7-irsa/cluster.tf +++ b/examples/camunda-8.7-irsa/cluster.tf @@ -4,7 +4,7 @@ locals { } module "eks_cluster" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.1.0" name = local.eks_cluster_name region = local.eks_cluster_region diff --git a/examples/camunda-8.7-irsa/db.tf b/examples/camunda-8.7-irsa/db.tf index 6ced3949..3595d8ce 100644 --- a/examples/camunda-8.7-irsa/db.tf +++ b/examples/camunda-8.7-irsa/db.tf @@ -23,7 +23,7 @@ locals { } module "postgresql" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.1.0" engine_version = "15.8" auto_minor_version_upgrade = false cluster_name = local.aurora_cluster_name diff --git a/examples/camunda-8.7-irsa/opensearch.tf b/examples/camunda-8.7-irsa/opensearch.tf index fafd1a2e..ae2d69a3 100644 --- a/examples/camunda-8.7-irsa/opensearch.tf +++ b/examples/camunda-8.7-irsa/opensearch.tf @@ -15,7 +15,7 @@ locals { } module "opensearch_domain" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.1.0" domain_name = local.opensearch_domain_name engine_version = "2.15" diff --git a/examples/camunda-8.7/cluster.tf b/examples/camunda-8.7/cluster.tf index 41d1a417..7b257fe0 100644 --- a/examples/camunda-8.7/cluster.tf +++ b/examples/camunda-8.7/cluster.tf @@ -4,7 +4,7 @@ locals { } module "eks_cluster" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/eks-cluster?ref=3.1.0" name = local.eks_cluster_name region = local.eks_cluster_region diff --git a/examples/camunda-8.7/db.tf b/examples/camunda-8.7/db.tf index a01f63fa..7c42ec29 100644 --- a/examples/camunda-8.7/db.tf +++ b/examples/camunda-8.7/db.tf @@ -19,7 +19,7 @@ locals { } module "postgresql" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/aurora?ref=3.1.0" engine_version = "15.8" auto_minor_version_upgrade = false cluster_name = local.aurora_cluster_name diff --git a/examples/camunda-8.7/opensearch.tf b/examples/camunda-8.7/opensearch.tf index 4cfb809a..6952a02a 100644 --- a/examples/camunda-8.7/opensearch.tf +++ b/examples/camunda-8.7/opensearch.tf @@ -3,7 +3,7 @@ locals { } module "opensearch_domain" { - source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.0.1" + source = "git::https://github.com/camunda/camunda-tf-eks-module//modules/opensearch?ref=3.1.0" domain_name = local.opensearch_domain_name engine_version = "2.15" diff --git a/modules/eks-cluster/iam.tf b/modules/eks-cluster/iam.tf index b6c111bd..82f6899a 100644 --- a/modules/eks-cluster/iam.tf +++ b/modules/eks-cluster/iam.tf @@ -5,7 +5,7 @@ module "ebs_cs_role" { source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks" - version = "5.47.1" + version = "5.48.0" role_name = "${var.name}-ebs-cs-role" @@ -25,7 +25,7 @@ module "ebs_cs_role" { # Following role allows cert-manager to do the DNS01 challenge module "cert_manager_role" { source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks" - version = "5.47.1" + version = "5.48.0" role_name = "${var.name}-cert-manager-role" @@ -44,7 +44,7 @@ module "cert_manager_role" { # Following role allows external-dns to adjust values in hosted zones module "external_dns_role" { source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks" - version = "5.47.1" + version = "5.48.0" role_name = "${var.name}-external-dns-role" diff --git a/test/src/go.mod b/test/src/go.mod index 8f5b848e..fd7bcd99 100644 --- a/test/src/go.mod +++ b/test/src/go.mod @@ -5,14 +5,14 @@ go 1.23.0 require ( github.com/aws/aws-sdk-go-v2 v1.32.4 github.com/aws/aws-sdk-go-v2/config v1.28.3 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.189.0 github.com/aws/aws-sdk-go-v2/service/eks v1.52.0 - github.com/aws/aws-sdk-go-v2/service/iam v1.37.4 + github.com/aws/aws-sdk-go-v2/service/iam v1.38.0 github.com/aws/aws-sdk-go-v2/service/kms v1.37.5 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.43.2 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.44.0 github.com/aws/aws-sdk-go-v2/service/rds v1.89.1 - github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 - github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 + github.com/aws/aws-sdk-go-v2/service/s3 v1.67.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.33.0 github.com/aws/smithy-go v1.22.0 github.com/gruntwork-io/terratest v0.47.2 github.com/sethvargo/go-password v0.3.1 diff --git a/test/src/go.sum b/test/src/go.sum index 0d47288b..ea2c4fe2 100644 --- a/test/src/go.sum +++ b/test/src/go.sum @@ -275,6 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0 h1:cA4hWo269CN5RY7Arqt8BfzXF0K github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0/go.mod h1:ossaD9Z1ugYb6sq9QIqQLEOorCGcqUoxlhud9M9yE70= github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.1 h1:g6N2LDa3UuNR8CZvTYuXUKzfCD6S1iqRIsDFkbtwu0Y= github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.1/go.mod h1:0A17IIeys01WfjDKehspGP+Cyo/YH/eNADIbEbRS9yM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.189.0 h1:eBriSsQa4r7aiKF2wv1EGYbK3X1VnjAYvdOlepBUi8s= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.189.0/go.mod h1:0A17IIeys01WfjDKehspGP+Cyo/YH/eNADIbEbRS9yM= github.com/aws/aws-sdk-go-v2/service/eks v1.50.0 h1:eL4AEDwVx29t+B7dkcuL/3W+RQKR64PPbfQVQTs8FEs= github.com/aws/aws-sdk-go-v2/service/eks v1.50.0/go.mod h1:0C9DxOpj1d8GioesPAKXMob9X2lyFepeL6C5z9oA4HM= github.com/aws/aws-sdk-go-v2/service/eks v1.50.2 h1:vL3RqZ4x6uqpKswp5gB0KyGcsrgkUdKmLTXCDHDUUZw= @@ -293,6 +295,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.37.3 h1:uuoXyOwX2ReYgHJW0W84cKDUrvQN github.com/aws/aws-sdk-go-v2/service/iam v1.37.3/go.mod h1:RCrjvkN/ZpVAzW3ZmIlyflv7MUM45YlWx3v+6MaVX2w= github.com/aws/aws-sdk-go-v2/service/iam v1.37.4 h1:MrH2MJRzxPGXtavvL1JtDLFJzXN+4ObO090jzauqcPk= github.com/aws/aws-sdk-go-v2/service/iam v1.37.4/go.mod h1:WJARDpnEOhixhh41f+kTTr67y28OvjIUVht++rfcILY= +github.com/aws/aws-sdk-go-v2/service/iam v1.38.0 h1:x2zxTpgLPylAKVZ1Lf7qiQkQHA7L5njP4eB01DrTlCw= +github.com/aws/aws-sdk-go-v2/service/iam v1.38.0/go.mod h1:WJARDpnEOhixhh41f+kTTr67y28OvjIUVht++rfcILY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.0 h1:FQNWhRuSq8QwW74GtU0MrveNhZbqvHsA4dkA9w8fTDQ= @@ -335,6 +339,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.43.0 h1:jqdiHKZ6cUMTbBphSY7DT github.com/aws/aws-sdk-go-v2/service/opensearch v1.43.0/go.mod h1:mKRPbBAyxpcboM8VCOdH0R6rLQTfa4LDKomD4J8YnL4= github.com/aws/aws-sdk-go-v2/service/opensearch v1.43.2 h1:4Nkrl5iHQPXVRfqIsuuQyCXxRNzotLwsgMSOwmUnnII= github.com/aws/aws-sdk-go-v2/service/opensearch v1.43.2/go.mod h1:JbyxgIAzR9wXnvVAqITjrpKRCcktIC+UWtPJ2meWZbg= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.44.0 h1:5U5Y6tWzqoP2Dr9APxkElg3tdMBsZd6PVWAq6NMYBbs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.44.0/go.mod h1:JbyxgIAzR9wXnvVAqITjrpKRCcktIC+UWtPJ2meWZbg= github.com/aws/aws-sdk-go-v2/service/rds v1.87.0 h1:f7u5jzUHaIIn5F121ortA0g2yDDWiPeTw2lWrgk9+ZA= github.com/aws/aws-sdk-go-v2/service/rds v1.87.0/go.mod h1:agnQGhYbHXxPM2+zZH4WZIpki6IDU6zFGzfOlnu+1Ow= github.com/aws/aws-sdk-go-v2/service/rds v1.87.2 h1:EUBCpvWYJRDV+baakcOlytZsEnjq21dBBw+di4q5TUE= @@ -359,6 +365,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 h1:p9TNFL8bFUMd+38YIpTAXpoxyz0Mx github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2/go.mod h1:fNjyo0Coen9QTwQLWeV6WO2Nytwiu+cCcWaTdKCAqqE= github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 h1:neNOYJl72bHrz9ikAEED4VqWyND/Po0DnEx64RW6YM4= github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3/go.mod h1:TMhLIyRIyoGVlaEMAt+ITMbwskSTpcGsCPDq91/ihY0= +github.com/aws/aws-sdk-go-v2/service/s3 v1.67.0 h1:SwaJ0w0MOp0pBTIKTamLVeTKD+iOWyNJRdJ2KCQRg6Q= +github.com/aws/aws-sdk-go-v2/service/s3 v1.67.0/go.mod h1:TMhLIyRIyoGVlaEMAt+ITMbwskSTpcGsCPDq91/ihY0= github.com/aws/aws-sdk-go-v2/service/sso v1.24.0 h1:71FvP6XFj53NK+YiAEGVzeiccLVeFnHOCvMig0zOHsE= github.com/aws/aws-sdk-go-v2/service/sso v1.24.0/go.mod h1:UVJqtKXSd9YppRKgdBIkyv7qgbSGv5DchM3yX0BN2mU= github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk= @@ -383,6 +391,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 h1:wVnQ6tigGsRqSWDEEyH6lSAJ9OyF github.com/aws/aws-sdk-go-v2/service/sts v1.32.3/go.mod h1:VZa9yTFyj4o10YGsmDO4gbQJUvvhY72fhumT8W4LqsE= github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 h1:yDxvkz3/uOKfxnv8YhzOi9m+2OGIxF+on3KOISbK5IU= github.com/aws/aws-sdk-go-v2/service/sts v1.32.4/go.mod h1:9XEUty5v5UAsMiFOBJrNibZgwCeOma73jgGwwhgffa8= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.0 h1:s7LRgBqhwLaxcocnAniBJp7gaAB+4I4vHzqUqjH18yc= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.0/go.mod h1:9XEUty5v5UAsMiFOBJrNibZgwCeOma73jgGwwhgffa8= github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM= github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=