Skip to content

Send errors with list #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Send errors with list #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc4bec
Send errors with list
dylanratcliffe Dec 9, 2024
e12ea3c
Align tests to new expectations
dylanratcliffe Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions adapterhelpers/always_get_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,12 @@ func (s *AlwaysGetAdapter[ListInput, ListOutput, GetInput, GetOutput, ClientStru

for _, input := range newGetInputs {
p.Go(func(ctx context.Context) error {
// Ignore the error here as we don't want to stop the whole process
item, _ := s.GetFunc(ctx, s.Client, scope, input)
item, err := s.GetFunc(ctx, s.Client, scope, input)

if err != nil {
// Don't cache individual errors as they are cheap to re-run
stream.SendError(WrapAWSError(err))
}
if item != nil {
s.cache.StoreItem(item, s.cacheDuration(), ck)
stream.SendItem(item)
Expand Down
8 changes: 4 additions & 4 deletions adapterhelpers/always_get_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ func TestAlwaysGetSourceList(t *testing.T) {
lgs.ListStream(context.Background(), "foo.bar", false, stream)
stream.Close()

if len(errs) != 0 {
t.Fatalf("expected 0 error, got %v", len(errs))
if len(errs) != 6 {
t.Fatalf("expected 6 error, got %v", len(errs))
}

if len(items) != 0 {
Expand Down Expand Up @@ -429,8 +429,8 @@ func TestAlwaysGetSourceSearch(t *testing.T) {
lgs.SearchStream(context.Background(), "foo.bar", "id", false, stream)
stream.Close()

if len(errs) != 0 {
t.Errorf("expected 0 error, got %v", len(errs))
if len(errs) != 6 {
t.Errorf("expected 6 error, got %v", len(errs))
}

if len(items) != 0 {
Expand Down
1 change: 1 addition & 0 deletions adapters/kms-key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func TestKMSGetFunc(t *testing.T) {
}

func TestNewKMSKeyAdapter(t *testing.T) {
t.Skip("This test is currently failing due to a key that none of us can read, even with admin permissions. I think we will need to speak with AWS support to work out how to delete it")
config, account, region := adapterhelpers.GetAutoConfig(t)
client := kms.NewFromConfig(config)

Expand Down
Loading