Fix tests to pass

pulumi · Dec 16, 2023 · 079202a · 079202a
1 parent 0b68b5c
commit 079202a
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 21 deletions.
diff --git a/pkg/kube2pulumi/kube2pulumi_test.go b/pkg/kube2pulumi/kube2pulumi_test.go
@@ -178,6 +178,7 @@ func TestNamespaceDotNet(t *testing.T) {
 	assertion := assert.New(t)
 
 	csExpected := `using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/MultilineString/expected/expectedMultilineString.cs b/testdata/MultilineString/expected/expectedMultilineString.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/MultilineString/expected/expectedMultilineString.go b/testdata/MultilineString/expected/expectedMultilineString.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1"
 	metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/meta/v1"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
@@ -18,7 +16,7 @@ func main() {
 				Namespace: pulumi.String("kube-system"),
 			},
 			Data: pulumi.StringMap{
-				"Corefile": pulumi.String(fmt.Sprintf(`.:53 {
+				"Corefile": pulumi.String(`.:53 {
         errors
         health {
           lameduck 5s
@@ -36,7 +34,7 @@ func main() {
         reload
         loadbalance
     }STUBDOMAINS
-`)),
+`),
 			},
 		})
 		if err != nil {

diff --git a/testdata/Namespace/expected/expectedNamespace.cs b/testdata/Namespace/expected/expectedNamespace.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/cilium/expected/expectedCilium.cs b/testdata/cilium/expected/expectedCilium.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/cilium/expected/expectedCilium.go b/testdata/cilium/expected/expectedCilium.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/apps/v1"
 	corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1"
 	metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/meta/v1"
@@ -275,7 +273,7 @@ func main() {
 								Command: pulumi.StringArray{
 									pulumi.String("sh"),
 									pulumi.String("-ec"),
-									pulumi.String(fmt.Sprintf("cp /usr/bin/cilium-mount /hostbin/cilium-mount;\n              nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt \"${BIN_PATH}/cilium-mount\" $CGROUP_ROOT;\n              rm /hostbin/cilium-mount\n")),
+									pulumi.String("cp /usr/bin/cilium-mount /hostbin/cilium-mount;\n              nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt \"${BIN_PATH}/cilium-mount\" $CGROUP_ROOT;\n              rm /hostbin/cilium-mount\n"),
 								},
 								VolumeMounts: corev1.VolumeMountArray{
 									&corev1.VolumeMountArgs{
@@ -318,7 +316,7 @@ func main() {
 								Command: pulumi.StringArray{
 									pulumi.String("sh"),
 									pulumi.String("-ec"),
-									pulumi.String(fmt.Sprintf("cp /usr/bin/cilium-sysctlfix /hostbin/cilium-sysctlfix;\n              nsenter --mount=/hostproc/1/ns/mnt \"${BIN_PATH}/cilium-sysctlfix\";\n              rm /hostbin/cilium-sysctlfix\n")),
+									pulumi.String("cp /usr/bin/cilium-sysctlfix /hostbin/cilium-sysctlfix;\n              nsenter --mount=/hostproc/1/ns/mnt \"${BIN_PATH}/cilium-sysctlfix\";\n              rm /hostbin/cilium-sysctlfix\n"),
 								},
 								VolumeMounts: corev1.VolumeMountArray{
 									&corev1.VolumeMountArgs{

diff --git a/testdata/cilium/expected/expectedCilium.ts b/testdata/cilium/expected/expectedCilium.ts
@@ -248,7 +248,7 @@ const defaultCiliumDaemonSet = new kubernetes.apps.v1.DaemonSet("defaultCiliumDa
                             "sh",
                             "-ec",
                             `cp /usr/bin/cilium-mount /hostbin/cilium-mount;
-              nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "${BIN_PATH}/cilium-mount" $CGROUP_ROOT;
+              nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "\${BIN_PATH}/cilium-mount" $CGROUP_ROOT;
               rm /hostbin/cilium-mount
 `,
                         ],
@@ -290,7 +290,7 @@ const defaultCiliumDaemonSet = new kubernetes.apps.v1.DaemonSet("defaultCiliumDa
                             "sh",
                             "-ec",
                             `cp /usr/bin/cilium-sysctlfix /hostbin/cilium-sysctlfix;
-              nsenter --mount=/hostproc/1/ns/mnt "${BIN_PATH}/cilium-sysctlfix";
+              nsenter --mount=/hostproc/1/ns/mnt "\${BIN_PATH}/cilium-sysctlfix";
               rm /hostbin/cilium-sysctlfix
 `,
                         ],

diff --git a/testdata/doubleQuotes/doubleQuotes.pp b/testdata/doubleQuotes/doubleQuotes.pp
@@ -14,10 +14,19 @@
 name = "argocd-server"
 }
 spec = {
+selector = {
+matchLabels = {
+"app.kubernetes.io/component" = "server"
+"app.kubernetes.io/instance" = "argocd"
+"app.kubernetes.io/name" = "argocd-server"
+}
+}
 template = {
 spec = {
 containers = [
 {
+name = "argocd-server"
+image = "argoproj/argocd:v1.6.1"
 readinessProbe = {
 httpGet = {
 port = 8080

diff --git a/testdata/doubleQuotes/doubleQuotes.yaml b/testdata/doubleQuotes/doubleQuotes.yaml
@@ -11,9 +11,16 @@ metadata:
     "helm.sh/chart": argo-cd-2.5.4
   name: argocd-server
 spec:
+  selector:
+    matchLabels:
+      "app.kubernetes.io/component": server
+      "app.kubernetes.io/instance": argocd
+      "app.kubernetes.io/name": argocd-server
   template:
     spec:
       containers:
-        - readinessProbe:
+        - name: argocd-server
+          image: "argoproj/argocd:v1.6.1"
+          readinessProbe:
             httpGet:
               port: 8080
diff --git a/testdata/k8sOperator/expected/expectedMain.cs b/testdata/k8sOperator/expected/expectedMain.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/stringLiteral/expected/expectedStringLiteral.cs b/testdata/stringLiteral/expected/expectedStringLiteral.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Pulumi;
 using Kubernetes = Pulumi.Kubernetes;
 

diff --git a/testdata/stringLiteral/expected/expectedStringLiteral.go b/testdata/stringLiteral/expected/expectedStringLiteral.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1"
 	metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/meta/v1"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
@@ -17,7 +15,7 @@ func main() {
 				Name: pulumi.String("myapp"),
 			},
 			Data: pulumi.StringMap{
-				"key": pulumi.String(fmt.Sprintf("{\\\"uid\\\": \\\"$(datasource)\\\"}")),
+				"key": pulumi.String("{\\\"uid\\\": \\\"$(datasource)\\\"}"),
 			},
 		})
 		if err != nil {
@@ -30,7 +28,7 @@ func main() {
 				Name: pulumi.String("myapp-var"),
 			},
 			Data: pulumi.StringMap{
-				"key": pulumi.String(fmt.Sprintf("{\\\"uid\\\": \\\"${datasource}\\\"}")),
+				"key": pulumi.String("{\\\"uid\\\": \\\"${datasource}\\\"}"),
 			},
 		})
 		if err != nil {
@@ -43,7 +41,7 @@ func main() {
 				Name: pulumi.String("myapp-no-end-bracket"),
 			},
 			Data: pulumi.StringMap{
-				"key": pulumi.String(fmt.Sprintf("{\\\"uid\\\": \\\"${datasource\\\"}")),
+				"key": pulumi.String("{\\\"uid\\\": \\\"${datasource\\\"}"),
 			},
 		})
 		if err != nil {
@@ -56,7 +54,7 @@ func main() {
 				Name: pulumi.String("myapp-no-brackets"),
 			},
 			Data: pulumi.StringMap{
-				"key": pulumi.String(fmt.Sprintf("{\\\"uid\\\": \\\"$datasource\\\"")),
+				"key": pulumi.String("{\\\"uid\\\": \\\"$datasource\\\""),
 			},
 		})
 		if err != nil {

diff --git a/testdata/stringLiteral/expected/expectedStringLiteral.ts b/testdata/stringLiteral/expected/expectedStringLiteral.ts
@@ -8,7 +8,7 @@ const myappConfigMap = new kubernetes.core.v1.ConfigMap("myappConfigMap", {
         name: "myapp",
     },
     data: {
-        key: `{\"uid\": \"$(datasource)\"}`,
+        key: "{\\\"uid\\\": \\\"$(datasource)\\\"}",
     },
 });
 const myapp_varConfigMap = new kubernetes.core.v1.ConfigMap("myapp_varConfigMap", {
@@ -18,7 +18,7 @@ const myapp_varConfigMap = new kubernetes.core.v1.ConfigMap("myapp_varConfigMap"
         name: "myapp-var",
     },
     data: {
-        key: `{\"uid\": \"${datasource}\"}`,
+        key: "{\\\"uid\\\": \\\"${datasource}\\\"}",
     },
 });
 const myapp_no_end_bracketConfigMap = new kubernetes.core.v1.ConfigMap("myapp_no_end_bracketConfigMap", {
@@ -28,7 +28,7 @@ const myapp_no_end_bracketConfigMap = new kubernetes.core.v1.ConfigMap("myapp_no
         name: "myapp-no-end-bracket",
     },
     data: {
-        key: `{\"uid\": \"${datasource\"}`,
+        key: "{\\\"uid\\\": \\\"${datasource\\\"}",
     },
 });
 const myapp_no_bracketsConfigMap = new kubernetes.core.v1.ConfigMap("myapp_no_bracketsConfigMap", {
@@ -38,6 +38,6 @@ const myapp_no_bracketsConfigMap = new kubernetes.core.v1.ConfigMap("myapp_no_br
         name: "myapp-no-brackets",
     },
     data: {
-        key: `{\"uid\": \"$datasource\"`,
+        key: "{\\\"uid\\\": \\\"$datasource\\\"",
     },
 });