Fix remaining goldenfile tests

Signed-off-by: Lucas Thiesen <[email protected]>
zalando-incubator · Oct 19, 2023 · 9532601 · 9532601
1 parent 473bc79
commit 9532601
Show file tree

Hide file tree

Showing 24 changed files with 339 additions and 2 deletions.
diff --git a/testdata/ingress_rg_notshared_alb/ing.yaml → ...ata/ingress_rg_notshared_alb/k8s/ing.yaml b/testdata/ingress_rg_notshared_alb/ing.yaml → ...ata/ingress_rg_notshared_alb/k8s/ing.yaml
diff --git a/testdata/ingress_rg_notshared_alb/rg.yaml → ...data/ingress_rg_notshared_alb/k8s/rg.yaml b/testdata/ingress_rg_notshared_alb/rg.yaml → ...data/ingress_rg_notshared_alb/k8s/rg.yaml
diff --git a/testdata/ingress_rg_notshared_alb/params.json b/testdata/ingress_rg_notshared_alb/params.json
@@ -0,0 +1,54 @@
+[
+  {
+    "parameterKey": "LoadBalancerSchemeParameter",
+    "parameterValue": "internet-facing"
+  },
+  {
+    "parameterKey": "LoadBalancerSecurityGroupParameter",
+    "parameterValue": "42"
+  },
+  {
+    "parameterKey": "LoadBalancerSubnetsParameter",
+    "parameterValue": "foo1"
+  },
+  {
+    "parameterKey": "TargetGroupVPCIDParameter",
+    "parameterValue": "1"
+  },
+  {
+    "parameterKey": "TargetGroupTargetPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "ListenerSslPolicyParameter",
+    "parameterValue": "ELBSecurityPolicy-2016-08"
+  },
+  {
+    "parameterKey": "IpAddressType",
+    "parameterValue": "ipv4"
+  },
+  {
+    "parameterKey": "Type",
+    "parameterValue": "application"
+  },
+  {
+    "parameterKey": "HTTP2",
+    "parameterValue": "true"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPathParameter",
+    "parameterValue": ""
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckIntervalParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckTimeoutParameter",
+    "parameterValue": "0"
+  }
+]
diff --git a/testdata/ingress_rg_notshared_alb/tags.json b/testdata/ingress_rg_notshared_alb/tags.json
@@ -0,0 +1,15 @@
+[
+  {
+    "key": "kubernetes:application",
+    "value": ""
+  },{
+    "key": "kubernetes.io/cluster/aws:123:eu-central-1:kube-1",
+    "value": "owned"
+  },{
+    "key": "ingress:certificate-arn/DUMMY",
+    "value": "0001-01-01T00:00:00Z"
+  },{
+    "key": "ingress:owner",
+    "value": "/my-route-group"
+  }
+]
diff --git a/...data/ingress_rg_notshared_alb/expected.cf → ...data/ingress_rg_notshared_alb/template.cf b/...data/ingress_rg_notshared_alb/expected.cf → ...data/ingress_rg_notshared_alb/template.cf
diff --git a/testdata/ingress_rg_shared_alb/ing.yaml → testdata/ingress_rg_shared_alb/k8s/ing.yaml b/testdata/ingress_rg_shared_alb/ing.yaml → testdata/ingress_rg_shared_alb/k8s/ing.yaml
diff --git a/testdata/ingress_rg_shared_alb/rg.yaml → testdata/ingress_rg_shared_alb/k8s/rg.yaml b/testdata/ingress_rg_shared_alb/rg.yaml → testdata/ingress_rg_shared_alb/k8s/rg.yaml
diff --git a/testdata/ingress_rg_shared_alb/params.json b/testdata/ingress_rg_shared_alb/params.json
@@ -0,0 +1,54 @@
+[
+  {
+    "parameterKey": "LoadBalancerSchemeParameter",
+    "parameterValue": "internet-facing"
+  },
+  {
+    "parameterKey": "LoadBalancerSecurityGroupParameter",
+    "parameterValue": "42"
+  },
+  {
+    "parameterKey": "LoadBalancerSubnetsParameter",
+    "parameterValue": "foo1"
+  },
+  {
+    "parameterKey": "TargetGroupVPCIDParameter",
+    "parameterValue": "1"
+  },
+  {
+    "parameterKey": "TargetGroupTargetPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "ListenerSslPolicyParameter",
+    "parameterValue": "ELBSecurityPolicy-2016-08"
+  },
+  {
+    "parameterKey": "IpAddressType",
+    "parameterValue": "ipv4"
+  },
+  {
+    "parameterKey": "Type",
+    "parameterValue": "application"
+  },
+  {
+    "parameterKey": "HTTP2",
+    "parameterValue": "true"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPathParameter",
+    "parameterValue": ""
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckIntervalParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckTimeoutParameter",
+    "parameterValue": "0"
+  }
+]
diff --git a/testdata/ingress_rg_shared_alb/tags.json b/testdata/ingress_rg_shared_alb/tags.json
@@ -0,0 +1,15 @@
+[
+  {
+    "key": "kubernetes:application",
+    "value": ""
+  },{
+    "key": "kubernetes.io/cluster/aws:123:eu-central-1:kube-1",
+    "value": "owned"
+  },{
+    "key": "ingress:certificate-arn/DUMMY",
+    "value": "0001-01-01T00:00:00Z"
+  },{
+    "key": "ingress:owner",
+    "value": "/my-route-group"
+  }
+]
diff --git a/testdata/ingress_rg_shared_alb/expected.cf → testdata/ingress_rg_shared_alb/template.cf b/testdata/ingress_rg_shared_alb/expected.cf → testdata/ingress_rg_shared_alb/template.cf
diff --git a/testdata/ingress_rg_shared_nlb/ing.yaml → testdata/ingress_rg_shared_nlb/k8s/ing.yaml b/testdata/ingress_rg_shared_nlb/ing.yaml → testdata/ingress_rg_shared_nlb/k8s/ing.yaml
diff --git a/testdata/ingress_rg_shared_nlb/rg.yaml → testdata/ingress_rg_shared_nlb/k8s/rg.yaml b/testdata/ingress_rg_shared_nlb/rg.yaml → testdata/ingress_rg_shared_nlb/k8s/rg.yaml
diff --git a/testdata/ingress_rg_shared_nlb/params.json b/testdata/ingress_rg_shared_nlb/params.json
@@ -0,0 +1,54 @@
+[
+  {
+    "parameterKey": "LoadBalancerSchemeParameter",
+    "parameterValue": "internet-facing"
+  },
+  {
+    "parameterKey": "LoadBalancerSecurityGroupParameter",
+    "parameterValue": "42"
+  },
+  {
+    "parameterKey": "LoadBalancerSubnetsParameter",
+    "parameterValue": "foo1"
+  },
+  {
+    "parameterKey": "TargetGroupVPCIDParameter",
+    "parameterValue": "1"
+  },
+  {
+    "parameterKey": "TargetGroupTargetPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "ListenerSslPolicyParameter",
+    "parameterValue": "ELBSecurityPolicy-2016-08"
+  },
+  {
+    "parameterKey": "IpAddressType",
+    "parameterValue": "ipv4"
+  },
+  {
+    "parameterKey": "Type",
+    "parameterValue": "network"
+  },
+  {
+    "parameterKey": "HTTP2",
+    "parameterValue": "true"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPathParameter",
+    "parameterValue": ""
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckIntervalParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckTimeoutParameter",
+    "parameterValue": "0"
+  }
+]
diff --git a/testdata/ingress_rg_shared_nlb/tags.json b/testdata/ingress_rg_shared_nlb/tags.json
@@ -0,0 +1,15 @@
+[
+  {
+    "key": "kubernetes:application",
+    "value": ""
+  },{
+    "key": "kubernetes.io/cluster/aws:123:eu-central-1:kube-1",
+    "value": "owned"
+  },{
+    "key": "ingress:certificate-arn/DUMMY",
+    "value": "0001-01-01T00:00:00Z"
+  },{
+    "key": "ingress:owner",
+    "value": "/my-route-group"
+  }
+]
diff --git a/testdata/ingress_rg_shared_nlb/expected.cf → testdata/ingress_rg_shared_nlb/template.cf b/testdata/ingress_rg_shared_nlb/expected.cf → testdata/ingress_rg_shared_nlb/template.cf
diff --git a/testdata/rg_alb/rg.yaml → testdata/rg_alb/k8s/rg.yaml b/testdata/rg_alb/rg.yaml → testdata/rg_alb/k8s/rg.yaml
diff --git a/testdata/rg_alb/params.json b/testdata/rg_alb/params.json
@@ -0,0 +1,54 @@
+[
+  {
+    "parameterKey": "LoadBalancerSchemeParameter",
+    "parameterValue": "internet-facing"
+  },
+  {
+    "parameterKey": "LoadBalancerSecurityGroupParameter",
+    "parameterValue": "42"
+  },
+  {
+    "parameterKey": "LoadBalancerSubnetsParameter",
+    "parameterValue": "foo1"
+  },
+  {
+    "parameterKey": "TargetGroupVPCIDParameter",
+    "parameterValue": "1"
+  },
+  {
+    "parameterKey": "TargetGroupTargetPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "ListenerSslPolicyParameter",
+    "parameterValue": "ELBSecurityPolicy-2016-08"
+  },
+  {
+    "parameterKey": "IpAddressType",
+    "parameterValue": "ipv4"
+  },
+  {
+    "parameterKey": "Type",
+    "parameterValue": "application"
+  },
+  {
+    "parameterKey": "HTTP2",
+    "parameterValue": "true"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPathParameter",
+    "parameterValue": ""
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckIntervalParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckTimeoutParameter",
+    "parameterValue": "0"
+  }
+]
diff --git a/testdata/rg_alb/tags.json b/testdata/rg_alb/tags.json
@@ -0,0 +1,12 @@
+[
+  {
+    "key": "kubernetes:application",
+    "value": ""
+  },{
+    "key": "kubernetes.io/cluster/aws:123:eu-central-1:kube-1",
+    "value": "owned"
+  },{
+    "key": "ingress:certificate-arn/DUMMY",
+    "value": "0001-01-01T00:00:00Z"
+  }
+]
diff --git a/testdata/rg_alb/expected.cf → testdata/rg_alb/template.cf b/testdata/rg_alb/expected.cf → testdata/rg_alb/template.cf
diff --git a/testdata/rg_nlb/rg.yaml → testdata/rg_nlb/k8s/rg.yaml b/testdata/rg_nlb/rg.yaml → testdata/rg_nlb/k8s/rg.yaml
diff --git a/testdata/rg_nlb/params.json b/testdata/rg_nlb/params.json
@@ -0,0 +1,54 @@
+[
+  {
+    "parameterKey": "LoadBalancerSchemeParameter",
+    "parameterValue": "internet-facing"
+  },
+  {
+    "parameterKey": "LoadBalancerSecurityGroupParameter",
+    "parameterValue": "42"
+  },
+  {
+    "parameterKey": "LoadBalancerSubnetsParameter",
+    "parameterValue": "foo1"
+  },
+  {
+    "parameterKey": "TargetGroupVPCIDParameter",
+    "parameterValue": "1"
+  },
+  {
+    "parameterKey": "TargetGroupTargetPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "ListenerSslPolicyParameter",
+    "parameterValue": "ELBSecurityPolicy-2016-08"
+  },
+  {
+    "parameterKey": "IpAddressType",
+    "parameterValue": "ipv4"
+  },
+  {
+    "parameterKey": "Type",
+    "parameterValue": "network"
+  },
+  {
+    "parameterKey": "HTTP2",
+    "parameterValue": "true"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPathParameter",
+    "parameterValue": ""
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckPortParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckIntervalParameter",
+    "parameterValue": "0"
+  },
+  {
+    "parameterKey": "TargetGroupHealthCheckTimeoutParameter",
+    "parameterValue": "0"
+  }
+]
diff --git a/testdata/rg_nlb/tags.json b/testdata/rg_nlb/tags.json
@@ -0,0 +1,12 @@
+[
+  {
+    "key": "kubernetes:application",
+    "value": ""
+  },{
+    "key": "kubernetes.io/cluster/aws:123:eu-central-1:kube-1",
+    "value": "owned"
+  },{
+    "key": "ingress:certificate-arn/DUMMY",
+    "value": "0001-01-01T00:00:00Z"
+  }
+]
diff --git a/testdata/rg_nlb/expected.cf → testdata/rg_nlb/template.cf b/testdata/rg_nlb/expected.cf → testdata/rg_nlb/template.cf
diff --git a/worker_test.go b/worker_test.go
@@ -458,8 +458,6 @@ func TestResourceConversion(tt *testing.T) {
 				t.Fatal(err)
 			}
 
-			// numberOfFiles := len(files) - 1 , TODO: use to compare with metrics later.
-
 			for _, file := range files {
 				f, err := os.Open("./testdata/" + scenario.name + "/k8s/" + file.Name())
 			    if err != nil {