Update aws provider version, auto grab latest ami for ubuntu and update readme

Author: andre347

README.md

@@ -3,7 +3,10 @@ This repository contains example Terraform modules for installing and configurin
 Disclaimer: Please use these modules only if you're comfortable configuring Terraform.
 
 # Prerequisites
-- All modules utilize **Hashicorp Terraform 3.50.0**
+
+- All modules have been test on **Hashicorp Terraform v1.3.7**
+- The AWS Provider version is set to **v4.0**
 
 # Usage
+
 Navigate to your desired cloud provider + deployment module for specific configuration options.

modules/aws_ec2_standalone/README.md

@@ -1,8 +1,9 @@
 # AWS EC2 Standalone Deployment
 
 ## Requirements
+
 - RDS instance with port, host, username, and password
-- VPC with desired subnets 
+- VPC with desired subnets
 
 ## Usage
 
@@ -56,11 +57,14 @@ docker-ps
 ```
 
 8. Modify your environment variables. If you have an external RDS database (strongly recommended), replace the `POSTGRES_` environment variables with the new ones.
-  - If testing out your instance for the first time without SSL/HTTPS, you should uncomment `# COOKIE_INSECURE = true`
-  - Replace your `LICENSE_KEY` with your provided Retool license key
+
+- If testing out your instance for the first time without SSL/HTTPS, you should uncomment `# COOKIE_INSECURE = true`
+- Replace your `LICENSE_KEY` with your provided Retool license key
 
 9. Add any additional configuration needed. You can refer to our documentation for [all additional environment variables](https://docs.retool.com/docs/environment-variables).
 
+10. Access your Retool instance on the ec2_public_dns that is given via the resource creation outputs. If no SSL certificate has been configured you need to access the instance on port 300 (append :300 to the end of the URL) and via http.
+
 ### Security Group
 
 You can configure the security group ingress and egress rules using input variables:
@@ -112,5 +116,4 @@ egress_rules = [
 ]
 ```
 
-By default, this module creates a publicly-accessible security group that enables inbound traffic on ports (`30`, `443`, `22`, and `8000`) and all outbound traffic.
-
+By default, this module creates a publicly-accessible security group that enables inbound traffic on ports (`30`, `443`, `22`, and `3000`) and all outbound traffic.

modules/aws_ec2_standalone/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "3.50.0"
+      version = "~> 4.0"
     }
   }
 }
@@ -11,6 +11,23 @@ provider "aws" {
   region = var.aws_region
 }
 
+data "aws_ami" "this" {
+  most_recent = true # get the latest version
+   filter {
+      name   = "name"
+      values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"]
+  }
+
+  filter {
+      name   = "virtualization-type"
+      values = ["hvm"]
+  }
+
+  owners = [
+    "amazon" # only official images
+  ]
+}
+
 resource "aws_security_group" "this" {
   name        = "${var.instance_name}-sg"
   description = "Retool EC2 security group"
@@ -45,7 +62,7 @@ resource "aws_security_group" "this" {
 }
 
 resource "aws_instance" "this" {
-  ami           = var.instance_ami
+  ami           = data.aws_ami.this.id
   instance_type = var.instance_type
   key_name      = var.ssh_key_name
 

modules/aws_ec2_standalone/variables.tf

@@ -18,8 +18,8 @@ variable "instance_name" {
 
 variable "version_number" {
   type        = string
-  default     = "2.96.2"
-  description = "Retool version number. Defaults to `2.96.2`."
+  default     = "2.106.2"
+  description = "Retool version number. Defaults to `2.106.2`."
 }
 
 variable "vpc_id" {
@@ -34,11 +34,11 @@ variable "subnet_id" {
   description = "VPC Subnet ID to launch in."
 }
 
-variable "instance_ami" {
-  type        = string
-  default     = "ami-00399ec92321828f5" # Ubuntu Server 20.04 LTS 64-bit x86
-  description = "AMI for EC2 instance. Defaults to `ami-00399ec92321828f5` (Ubuntu Server 20.04 LTS 64-bit x86)."
-}
+# variable "instance_ami" {
+#   type        = string
+#   default     = "ami-06bb3ee01d992f30d" # Ubuntu Server 22.04 LTS 64-bit x86
+#   description = "AMI for EC2 instance. Defaults to `ami-06bb3ee01d992f30d` (Ubuntu Server 22.04 LTS 64-bit x86)."
+# }
 
 variable "ssh_key_name" {
   type        = string