From 143e6be9a072ac0f114326223b91db86c90d0ba8 Mon Sep 17 00:00:00 2001
From: Max <git@maximhutz.me>
Date: Thu, 13 Feb 2025 15:35:00 -0500
Subject: [PATCH] style: renaming scheme for config files

---
 Taskfile.yml           | 2 +-
 playbooks/fast.yml     | 4 ++--
 playbooks/restore.yml  | 2 +-
 playbooks/slow.yml     | 2 +-
 terraform/Taskfile.yml | 6 +++---
 terraform/main.tf      | 6 ++++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 38f96d1..d118a19 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -13,7 +13,7 @@ tasks:
   enter:
     cmd: aws ssm start-session --target $INSTANCE_ID
     env:
-      INSTANCE_ID: { sh: jq -r .instance_id.value < config/infrastructure.secret.tf.json }
+      INSTANCE_ID: { sh: jq -r .instance_id.value < config/infrastructure.secret.json }
       AWS_REGION: { sh: jq -r .aws_region < config/ansible.secret.json }
       AWS_ACCESS_KEY_ID: { sh: jq -r .aws_access_key < config/ansible.secret.json }
       AWS_SECRET_ACCESS_KEY: { sh: jq -r .aws_secret_key < config/ansible.secret.json }
diff --git a/playbooks/fast.yml b/playbooks/fast.yml
index 2af8760..6258bff 100644
--- a/playbooks/fast.yml
+++ b/playbooks/fast.yml
@@ -2,7 +2,7 @@
   hosts: localhost
   vars_files:
     - ../config/ansible.secret.json
-    - ../config/infrastructure.secret.tf.json
+    - ../config/infrastructure.secret.json
   gather_facts: false
   tasks:
     - name: Log into Docker.
@@ -34,7 +34,7 @@
   gather_facts: false
   vars_files:
     - ../config/ansible.secret.json
-    - ../config/infrastructure.secret.tf.json
+    - ../config/infrastructure.secret.json
   vars:
     ansible_connection: aws_ssm
     ansible_aws_ssm_plugin: "{{ ssm_plugin }}"
diff --git a/playbooks/restore.yml b/playbooks/restore.yml
index 9719807..e0a848f 100644
--- a/playbooks/restore.yml
+++ b/playbooks/restore.yml
@@ -4,7 +4,7 @@
   gather_facts: false
   vars_files:
     - ../config/ansible.secret.json
-    - ../config/infrastructure.secret.tf.json
+    - ../config/infrastructure.secret.json
   vars:
     ansible_connection: aws_ssm
     ansible_python_interpreter: /usr/bin/python3
diff --git a/playbooks/slow.yml b/playbooks/slow.yml
index 1d056cc..a8b1966 100644
--- a/playbooks/slow.yml
+++ b/playbooks/slow.yml
@@ -47,7 +47,7 @@
   gather_facts: false
   vars_files:
     - ../config/ansible.secret.json
-    - ../config/infrastructure.secret.tf.json
+    - ../config/infrastructure.secret.json
   vars:
     ansible_connection: aws_ssm
     ansible_python_interpreter: /usr/bin/python3
diff --git a/terraform/Taskfile.yml b/terraform/Taskfile.yml
index 8529653..4f51aec 100644
--- a/terraform/Taskfile.yml
+++ b/terraform/Taskfile.yml
@@ -2,9 +2,9 @@ version: 3
 silent: true
 
 vars:
-  BACKEND: ../config/backend.secret.tf.json
-  VARIABLES: ../config/variables.secret.tf.json
-  OUTPUT: ../config/infrastructure.secret.tf.json
+  BACKEND: ../config/backend.secret.json
+  VARIABLES: ../config/variables.secret.json
+  OUTPUT: ../config/infrastructure.secret.json
 
 tasks:
   init: terraform init -backend-config={{.BACKEND}}
diff --git a/terraform/main.tf b/terraform/main.tf
index 95d515c..12a99ae 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -4,8 +4,10 @@ resource "aws_eip" "public" {
   domain   = "vpc"
 }
 
-data "aws_iam_instance_profile" "ssm" {
+# An instance profile for access via AWS SSM.
+resource "aws_iam_instance_profile" "ssm" {
   name = "SSMInstanceProfile"
+  role = "AmazonSSMRoleForInstancesQuickSetup"
 }
 
 # The Gitea instance.
@@ -18,7 +20,7 @@ resource "aws_instance" "this" {
   user_data                   = file("install.sh")
   user_data_replace_on_change = false
 
-  iam_instance_profile   = data.aws_iam_instance_profile.ssm.name
+  iam_instance_profile   = aws_iam_instance_profile.ssm.name
   vpc_security_group_ids = [aws_security_group.public_access.id]
   
   metadata_options {