From c19ae7fecf561aaa6860ef29bcbb494d414894b4 Mon Sep 17 00:00:00 2001
From: Michele Cereda <cereda.michele@gmail.com>
Date: Fri, 11 Oct 2024 19:25:08 +0200
Subject: [PATCH] fix(snippets/cloud-init): remove confusing merge statements

---
 snippets/pulumi/aws/userData.ts | 2 --
 snippets/pulumi/userData.ts     | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/snippets/pulumi/aws/userData.ts b/snippets/pulumi/aws/userData.ts
index c33ae34..bd8f1db 100644
--- a/snippets/pulumi/aws/userData.ts
+++ b/snippets/pulumi/aws/userData.ts
@@ -1,5 +1,4 @@
 import * as cloudinit from "@pulumi/cloudinit";
-import * as pulumi from "@pulumi/pulumi";
 import * as yaml from 'yaml';
 
 const userData = new cloudinit.Config(
@@ -11,7 +10,6 @@ const userData = new cloudinit.Config(
             {
                 // docker on AmazonLinux 2023
                 filename: "cloud-config.docker-engine.yml",
-                mergeType: "dict(allow_delete,no_replace)+list(append)",
                 contentType: "text/cloud-config",
                 content: yaml.stringify({
                     package_upgrade: false,
diff --git a/snippets/pulumi/userData.ts b/snippets/pulumi/userData.ts
index badec29..4ec57eb 100644
--- a/snippets/pulumi/userData.ts
+++ b/snippets/pulumi/userData.ts
@@ -26,17 +26,14 @@ const userData = new cloudinit.Config(
                         defer: true,
                     }],
                 }),
-                mergeType: "dict(recurse_array,no_replace)+list(append)",
             },
             {
                 filename: "cloud-config.docker.yml",
                 contentType: "text/cloud-config",
                 content: fs.readFileSync("./docker.yum.yaml", "utf8"),
-                mergeType: "dict(recurse_array,no_replace)+list(append)",
             },
             {
                 filename: "cloud-config.gitlab-runner.yml",
-                mergeType: "dict(allow_delete,no_replace)+list(append)",
                 contentType: "text/cloud-config",
                 content: pulumi.all([ gitlabUrl, runnerToken ]).apply(
                     ([ gitlabUrl, runnerToken ]) => yaml.stringify({
@@ -68,7 +65,7 @@ const userData = new cloudinit.Config(
                                 `[[runners]]`,
                                 `  name = "runner autoscaler"`,
                                 `  url = "${gitlabUrl}"`,
-                                `  token = ${runnerToken}`,
+                                `  token = "${runnerToken}"`,
                                 `  executor = "sh"`,
                             ].join("\n"),
                         }],
@@ -81,6 +78,7 @@ const userData = new cloudinit.Config(
                 ),
             },
             {
+                filename: "cloud-config.postgres.yml",
                 contentType: "text/cloud-config",
                 content: yaml.stringify({
                     package_upgrade: false,
@@ -90,8 +88,6 @@ const userData = new cloudinit.Config(
                         "systemctl enable --now 'postgres'",
                     ]
                 }),
-                filename: "cloud-config.postgres.yml",
-                mergeType: "dict(allow_delete,no_replace)+list(append)",
             },
         ],
     },