Skip to content

Commit d4e7738

Browse files
committed
Show which AWS credentials are used during installation
1 parent f624d42 commit d4e7738

File tree

1 file changed

+29
-15
lines changed

1 file changed

+29
-15
lines changed

cortex.sh

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ export CORTEX_VERSION_STABLE=master
9292

9393
export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-""}"
9494
export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY:-""}"
95+
export CORTEX_AWS_ACCESS_KEY_ID="${CORTEX_AWS_ACCESS_KEY_ID:-""}"
96+
export CORTEX_AWS_SECRET_ACCESS_KEY="${CORTEX_AWS_SECRET_ACCESS_KEY:-""}"
9597

9698
function set_aws_credentials_from_cli() {
9799
if ! command -v aws >/dev/null; then
@@ -106,28 +108,40 @@ function set_aws_credentials_from_cli() {
106108

107109
export AWS_ACCESS_KEY_ID=$(aws --profile default configure get aws_access_key_id)
108110
export AWS_SECRET_ACCESS_KEY=$(aws --profile default configure get aws_secret_access_key)
111+
112+
echo -e "\n✓ Installation will use AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from AWS CLI's default profile)"
109113
}
110114

111-
if [ "$AWS_ACCESS_KEY_ID" == "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
112-
echo -e "\nPlease set your AWS access key ID (export AWS_ACCESS_KEY_ID=***)"
113-
exit 1
114-
fi
115+
function set_aws_credentials() {
116+
if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
117+
echo -e "\n✓ Installation will use AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID (from environment variable)"
118+
return
119+
fi
115120

116-
if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
117-
echo -e "\nPlease set your AWS secret access key (export AWS_SECRET_ACCESS_KEY=***)"
118-
exit 1
119-
fi
121+
if [ "$AWS_ACCESS_KEY_ID" == "" ] && [ "$AWS_SECRET_ACCESS_KEY" != "" ]; then
122+
echo -e "\nPlease run \`export AWS_ACCESS_KEY_ID=***\`"
123+
exit 1
124+
fi
125+
126+
if [ "$AWS_ACCESS_KEY_ID" != "" ] && [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
127+
echo -e "\nPlease run \`export AWS_SECRET_ACCESS_KEY=***\`"
128+
exit 1
129+
fi
120130

121-
if [ "$AWS_ACCESS_KEY_ID" == "" ] || [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
122131
set_aws_credentials_from_cli
123-
fi
124132

125-
if [ "$AWS_ACCESS_KEY_ID" == "" ] || [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
126-
if command -v aws >/dev/null; then
127-
echo -e "\nPlease set your AWS credentials via environment variables (export AWS_ACCESS_KEY_ID=***; export AWS_SECRET_ACCESS_KEY=***) or via the AWS CLI (aws configure)"
128-
else
129-
echo -e "\nPlease set your AWS credentials (export AWS_ACCESS_KEY_ID=***; export AWS_SECRET_ACCESS_KEY=***)"
133+
if [ "$AWS_ACCESS_KEY_ID" == "" ] || [ "$AWS_SECRET_ACCESS_KEY" == "" ]; then
134+
echo -e "\nPlease run \`export AWS_ACCESS_KEY_ID=***; export AWS_SECRET_ACCESS_KEY=***\`"
135+
exit 1
130136
fi
137+
}
138+
139+
set_aws_credentials
140+
141+
if [ "$CORTEX_AWS_ACCESS_KEY_ID" != "" ] && [ "$CORTEX_AWS_SECRET_ACCESS_KEY" != "" ]; then
142+
echo "✓ Operator will use AWS_ACCESS_KEY_ID=$CORTEX_AWS_ACCESS_KEY_ID (from environment variable)"
143+
elif [ "$CORTEX_AWS_ACCESS_KEY_ID" != "" ] || [ "$CORTEX_AWS_SECRET_ACCESS_KEY" != "" ]; then
144+
echo -e "\nPlease export both CORTEX_AWS_ACCESS_KEY_ID and CORTEX_AWS_SECRET_ACCESS_KEY"
131145
exit 1
132146
fi
133147

0 commit comments

Comments
 (0)