Merge pull request #707 from overmindtech/fix-list-errors

Send errors with list

Author: Dylan

adapterhelpers/always_get_source.go

@@ -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)

adapterhelpers/always_get_source_test.go

@@ -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 {
@@ -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 {

adapters/kms-key_test.go

@@ -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)