From 16fa128e967e4b62c2a25caaf0d9f98790b53805 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Mon, 28 Nov 2022 18:16:43 +0000
Subject: [PATCH] Fix passing AWS creds through Dapper

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 Dockerfile.dapper    | 2 +-
 scripts/build-upload | 2 ++
 scripts/log-upload   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 6cd345ce9d..a4569052c6 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -44,7 +44,7 @@ ARG SELINUX=true
 ENV SELINUX $SELINUX
 
 ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
-ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG DEBUG
+ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG DEBUG
 ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
 
diff --git a/scripts/build-upload b/scripts/build-upload
index a5d5cc00ee..fedf29e0d7 100755
--- a/scripts/build-upload
+++ b/scripts/build-upload
@@ -2,9 +2,11 @@
 
 # Check for AWS Credentials
 [ -n "$AWS_SECRET_ACCESS_KEY" ] || {
+  echo "AWS_SECRET_ACCESS_KEY is not set"
   exit 0
 }
 [ -n "$AWS_ACCESS_KEY_ID" ] || {
+  echo "AWS_ACCESS_KEY_ID is not set"
   exit 0
 }
 
diff --git a/scripts/log-upload b/scripts/log-upload
index fd946c362f..dc4068eaf6 100755
--- a/scripts/log-upload
+++ b/scripts/log-upload
@@ -2,9 +2,11 @@
 
 # Check for AWS Credentials
 [ -n "$AWS_SECRET_ACCESS_KEY" ] || {
+  echo "AWS_SECRET_ACCESS_KEY is not set"
   exit 0
 }
 [ -n "$AWS_ACCESS_KEY_ID" ] || {
+  echo "AWS_ACCESS_KEY_ID is not set"
   exit 0
 }