refactor(sdk): re-use ID mismatch error

Author: joe0BAB

pkg/adaptation/plugin.go

@@ -2,7 +2,6 @@ package adaptation
 
 import (
 	"context"
-	"errors"
 	"net"
 	"sync"
 	"time"
@@ -64,10 +63,6 @@ func newExternalPlugin(conn net.Conn, v setupValidator) (*plugin, error) {
 	}, nil
 }
 
-var (
-	errIDMismatch = errors.New("id mismatch")
-)
-
 func (p *plugin) GetSecret(ctx context.Context, request secrets.Request) (secrets.Envelope, error) {
 	req := connect.NewRequest(v1.GetSecretRequest_builder{
 		SecretId: proto.String(request.ID.String()),
@@ -81,7 +76,7 @@ func (p *plugin) GetSecret(ctx context.Context, request secrets.Request) (secret
 		return envelopeErr(request, err), err
 	}
 	if id != request.ID {
-		return envelopeErr(request, errIDMismatch), errIDMismatch
+		return envelopeErr(request, secrets.ErrIDMismatch), secrets.ErrIDMismatch
 	}
 	return secrets.Envelope{
 		ID:       id,

pkg/secrets/secrets.go

@@ -9,6 +9,7 @@ import (
 var (
 	ErrNotFound     = errors.New("secret not found")
 	ErrAccessDenied = errors.New("access denied") // nuh, uh, uh!
+	ErrIDMismatch   = errors.New("id mismatch")
 )
 
 type Request struct {

plugin/resolver.go

@@ -46,7 +46,7 @@ func (r *resolverService) GetSecret(ctx context.Context, c *connect.Request[reso
 		return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("failed to get secret %q: %w", msgID, err))
 	}
 	if envelope.ID != id {
-		return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("secret ID mismatch: expected %q, got %q", id, envelope.ID))
+		return nil, connect.NewError(connect.CodeInternal, secrets.ErrIDMismatch)
 	}
 	return connect.NewResponse(resolverv1.GetSecretResponse_builder{
 		SecretId:    proto.String(envelope.ID.String()),

plugin/resolver_test.go

@@ -118,7 +118,7 @@ func TestResolverService_GetSecret(t *testing.T) {
 				close(done)
 				s := &resolverService{resolver: newMockResolver(t, withMockResolverID("wrongID")), setupCompleted: done, registrationTimeout: 10 * time.Second}
 				_, err := s.GetSecret(t.Context(), newGetSecretRequest(mockSecretID))
-				assert.ErrorContains(t, err, "secret ID mismatch")
+				assert.ErrorIs(t, err, secrets.ErrIDMismatch)
 			},
 		},
 		{