diff --git a/Dockerfile b/Dockerfile index ae81a36..d40d757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG RUNTIME_VERSION="3.11" -ARG DISTRO_VERSION="3.17" +ARG DISTRO_VERSION="3.18" ARG PULUMI_VERSION="3.67.1" FROM python:${RUNTIME_VERSION}-alpine${DISTRO_VERSION} AS builder diff --git a/Jenkinsfile b/Jenkinsfile index b59a757..e4268e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,4 +2,4 @@ library identifier: 'zdt-lib@master', retriever: modernSCM( [$class: 'GitSCMSource', remote: 'https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git']) -buildPodman name: 'jenkins-podman', trivyFail: 'NONE' +buildPodman name: 'jenkins-podman', trivyFail: 'CRITICAL' diff --git a/cloudbender/pulumi.py b/cloudbender/pulumi.py index 697e25e..377fdbc 100644 --- a/cloudbender/pulumi.py +++ b/cloudbender/pulumi.py @@ -117,6 +117,7 @@ def pulumi_ws(func): self.connection_manager.exportProfileEnv() # Secrets provider + secrets_provider = None if "secretsProvider" in self.pulumi: secrets_provider = self.pulumi["secretsProvider"] if ( @@ -127,16 +128,6 @@ def pulumi_ws(func): "Missing PULUMI_CONFIG_PASSPHRASE environment variable!" ) - else: - try: - if self._pulumi_code.IKNOWHATIDO: - logger.warning( - "Missing pulumi.secretsProvider setting, IKNOWHATIDO enabled ... " - ) - secrets_provider = None - except AttributeError: - raise ValueError("Missing pulumi.secretsProvider setting!") - # Set tag for stack file name and version _tags = {} try: diff --git a/requirements.txt b/requirements.txt index 6a301c1..e40e2e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ click pexpect python-minifier cfn-lint>=0.34 -pulumi>=3.67.0 -pulumi-aws>5.0.0 +pulumi>=3.80.0 +pulumi-aws>6.0.0 pulumi-aws-native pulumi-policy pulumi-command