From c25b9285c0d3a37f307c14c079b62cf6086b4aad Mon Sep 17 00:00:00 2001 From: Damian Debkowski Date: Thu, 28 Jul 2022 11:58:45 -0700 Subject: [PATCH] fix(test) uncomment ro tests for cred update (#2301) --- .../credentials/credential_service_test.go | 108 +++++++++--------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/internal/daemon/controller/handlers/credentials/credential_service_test.go b/internal/daemon/controller/handlers/credentials/credential_service_test.go index 2321c20bb4..deb26dc6b9 100644 --- a/internal/daemon/controller/handlers/credentials/credential_service_test.go +++ b/internal/daemon/controller/handlers/credentials/credential_service_test.go @@ -938,60 +938,58 @@ func TestUpdate(t *testing.T) { assert.Empty(cmp.Diff(got, want, protocmp.Transform())) }) } - /* - - // cant update read only fields - cred, cleanup := freshCred("user", "pass") - defer cleanup() - - newStore := static.TestCredentialStore(t, conn, wrapper, prj.GetPublicId()) - - roCases := []struct { - path string - item *pb.Credential - matcher func(t *testing.T, e error) // When not set defaults to checking against InvalidArgument Error - }{ - { - path: "type", - item: &pb.Credential{Type: "something"}, - }, - { - path: "store_id", - item: &pb.Credential{CredentialStoreId: newStore.GetPublicId()}, - }, - { - path: "updated_time", - item: &pb.Credential{UpdatedTime: timestamppb.Now()}, - }, - { - path: "created_time", - item: &pb.Credential{UpdatedTime: timestamppb.Now()}, - }, - { - path: "authorized_actions", - item: &pb.Credential{AuthorizedActions: append(testAuthorizedActions, "another")}, - }, - } - for _, tc := range roCases { - t.Run(fmt.Sprintf("ReadOnlyField/%s", tc.path), func(t *testing.T) { - req := &pbs.UpdateCredentialRequest{ - Id: cred.GetPublicId(), - Item: tc.item, - UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{tc.path}}, - } - req.Item.Version = cred.Version - - got, gErr := s.UpdateCredential(ctx, req) - assert.Error(t, gErr) - matcher := tc.matcher - if matcher == nil { - matcher = func(t *testing.T, e error) { - assert.Truef(t, errors.Is(gErr, handlers.ApiErrorWithCode(codes.InvalidArgument)), "got error %v, wanted invalid argument", gErr) - } + + // cant update read only fields + cred, cleanupKv := freshCredUp("user", "pass") + defer cleanupKv() + + newStore := static.TestCredentialStore(t, conn, wrapper, prj.GetPublicId()) + + roCases := []struct { + path string + item *pb.Credential + matcher func(t *testing.T, e error) // When not set defaults to checking against InvalidArgument Error + }{ + { + path: "type", + item: &pb.Credential{Type: "something"}, + }, + { + path: "store_id", + item: &pb.Credential{CredentialStoreId: newStore.GetPublicId()}, + }, + { + path: "updated_time", + item: &pb.Credential{UpdatedTime: timestamppb.Now()}, + }, + { + path: "created_time", + item: &pb.Credential{UpdatedTime: timestamppb.Now()}, + }, + { + path: "authorized_actions", + item: &pb.Credential{AuthorizedActions: append(testAuthorizedActions, "another")}, + }, + } + for _, tc := range roCases { + t.Run(fmt.Sprintf("ReadOnlyField/%s", tc.path), func(t *testing.T) { + req := &pbs.UpdateCredentialRequest{ + Id: cred.GetPublicId(), + Item: tc.item, + UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{tc.path}}, + } + req.Item.Version = cred.Version + + got, gErr := s.UpdateCredential(ctx, req) + assert.Error(t, gErr) + matcher := tc.matcher + if matcher == nil { + matcher = func(t *testing.T, e error) { + assert.Truef(t, errors.Is(gErr, handlers.ApiErrorWithCode(codes.InvalidArgument)), "got error %v, wanted invalid argument", gErr) } - matcher(t, gErr) - assert.Nil(t, got) - }) - } - */ + } + matcher(t, gErr) + assert.Nil(t, got) + }) + } }