feat: lookup for AMI that doesn't contain ECS/EKS agent and packages + enable setting volume size (#30)

gberenice · web-flow · commit 27f1d8a37ee5 · 2025-01-03T19:25:28.000+02:00
* feat: trunk init

* feat: look up the Amazon Linux 2023 Minimal AMI + enable setting volume size
diff --git a/.github/trunk-upgrade.yaml b/.github/trunk-upgrade.yaml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Trunk Upgrade
-        uses: trunk-io/trunk-action/upgrade@2eaee169140ec559bd556208f9f99cdfdf468da8 # v1.1.18
+        uses: trunk-io/trunk-action/upgrade@4d5ecc89b2691705fd08c747c78652d2fc806a94 # v1.1.19
         with:
           base: main
           reviewers: "@masterpointio/masterpoint-internal"
diff --git a/.trunk/.gitignore b/.trunk/.gitignore
@@ -0,0 +1,9 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml
+tmp
diff --git a/.trunk/configs/.checkov.yaml b/.trunk/configs/.checkov.yaml
@@ -0,0 +1,2 @@
+skip-check:
+  - CKV_TF_1 # Ensure module references are pinned to a commit SHA.
diff --git a/.trunk/configs/.markdownlint.yaml b/.trunk/configs/.markdownlint.yaml
@@ -0,0 +1,14 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false
+
+# Ignore MD041/first-line-heading/first-line-h1
+# Error: First line in a file should be a top-level heading
+MD041: false
diff --git a/.trunk/configs/.prettierignore b/.trunk/configs/.prettierignore
@@ -0,0 +1,4 @@
+# `release-please` doesn't generate prettier compliant output, see relevant issues:
+# https://github.com/googleapis/release-please/issues/1902
+# https://github.com/googleapis/release-please/issues/1802
+CHANGELOG.md
diff --git a/.trunk/configs/.yamllint.yaml b/.trunk/configs/.yamllint.yaml
@@ -0,0 +1,10 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  empty-values:
+    forbid-in-block-mappings: true
+    forbid-in-flow-mappings: true
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -0,0 +1,34 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.22.8
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.6.6
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - node@18.20.5
+    - python@3.10.8
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  enabled:
+    - tofu@1.8.8
+    - terraform@1.1.0
+    - checkov@3.2.346
+    - git-diff-check
+    - markdownlint@0.43.0
+    - prettier@3.4.2
+    - tflint@0.54.0
+    - trufflehog@3.88.0
+    - yamllint@1.35.1
+actions:
+  enabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+    - trunk-upgrade-available
diff --git a/README.md b/README.md
diff --git a/data.tf b/data.tf
@@ -8,7 +8,7 @@ data "aws_ami" "amazon_linux_2023" {
 
   filter {
     name   = "name"
-    values = ["al2023-ami*"]
+    values = ["al2023-ami-2023*"]
   }
 
   filter {
diff --git a/main.tf b/main.tf
@@ -332,7 +332,8 @@ resource "aws_launch_template" "default" {
   block_device_mappings {
     device_name = "/dev/xvda"
     ebs {
-      encrypted = true
+      encrypted   = true
+      volume_size = var.volume_size
     }
   }
 
diff --git a/variables.tf b/variables.tf
@@ -96,6 +96,12 @@ variable "metadata_http_protocol_ipv6_enabled" {
   default     = false
 }
 
+variable "volume_size" {
+  description = "The size of the volume in gigabytes."
+  type        = number
+  default     = null
+}
+
 ######################
 ## SESSION LOGGING ##
 ####################

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+skip-check:`
	`2`	`+ - CKV_TF_1 # Ensure module references are pinned to a commit SHA.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ data "aws_ami" "amazon_linux_2023" {`
`8`	`8`
`9`	`9`	`filter {`
`10`	`10`	`name = "name"`
`11`		`- values = ["al2023-ami*"]`
	`11`	`+ values = ["al2023-ami-2023*"]`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`filter {`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,8 @@ resource "aws_launch_template" "default" {`
`332`	`332`	`block_device_mappings {`
`333`	`333`	`device_name = "/dev/xvda"`
`334`	`334`	`ebs {`
`335`		`- encrypted = true`
	`335`	`+ encrypted = true`
	`336`	`+ volume_size = var.volume_size`
`336`	`337`	`}`
`337`	`338`	`}`
`338`	`339`