no sudo test

Author: t-aleksander

.github/workflows/ami.yml

@@ -17,7 +17,7 @@ jobs:
           TAG="${GITHUB_REF#refs/tags/}"
           CORE_VERSION=$(echo $TAG | sed 's/.*c-\([^_]*\).*/\1/')
           PROXY_VERSION=$(echo $TAG | sed 's/.*px-\([^_]*\).*/\1/')
-          GATEWAY_VERSION=$(echo $TAG | sed 's/.*gw-\(.*\)/\1/')
+          GATEWAY_VERSION=$(echo $TAG | sed 's/.*gw-\([^_]*\).*/\1/')
           echo "CORE_VERSION=$CORE_VERSION" >> $GITHUB_OUTPUT
           echo "PROXY_VERSION=$PROXY_VERSION" >> $GITHUB_OUTPUT
           echo "GATEWAY_VERSION=$GATEWAY_VERSION" >> $GITHUB_OUTPUT

cloudformation/ami/defguard-install.sh

@@ -2,36 +2,36 @@
 set -e
 
 echo "Updating apt repositories..."
-sudo apt update
+apt update
 
 echo "Installing dependencies..."
-sudo apt install -y ca-certificates curl awscli
+apt install -y ca-certificates curl awscli
 
 echo "Adding Defguard GPG key..."
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo curl -fsSL https://apt.defguard.net/defguard.asc -o /etc/apt/keyrings/defguard.asc
-sudo chmod a+r /etc/apt/keyrings/defguard.asc
+install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://apt.defguard.net/defguard.asc -o /etc/apt/keyrings/defguard.asc
+chmod a+r /etc/apt/keyrings/defguard.asc
 
 echo "Adding Defguard repository..."
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/defguard.asc] https://apt.defguard.net/ trixie release " | \
-   sudo tee /etc/apt/sources.list.d/defguard.list > /dev/null
+   tee /etc/apt/sources.list.d/defguard.list > /dev/null
 
 echo "Updating apt repositories after adding Defguard repo..."
-sudo apt update
+apt update
 
 echo "Installing Defguard packages with specific versions..."
 echo "  defguard version: ${CORE_VERSION}"
 echo "  defguard-proxy version: ${PROXY_VERSION}"
 echo "  defguard-gateway version: ${GATEWAY_VERSION}"
 
-sudo apt install -y \
+apt install -y \
   defguard=${CORE_VERSION} \
   defguard-proxy=${PROXY_VERSION} \
   defguard-gateway=${GATEWAY_VERSION}
 
-sudo systemctl stop defguard
-sudo systemctl disable defguard
-sudo systemctl stop defguard-proxy
-sudo systemctl disable defguard-proxy
-sudo systemctl stop defguard-gateway
-sudo systemctl disable defguard-gateway
+systemctl stop defguard
+systemctl disable defguard
+systemctl stop defguard-proxy
+systemctl disable defguard-proxy
+systemctl stop defguard-gateway
+systemctl disable defguard-gateway

cloudformation/ami/defguard.pkr.hcl

@@ -30,7 +30,7 @@ variable "instance_type" {
 }
 
 source "amazon-ebs" "defguard" {
-  ami_name      = "defguard-C-${var.core_version}-PX-${var.gateway_version}-GW-${var.proxy_version}-amd64"
+  ami_name      = "defguard-C-${var.core_version}-PX-${var.gateway_version}-GW-${var.proxy_version}-amd64-{{timestamp}}"
   instance_type = var.instance_type
   region        = var.region
   source_ami_filter {