From 20d0e0f3ee4a2b49a0418f9172efe35deb886932 Mon Sep 17 00:00:00 2001 From: Young Date: Fri, 21 Feb 2020 17:12:50 -0800 Subject: [PATCH] update ASM error message to be more clear --- agent/taskresource/asmsecret/asmsecret.go | 2 +- agent/taskresource/asmsecret/asmsecret_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/taskresource/asmsecret/asmsecret.go b/agent/taskresource/asmsecret/asmsecret.go index 0e0176bc382..b44891269d8 100644 --- a/agent/taskresource/asmsecret/asmsecret.go +++ b/agent/taskresource/asmsecret/asmsecret.go @@ -353,7 +353,7 @@ func getASMParametersFromInput(valueFrom string) (input *secretsmanager.GetSecre } if len(paramValues) != len(strings.Split(asmARNResourceWithParametersFormat, arnDelimiter)) { // can't tell what input this is, throw some error - err = errors.New("unexpected ARN format with parameters when trying to retrieve ASM secret") + err = errors.New("an invalid ARN format for the AWS Secrets Manager secret was specified. Specify a valid ARN and try again.") return nil, "", err } diff --git a/agent/taskresource/asmsecret/asmsecret_test.go b/agent/taskresource/asmsecret/asmsecret_test.go index 2454612d431..fc64102bba0 100644 --- a/agent/taskresource/asmsecret/asmsecret_test.go +++ b/agent/taskresource/asmsecret/asmsecret_test.go @@ -277,7 +277,7 @@ func TestCreateWithASMParametersWrongFormat(t *testing.T) { assert.Error(t, asmRes.Create()) expectedError := fmt.Sprintf("trying to retrieve secret with value %s resulted in error: "+ - "unexpected ARN format with parameters when trying to retrieve ASM secret", valueFromWrongFormat) + "an invalid ARN format for the AWS Secrets Manager secret was specified. Specify a valid ARN and try again.", valueFromWrongFormat) assert.Contains(t, asmRes.GetTerminalReason(), expectedError) }