From 8504aa35f2838b77e1818fb096ff8ea4e0f6b520 Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Thu, 8 Jun 2023 17:26:50 +0200
Subject: [PATCH] [macos] Adjust hcl2 packer templates with decoding (#7685)

---
 images/macos/templates/macOS-11.anka.pkr.hcl       | 7 ++-----
 images/macos/templates/macOS-12.anka.pkr.hcl       | 7 ++-----
 images/macos/templates/macOS-13.anka.pkr.hcl       | 7 ++-----
 images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl
index e2e1ee2e..6c86c5f2 100644
--- a/images/macos/templates/macOS-11.anka.pkr.hcl
+++ b/images/macos/templates/macOS-11.anka.pkr.hcl
@@ -189,13 +189,10 @@ build {
   }
   provisioner "shell" {
     inline = [
-      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}"
+      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}",
+      "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
     ]
   }
-  provisioner "file" {
-    destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
-    source = "${var.xcversion_auth_cookie}"
-  }
   provisioner "shell" {
     script = "./provision/core/xcode.ps1"
     environment_vars = [
diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl
index f5f48aa6..1b4adfe7 100644
--- a/images/macos/templates/macOS-12.anka.pkr.hcl
+++ b/images/macos/templates/macOS-12.anka.pkr.hcl
@@ -190,13 +190,10 @@ build {
   }
   provisioner "shell" {
     inline = [
-      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}"
+      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}",
+      "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
     ]
   }
-  provisioner "file" {
-    destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
-    source = "${var.xcversion_auth_cookie}"
-  }
   provisioner "shell" {
     script = "./provision/core/xcode.ps1"
     environment_vars = [
diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl
index fc844f7c..27e0a679 100644
--- a/images/macos/templates/macOS-13.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.anka.pkr.hcl
@@ -184,13 +184,10 @@ build {
   }
   provisioner "shell" {
     inline = [
-      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}"
+      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}",
+      "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
     ]
   }
-  provisioner "file" {
-    destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
-    source = "${var.xcversion_auth_cookie}"
-  }
   provisioner "shell" {
     script = "./provision/core/xcode.ps1"
     environment_vars = [
diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
index 6df2c214..558cd560 100644
--- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
@@ -184,13 +184,10 @@ build {
   }
   provisioner "shell" {
     inline = [
-      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}"
+      "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}",
+      "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
     ]
   }
-  provisioner "file" {
-    destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie"
-    source = "${var.xcversion_auth_cookie}"
-  }
   provisioner "shell" {
     script = "./provision/core/xcode.ps1"
     environment_vars = [