fix(sdk): Fix handling of kas rewrap errors (#1696)

elizabethhealy · web-flow · commit ce10f3f8a8d3 · 2024-11-04T21:33:44.000Z
reversed handling of requests successful error detection in xtest https://github.com/opentdf/tests/actions/runs/11635869428/job/32406122022?pr=220
diff --git a/sdk/tdf.go b/sdk/tdf.go
@@ -806,10 +806,10 @@ func (r *Reader) doPayloadKeyUnwrap(ctx context.Context) error { //nolint:gocogn
 			wrappedKey, err = client.unwrap(ctx, keyAccessObj, r.manifest.EncryptionInformation.Policy)
 			if err != nil {
 				errToReturn := fmt.Errorf("doPayloadKeyUnwrap splitKey.rewrap failed: %w", err)
-				if !strings.Contains(err.Error(), codes.InvalidArgument.String()) {
+				if strings.Contains(err.Error(), codes.InvalidArgument.String()) {
 					return fmt.Errorf("%w: %w", ErrRewrapBadRequest, errToReturn)
 				}
-				if !strings.Contains(err.Error(), codes.PermissionDenied.String()) {
+				if strings.Contains(err.Error(), codes.PermissionDenied.String()) {
 					return fmt.Errorf("%w: %w", errRewrapForbidden, errToReturn)
 				}
 				return errToReturn

Original file line number	Diff line number	Diff line change
`@@ -806,10 +806,10 @@ func (r *Reader) doPayloadKeyUnwrap(ctx context.Context) error { //nolint:gocogn`
`806`	`806`	`wrappedKey, err = client.unwrap(ctx, keyAccessObj, r.manifest.EncryptionInformation.Policy)`
`807`	`807`	`if err != nil {`
`808`	`808`	`errToReturn := fmt.Errorf("doPayloadKeyUnwrap splitKey.rewrap failed: %w", err)`
`809`		`- if !strings.Contains(err.Error(), codes.InvalidArgument.String()) {`
	`809`	`+ if strings.Contains(err.Error(), codes.InvalidArgument.String()) {`
`810`	`810`	`return fmt.Errorf("%w: %w", ErrRewrapBadRequest, errToReturn)`
`811`	`811`	`}`
`812`		`- if !strings.Contains(err.Error(), codes.PermissionDenied.String()) {`
	`812`	`+ if strings.Contains(err.Error(), codes.PermissionDenied.String()) {`
`813`	`813`	`return fmt.Errorf("%w: %w", errRewrapForbidden, errToReturn)`
`814`	`814`	`}`
`815`	`815`	`return errToReturn`