From ac833e6848205130591a472d39ec69a35fc67cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?=
 <felix-antoine.fortin@calculquebec.ca>
Date: Wed, 14 Feb 2024 12:25:03 -0500
Subject: [PATCH] Remove generate_terraform_self.rb calls

---
 common/configuration/puppet.yaml | 1 -
 common/outputs.tf                | 8 ++++++--
 common/provision/main.tf         | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/configuration/puppet.yaml b/common/configuration/puppet.yaml
index a936601b..87762592 100644
--- a/common/configuration/puppet.yaml
+++ b/common/configuration/puppet.yaml
@@ -90,7 +90,6 @@ runcmd:
   - "(cd /etc/puppetlabs/code/environments/production; /opt/puppetlabs/puppet/bin/r10k puppetfile install)"
 # Wait for Terraform to scp its YAML data
   - while [ ! -e "/etc/puppetlabs/data/terraform_data.yaml" ]; do echo "$(date -I'seconds') Waiting for terraform to scp terraform_data.yaml"; sleep 5; done
-  - /etc/puppetlabs/code/environments/production/scripts/generate_terraform_self.rb
 %{ if node_name != keys(puppetservers)[0] }
   - sed -e '/certificate-authority-service/ s/^/#/' -i /etc/puppetlabs/puppetserver/services.d/ca.cfg
   - sed -e '/certificate-authority-disabled-service/ s/^#//' -i /etc/puppetlabs/puppetserver/services.d/ca.cfg
diff --git a/common/outputs.tf b/common/outputs.tf
index e28d1b89..f2e8173d 100644
--- a/common/outputs.tf
+++ b/common/outputs.tf
@@ -24,8 +24,12 @@ output "domain" {
 output "accounts" {
   value = {
     guests = {
-      usernames =   var.nb_users != 0 ? (
-        "user[${format(format("%%0%dd", length(tostring(var.nb_users))), 1)}-${var.nb_users}]"
+      usernames = var.nb_users > 0 ? (
+        var.nb_users > 1 ? (
+          "user[${format(format("%%0%dd", length(tostring(var.nb_users))), 1)}-${var.nb_users}]"
+         ) : (
+          "user"
+         )
       ) : (
         "You have chosen to create user accounts yourself (`nb_users = 0`), please read the documentation on how to manage this at https://github.com/ComputeCanada/magic_castle/blob/main/docs/README.md#103-add-a-user-account"
       ),
diff --git a/common/provision/main.tf b/common/provision/main.tf
index 0ae7ead3..917674ea 100644
--- a/common/provision/main.tf
+++ b/common/provision/main.tf
@@ -47,7 +47,6 @@ resource "terraform_data" "deploy_hieradata" {
       "sudo install -o root -g 52 -m 640 terraform_data.yaml user_data.yaml /etc/puppetlabs/data/",
       "sudo install -o root -g 52 -m 640 terraform_facts.yaml /etc/puppetlabs/facts/",
       "rm -f terraform_data.yaml user_data.yaml terraform_facts.yaml",
-      "[ -f /etc/puppetlabs/code/environments/production/scripts/generate_terraform_self.rb ] && sudo /etc/puppetlabs/code/environments/production/scripts/generate_terraform_self.rb || true",
       "[ -f /usr/local/bin/consul ] && [ -f /usr/bin/jq ] && consul event -token=$(sudo jq -r .acl.tokens.agent /etc/consul/config.json) -name=puppet $(date +%s) || true",
     ]
   }