Add endlines to make git happy and TrimSuffix to make tests happy

Signed-off-by: Mustafa Abdelrahman <[email protected]>
zalando-incubator · Jun 14, 2023 · 3ad2824 · 3ad2824
1 parent 837dc16
commit 3ad2824
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/testdata/ingress_alb/expected.cf b/testdata/ingress_alb/expected.cf
@@ -216,4 +216,4 @@
             }
         }
     }
-}
+}
diff --git a/testdata/ingress_alb/ing.yaml b/testdata/ingress_alb/ing.yaml
@@ -13,4 +13,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/ingress_nlb/ing.yaml b/testdata/ingress_nlb/ing.yaml
@@ -15,4 +15,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/ingress_rg_notshared_alb/expected.cf b/testdata/ingress_rg_notshared_alb/expected.cf
@@ -216,4 +216,4 @@
             }
         }
     }
-}
+}
diff --git a/testdata/ingress_rg_notshared_alb/ing.yaml b/testdata/ingress_rg_notshared_alb/ing.yaml
@@ -13,4 +13,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/ingress_rg_shared_alb/expected.cf b/testdata/ingress_rg_shared_alb/expected.cf
@@ -216,4 +216,4 @@
             }
         }
     }
-}
+}
diff --git a/testdata/ingress_rg_shared_alb/ing.yaml b/testdata/ingress_rg_shared_alb/ing.yaml
@@ -13,4 +13,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/ingress_rg_shared_nlb/expected.cf b/testdata/ingress_rg_shared_nlb/expected.cf
@@ -184,4 +184,4 @@
             }
         }
     }
-}
+}
diff --git a/testdata/ingress_rg_shared_nlb/ing.yaml b/testdata/ingress_rg_shared_nlb/ing.yaml
@@ -13,4 +13,4 @@ spec:
             port:
               name: main-port
         path: /
-        pathType: ImplementationSpecific
+        pathType: ImplementationSpecific
diff --git a/testdata/rg_alb/expected.cf b/testdata/rg_alb/expected.cf
@@ -216,4 +216,4 @@
             }
         }
     }
-}
+}
diff --git a/testdata/rg_nlb/expected.cf b/testdata/rg_nlb/expected.cf
@@ -184,4 +184,4 @@
             }
         }
     }
-}
+}
diff --git a/worker_test.go b/worker_test.go
@@ -12,6 +12,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"reflect"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -598,7 +599,7 @@ func TestResourceConversion(tt *testing.T) {
 
 			assert.Equal(
 				t,
-				expected,
+				strings.TrimSuffix(expected, "\n"),
 				clientCF.GetLastGeneratedTemplate(),
 			)
 		})
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,4 +216,4 @@ @@
                 }
             }
         }
-    }
+    }