@@ -81,11 +81,12 @@ func InvalidArgumentError(msg string, f map[string]string) error {
8181// and credentials. This method will fallback to parsing the http status code
8282// when it cannot match an aws error code. This method does not handle specific
8383// service type errors such as S3 or EC2.
84- func ParseAWSError (err error , msg string ) (st * status.Status , permission * pb.Permission ) {
84+ func ParseAWSError (op string , err error ) (st * status.Status , permission * pb.Permission ) {
8585 if err == nil {
8686 return nil , nil
8787 }
8888
89+ msg := fmt .Sprintf ("%s: %v" , op , err )
8990 // find the service name of the aws api
9091 serviceName := "unknown"
9192 var oe * smithy.OperationError
@@ -113,7 +114,7 @@ func ParseAWSError(err error, msg string) (st *status.Status, permission *pb.Per
113114 Codes : retry .DefaultThrottleErrorCodes ,
114115 }
115116 if throttleErr .IsErrorThrottle (err ).Bool () {
116- statusMsg := fmt .Sprintf ("aws service %s: throttling error : %s" , serviceName , msg )
117+ statusMsg := fmt .Sprintf ("aws service %s: throttling: %s" , serviceName , msg )
117118 return status .New (codes .Unavailable , statusMsg ), nil
118119 }
119120
@@ -126,31 +127,31 @@ func ParseAWSError(err error, msg string) (st *status.Status, permission *pb.Per
126127 case awsErrorInvalidAccessKeyId :
127128 fallthrough
128129 case awsErrorExpiredToken :
129- statusMsg := fmt .Sprintf ("aws service %s: invalid credentials error : %s" , serviceName , msg )
130+ statusMsg := fmt .Sprintf ("aws service %s: invalid credentials: %s" , serviceName , msg )
130131 return status .New (codes .PermissionDenied , statusMsg ), & pb.Permission {
131132 State : pb .StateType_STATE_TYPE_ERROR ,
132133 ErrorDetails : apiErr .ErrorMessage (),
133134 CheckedAt : timestamppb .Now (),
134135 }
135136 case awsErrorNoSuchBucket :
136- statusMsg := fmt .Sprintf ("aws %s error : %s" , serviceName , msg )
137+ statusMsg := fmt .Sprintf ("aws service %s : %s" , serviceName , msg )
137138 return status .New (codes .NotFound , statusMsg ), & pb.Permission {
138139 State : pb .StateType_STATE_TYPE_ERROR ,
139140 ErrorDetails : apiErr .ErrorMessage (),
140141 CheckedAt : timestamppb .Now (),
141142 }
142143 case awsErrorBadDigest :
143- statusMsg := fmt .Sprintf ("aws %s error : %s" , serviceName , msg )
144+ statusMsg := fmt .Sprintf ("aws service %s : %s" , serviceName , msg )
144145 return status .New (codes .Aborted , statusMsg ), nil
145146 case awsErrorNoSuchKey :
146147 fallthrough
147148 case awsErrorInvalidObjectState :
148- statusMsg := fmt .Sprintf ("aws %s error : %s" , serviceName , msg )
149+ statusMsg := fmt .Sprintf ("aws service %s : %s" , serviceName , msg )
149150 return status .New (codes .NotFound , statusMsg ), nil
150151 case awsErrorRequestTimeout :
151152 fallthrough
152153 case awsErrorRequestTimeoutException :
153- statusMsg := fmt .Sprintf ("aws %s error : %s" , serviceName , msg )
154+ statusMsg := fmt .Sprintf ("aws service %s : %s" , serviceName , msg )
154155 return status .New (codes .DeadlineExceeded , statusMsg ), nil
155156 }
156157 }
@@ -165,39 +166,39 @@ func ParseAWSError(err error, msg string) (st *status.Status, permission *pb.Per
165166 defer httpErr .Response .Body .Close ()
166167 switch httpErr .HTTPStatusCode () {
167168 case http .StatusBadRequest :
168- statusMsg := fmt .Sprintf ("aws service %s: bad request error : %s" , serviceName , msg )
169+ statusMsg := fmt .Sprintf ("aws service %s: bad request: %s" , serviceName , msg )
169170 return status .New (codes .InvalidArgument , statusMsg ), nil
170171 case http .StatusUnauthorized :
171- statusMsg := fmt .Sprintf ("aws service %s: invalid credentials error : %s" , serviceName , msg )
172+ statusMsg := fmt .Sprintf ("aws service %s: invalid credentials: %s" , serviceName , msg )
172173 return status .New (codes .PermissionDenied , statusMsg ), & pb.Permission {
173174 State : pb .StateType_STATE_TYPE_ERROR ,
174175 ErrorDetails : buf .String (),
175176 CheckedAt : timestamppb .Now (),
176177 }
177178 case http .StatusForbidden :
178- statusMsg := fmt .Sprintf ("aws service %s: invalid credentials error : %s" , serviceName , msg )
179+ statusMsg := fmt .Sprintf ("aws service %s: invalid credentials: %s" , serviceName , msg )
179180 return status .New (codes .PermissionDenied , statusMsg ), & pb.Permission {
180181 State : pb .StateType_STATE_TYPE_ERROR ,
181182 ErrorDetails : buf .String (),
182183 CheckedAt : timestamppb .Now (),
183184 }
184185 case http .StatusNotFound :
185- statusMsg := fmt .Sprintf ("aws service %s: resource not found error : %s" , serviceName , msg )
186+ statusMsg := fmt .Sprintf ("aws service %s: resource not found: %s" , serviceName , msg )
186187 return status .New (codes .NotFound , statusMsg ), nil
187188 case http .StatusTooManyRequests :
188- statusMsg := fmt .Sprintf ("aws service %s: throttling error : %s" , serviceName , msg )
189+ statusMsg := fmt .Sprintf ("aws service %s: throttling: %s" , serviceName , msg )
189190 return status .New (codes .Unavailable , statusMsg ), nil
190191 case http .StatusInternalServerError :
191192 fallthrough
192193 case http .StatusBadGateway :
193194 fallthrough
194195 case http .StatusServiceUnavailable :
195- statusMsg := fmt .Sprintf ("aws service %s: connectivity error : %s" , serviceName , msg )
196+ statusMsg := fmt .Sprintf ("aws service %s: connectivity: %s" , serviceName , msg )
196197 return status .New (codes .Unavailable , statusMsg ), nil
197198 case http .StatusRequestTimeout :
198199 fallthrough
199200 case http .StatusGatewayTimeout :
200- statusMsg := fmt .Sprintf ("aws service %s: timeout error : %s" , serviceName , msg )
201+ statusMsg := fmt .Sprintf ("aws service %s: timeout: %s" , serviceName , msg )
201202 return status .New (codes .DeadlineExceeded , statusMsg ), nil
202203 }
203204 }
0 commit comments