Skip to content
Snippets Groups Projects
Commit cca23cda authored by Daniel Naude's avatar Daniel Naude
Browse files

Improve error handling

parent ae776050
No related branches found
No related tags found
1 merge request!48Migrate to aws sdk for go v2
...@@ -129,9 +129,9 @@ func AWSErrorExceptionCode(err error) string { ...@@ -129,9 +129,9 @@ func AWSErrorExceptionCode(err error) string {
return "" return ""
} }
var apiErr *smithy.GenericAPIError var apiErr smithy.APIError
if errors.As(err, &apiErr) { if errors.As(err, &apiErr) {
return apiErr.Code return apiErr.ErrorCode()
} }
return "" return ""
} }
...@@ -141,9 +141,9 @@ func AWSErrorWithoutExceptionCode(err error) error { ...@@ -141,9 +141,9 @@ func AWSErrorWithoutExceptionCode(err error) error {
return nil return nil
} }
var apiErr *smithy.GenericAPIError var apiErr smithy.APIError
if errors.As(err, &apiErr) { if errors.As(err, &apiErr) {
return Error(apiErr.Message) return Error(apiErr.ErrorMessage())
} }
return err return err
} }
......
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
"github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/smithy-go"
"gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/secrets_manager" "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/secrets_manager"
std_errors "errors" std_errors "errors"
...@@ -22,6 +21,7 @@ import ( ...@@ -22,6 +21,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/google/uuid" "github.com/google/uuid"
) )
...@@ -336,12 +336,10 @@ func (s ClientWithHelpers) FileExists(bucket string, fileName string) (bool, err ...@@ -336,12 +336,10 @@ func (s ClientWithHelpers) FileExists(bucket string, fileName string) (bool, err
Key: aws.String(fileName), Key: aws.String(fileName),
}) })
if err != nil { if err != nil {
var apiErr *smithy.GenericAPIError var notFoundErr *types.NotFound
if std_errors.As(err, &apiErr) { if std_errors.As(err, &notFoundErr) {
if apiErr.Code == "NotFound" {
return false, nil return false, nil
} }
}
return false, err return false, err
} }
return true, nil return true, nil
......
...@@ -95,9 +95,9 @@ func instantiateSecretManagerClient(isDebug bool) (err error) { ...@@ -95,9 +95,9 @@ func instantiateSecretManagerClient(isDebug bool) (err error) {
// logError Logs any errors returned by the Secrets Manager client // logError Logs any errors returned by the Secrets Manager client
func logError(err error) { func logError(err error) {
var apiErr *smithy.GenericAPIError var apiErr smithy.APIError
if errors.As(err, &apiErr) { if errors.As(err, &apiErr) {
logs.Info(apiErr.Code+" %s", apiErr.Message) logs.Info(apiErr.ErrorCode()+" %s", apiErr.ErrorMessage())
} else { } else {
logs.Info(err.Error()) logs.Info(err.Error())
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment