upgrade: dependencies and golang (#2)

inloco · Jun 4, 2024 · f99ddc1 · f99ddc1
1 parent bf7d11d
commit f99ddc1
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 63 deletions.
diff --git a/.github/workflows/continuous.yaml b/.github/workflows/continuous.yaml
@@ -20,14 +20,14 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.21.10'
       - name: build and install packer
         run: |
           cd "$(mktemp -d)"
           go mod init example.com/m
-          go mod edit -replace github.com/hashicorp/packer=github.com/inloco/packer@v1.8.5-incognia.2
-          go get -u -v -x github.com/hashicorp/packer
-          cd "$(go env GOMODCACHE)/github.com/inloco/packer@v1.8.5-incognia.2"
+          go mod edit -replace github.com/hashicorp/packer=github.com/inloco/packer@v1.11.0
+          go get -v -x github.com/hashicorp/packer
+          cd "$(go env GOMODCACHE)/github.com/inloco/packer@v1.11.0"
           go install -v -x
       - name: install and setup session-manager-plugin
         run: |

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ all: ami
 ami:
 	@printf '${BLD}${RED}make: *** [$@]${RST}${EOL}'
 	@printf '${BLD}${YLW}$$${RST} '
-	packer init -upgrade .
+	PACKER_LOG=1 packer init -upgrade .
 	@printf '${BLD}${YLW}$$${RST} '
 	packer build macami.pkr.hcl
 .PHONY: ami
diff --git a/README.md b/README.md
@@ -29,4 +29,4 @@ While EIC Bastion is running, bake the AMI.
 
 ```bash
 make
-```
+```
diff --git a/macami.pkr.hcl b/macami.pkr.hcl
@@ -1,10 +1,10 @@
 packer {
-  required_version = "= v1.8.5-incognia.2"
+  required_version = "= 1.11.0"
 
   required_plugins {
     amazon = {
       source  = "github.com/inloco/amazon"
-      version = "= 1.1.6-incognia.2"
+      version = "= 1.3.3"
     }
   }
 }

diff --git a/scripts/jailbreak.sh b/scripts/jailbreak.sh
@@ -7,41 +7,41 @@ USRBASE="${VOLBASE}/Users/ec2-user"
 mount -o readwrite /dev/xvdf2 "${VOLBASE}"
 
 /usr/bin/sqlite3 "${VOLBASE}/private/var/db/SystemPolicyConfiguration/KextPolicy" << EOF
-	CREATE TRIGGER IF NOT EXISTS INSERT_OF_allowed_ON_kext_policy AFTER INSERT ON kext_policy FOR EACH ROW WHEN NEW.allowed != 1
-	BEGIN
-		UPDATE kext_policy SET allowed = 1 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
-	END;
+    CREATE TRIGGER IF NOT EXISTS INSERT_OF_allowed_ON_kext_policy AFTER INSERT ON kext_policy FOR EACH ROW WHEN NEW.allowed != 1
+    BEGIN
+        UPDATE kext_policy SET allowed = 1 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
+    END;
 
-	CREATE TRIGGER IF NOT EXISTS UPDATE_OF_allowed_ON_kext_policy AFTER UPDATE OF allowed ON kext_policy FOR EACH ROW WHEN NEW.allowed != 1
-	BEGIN
-		UPDATE kext_policy SET allowed = 1 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
-	END;
+    CREATE TRIGGER IF NOT EXISTS UPDATE_OF_allowed_ON_kext_policy AFTER UPDATE OF allowed ON kext_policy FOR EACH ROW WHEN NEW.allowed != 1
+    BEGIN
+        UPDATE kext_policy SET allowed = 1 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
+    END;
 
-	UPDATE kext_policy SET allowed = 1;
+    UPDATE kext_policy SET allowed = 1;
 
-	CREATE TRIGGER IF NOT EXISTS INSERT_OF_flags_ON_kext_policy AFTER INSERT ON kext_policy FOR EACH ROW WHEN NEW.flags != 0
-	BEGIN
-		UPDATE kext_policy SET flags = 0 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
-	END;
+    CREATE TRIGGER IF NOT EXISTS INSERT_OF_flags_ON_kext_policy AFTER INSERT ON kext_policy FOR EACH ROW WHEN NEW.flags != 0
+    BEGIN
+        UPDATE kext_policy SET flags = 0 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
+    END;
 
-	CREATE TRIGGER IF NOT EXISTS UPDATE_OF_flags_ON_kext_policy AFTER UPDATE OF flags ON kext_policy FOR EACH ROW WHEN NEW.flags != 0
-	BEGIN
-		UPDATE kext_policy SET flags = 0 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
-	END;
+    CREATE TRIGGER IF NOT EXISTS UPDATE_OF_flags_ON_kext_policy AFTER UPDATE OF flags ON kext_policy FOR EACH ROW WHEN NEW.flags != 0
+    BEGIN
+        UPDATE kext_policy SET flags = 0 WHERE team_id = NEW.team_id AND bundle_id = NEW.bundle_id;
+    END;
 
-	UPDATE kext_policy SET flags = 0;
+    UPDATE kext_policy SET flags = 0;
 
-	CREATE TRIGGER IF NOT EXISTS INSERT_OF_flags_ON_kext_load_history_v3 AFTER INSERT ON kext_load_history_v3 FOR EACH ROW WHEN NEW.flags != 16
-	BEGIN
-		UPDATE kext_load_history_v3 SET flags = 16 WHERE path = NEW.path;
-	END;
+    CREATE TRIGGER IF NOT EXISTS INSERT_OF_flags_ON_kext_load_history_v3 AFTER INSERT ON kext_load_history_v3 FOR EACH ROW WHEN NEW.flags != 16
+    BEGIN
+        UPDATE kext_load_history_v3 SET flags = 16 WHERE path = NEW.path;
+    END;
 
-	CREATE TRIGGER IF NOT EXISTS UPDATE_OF_flags_ON_kext_load_history_v3 AFTER UPDATE OF flags ON kext_load_history_v3 FOR EACH ROW WHEN NEW.flags != 16
-	BEGIN
-		UPDATE kext_load_history_v3 SET flags = 16 WHERE path = NEW.path;
-	END;
-	
-	UPDATE kext_load_history_v3 SET flags = 16;
+    CREATE TRIGGER IF NOT EXISTS UPDATE_OF_flags_ON_kext_load_history_v3 AFTER UPDATE OF flags ON kext_load_history_v3 FOR EACH ROW WHEN NEW.flags != 16
+    BEGIN
+        UPDATE kext_load_history_v3 SET flags = 16 WHERE path = NEW.path;
+    END;
+
+    UPDATE kext_load_history_v3 SET flags = 16;
 EOF
 
 TCC='/Library/Application Support/com.apple.TCC/TCC.db'
@@ -55,33 +55,33 @@ CLIENTS1=('/opt/aws/ssm/bin/amazon-ssm-agent' '/usr/libexec/sshd-keygen-wrapper'
 OBJECTS0=('UNUSED' 'com.apple.finder' 'com.apple.systemevents' 'com.vmware.fusion')
 OBJECTS1=()
 {
-	echo 'BEGIN EXCLUSIVE TRANSACTION;'
-	for SERVICE in "${SERVICES[@]}"
-	do
-		for CLIENT in "${CLIENTS0[@]}"
-		do
-			for OBJECT in "${OBJECTS0[@]}"
-			do
-				echo "INSERT INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',0,2,4,1,NULL,NULL,0,'${OBJECT}',NULL,0,0);"
-			done
-			for OBJECT in "${OBJECTS1[@]}"
-			do
-				echo "INSERT INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',0,2,4,1,NULL,NULL,1,'${OBJECT}',NULL,0,0);"
-			done
-		done
-		for CLIENT in "${CLIENTS1[@]}"
-		do
-			for OBJECT in "${OBJECTS0[@]}"
-			do
-				echo "INSERT INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',1,2,4,1,NULL,NULL,0,'${OBJECT}',NULL,0,0);"
-			done
-			for OBJECT in "${OBJECTS1[@]}"
-			do
-				echo "INSERT INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',1,2,4,1,NULL,NULL,1,'${OBJECT}',NULL,0,0);"
-			done
-		done
-	done
-	echo 'COMMIT TRANSACTION;'
+    echo 'BEGIN EXCLUSIVE TRANSACTION;'
+    for SERVICE in "${SERVICES[@]}"
+    do
+        for CLIENT in "${CLIENTS0[@]}"
+        do
+            for OBJECT in "${OBJECTS0[@]}"
+            do
+                echo "INSERT OR REPLACE INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',0,2,4,1,NULL,NULL,0,'${OBJECT}',NULL,0,0);"
+            done
+            for OBJECT in "${OBJECTS1[@]}"
+            do
+                echo "INSERT OR REPLACE INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',0,2,4,1,NULL,NULL,1,'${OBJECT}',NULL,0,0);"
+            done
+        done
+        for CLIENT in "${CLIENTS1[@]}"
+        do
+            for OBJECT in "${OBJECTS0[@]}"
+            do
+                echo "INSERT OR REPLACE INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',1,2,4,1,NULL,NULL,0,'${OBJECT}',NULL,0,0);"
+            done
+            for OBJECT in "${OBJECTS1[@]}"
+            do
+                echo "INSERT OR REPLACE INTO access VALUES ('kTCCService${SERVICE}','${CLIENT}',1,2,4,1,NULL,NULL,1,'${OBJECT}',NULL,0,0);"
+            done
+        done
+    done
+    echo 'COMMIT TRANSACTION;'
 } | /usr/bin/sqlite3 "${TCCVOL}"
 
 mkdir -p "$(dirname "${TCCUSR}")"