some fixes, etc

* base/1 - fix revision quotes
* packer.conf - fix ami_description (when suffix is empty), add Name/Created tags to AMI & Snapshot, shutdown_behavior = terminate
* scripts/setup-ami.sh - stop warnings when untarring alpine-keys.apk
* remove security_group stuff (packer creates temporary one)
* .gitignore - mask all profile build configs, except the ones we vend

5 files changed, 16 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index efc91a3..01e46bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 **/*~
 **/*.swp
 /build/
-/.py3/
-/variables.yaml
-/variables.yaml_*
 /scrub-old-amis.py
 /gen-readme.py
+/profiles/*.conf
+!/profiles/alpine-amis.conf
+!/profiles/test.conf.conf
diff --git a/packer.conf b/packer.conf
index 513f093..cd98c5e 100644
--- a/packer.conf
+++ b/packer.conf
@@ -6,7 +6,6 @@ builders = [
 
     region                      = "{{user `build_region`}}"
     subnet_id                   = "{{user `build_subnet`}}"
-    security_group_id           = "{{user `build_security_group`}}"
     instance_type               = "{{user `build_instance_type`}}"
     associate_public_ip_address = "{{user `build_public_ip`}}"
     source_ami_filter {
@@ -28,14 +27,19 @@ builders = [
         volume_size           = "{{user `ami_volume_size`}}"
       }
     ]
-    ssh_username = "{{user `build_user`}}"
+    shutdown_behavior = "terminate"
+    ssh_username      = "{{user `build_user`}}"
 
     ### AMI Build Details
 
     ami_name =
       "{{user `ami_name_prefix`}}{{user `release`}}-{{user `arch`}}-{{user `revision`}}{{user `ami_name_suffix`}}"
     ami_description =
-      "{{user `ami_desc_prefix`}}{{user `release`}} {{user `arch`}} {{user `revision`}} {{user `ami_desc_suffix`}}"
+      "{{user `ami_desc_prefix`}}{{user `release`}} {{user `arch`}} {{user `revision`}}{{user `ami_desc_suffix`}}"
+    tags {
+      Name = "{{user `ami_name_prefix`}}{{user `release`}}-{{user `arch`}}-{{user `revision`}}{{user `ami_name_suffix`}}"
+      Created = "{{isotime \"2006-01-02 03:04:05 MST\"}}"
+    }
     ami_virtualization_type = "hvm"
     ami_root_device {
       volume_type           = "gp2"
diff --git a/profiles/base/1 b/profiles/base/1
index 3bda7ed..abd1413 100644
--- a/profiles/base/1
+++ b/profiles/base/1
@@ -3,7 +3,7 @@
 # Profile/Build
 profile       = null
 profile_build = null
-revision      = 'r0'
+revision      = "r0"
 
 # Versioning
 version     = null
@@ -17,7 +17,6 @@ build_arch  = null
 # Builder-instance
 build_region          = null
 build_subnet          = null
-build_security_group  = null
 build_instance_type   = "t3.nano"
 build_public_ip       = null
 build_user            = "ec2-user"
diff --git a/profiles/test.conf b/profiles/test.conf
index 01d38d6..6bf9fbe 100644
--- a/profiles/test.conf
+++ b/profiles/test.conf
@@ -7,8 +7,10 @@ arch-aarch64    { include "arch/aarch64" }
 
 # specific to this profile's builds
 test {
-  build_region  = "us-west-2"
-  build_subnet  = "subnet-033a30d7b5220d177"
+  ami_name_prefix = "test"
+  ami_desc_prefix = "test"
+  build_region    = "us-west-2"
+  build_subnet    = "subnet-033a30d7b5220d177"
   ami_regions {
     us-west-2 = true
   }
diff --git a/scripts/setup-ami.sh b/scripts/setup-ami.sh
index 2c0a1a6..e56cece 100755
--- a/scripts/setup-ami.sh
+++ b/scripts/setup-ami.sh
@@ -119,7 +119,7 @@ fetch_keys() {
     local tmp="$(mktemp -d)"
 
     wgets "$ALPINE_KEYS" "$ALPINE_KEYS_SHA256" "$tmp/alpine-keys.apk"
-    tar -C "$target" -xvf "$tmp"/alpine-keys.apk etc/apk/keys
+    tar -C "$target" --warning=no-unknown-keyword -xvf "$tmp"/alpine-keys.apk etc/apk/keys
     rm -rf "$tmp"
 }