From 7190042f8eb31c49a50a29d24dc52d8caa61a7de Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Thu, 14 Dec 2023 17:48:37 -0800 Subject: [PATCH] =?UTF-8?q?internal/credential:=20=F0=9F=A4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service_list_stores_ext_test.go | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/credential/service_list_stores_ext_test.go b/internal/credential/service_list_stores_ext_test.go index c5b080170..1ef0c856e 100644 --- a/internal/credential/service_list_stores_ext_test.go +++ b/internal/credential/service_list_stores_ext_test.go @@ -167,7 +167,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, nil, 1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing grants hash") @@ -177,7 +177,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), 0, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") @@ -187,14 +187,14 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), -1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") }) t.Run("nil filter func", func(t *testing.T) { t.Parallel() - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), 1, nil, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing filter item callback") @@ -212,7 +212,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), 1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "token did not have a pagination token component") @@ -222,7 +222,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), 1, filterFunc, tok, nil, []string{prj.PublicId}) require.ErrorContains(t, err, "missing repo") @@ -232,7 +232,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresPage(ctx, []byte("some hash"), 1, filterFunc, tok, repo, nil) require.ErrorContains(t, err, "missing project ids") @@ -245,7 +245,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, nil, 1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing grants hash") @@ -255,7 +255,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, []byte("some hash"), 0, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") @@ -265,14 +265,14 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, []byte("some hash"), -1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") }) t.Run("nil filter func", func(t *testing.T) { t.Parallel() - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, []byte("some hash"), 1, nil, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing filter item callback") @@ -290,7 +290,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, []byte("some hash"), 1, filterFunc, tok, nil, []string{prj.PublicId}) require.ErrorContains(t, err, "missing repo") @@ -300,7 +300,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) + tok, err := listtoken.NewStartRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefresh(ctx, []byte("some hash"), 1, filterFunc, tok, repo, nil) require.ErrorContains(t, err, "missing project ids") @@ -313,7 +313,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, nil, 1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing grants hash") @@ -323,7 +323,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), 0, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") @@ -333,14 +333,14 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), -1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "page size must be at least 1") }) t.Run("nil filter func", func(t *testing.T) { t.Parallel() - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), 1, nil, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "missing filter item callback") @@ -358,7 +358,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), "some-id", fiveDaysAgo) + tok, err := listtoken.NewPagination(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), "some-id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), 1, filterFunc, tok, repo, []string{prj.PublicId}) require.ErrorContains(t, err, "token did not have a refresh token component") @@ -368,7 +368,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), 1, filterFunc, tok, nil, []string{prj.PublicId}) require.ErrorContains(t, err, "missing repo") @@ -378,7 +378,7 @@ func TestStoreService_List(t *testing.T) { filterFunc := func(_ context.Context, s credential.Store) (bool, error) { return true, nil } - tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialLibrary, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) + tok, err := listtoken.NewRefresh(ctx, fiveDaysAgo, resource.CredentialStore, []byte("some hash"), fiveDaysAgo, fiveDaysAgo, fiveDaysAgo, "some other id", fiveDaysAgo) require.NoError(t, err) _, err = credential.ListStoresRefreshPage(ctx, []byte("some hash"), 1, filterFunc, tok, repo, nil) require.ErrorContains(t, err, "missing project ids")