Terraform (and providers) up-to-date

Author: magul

.github/workflows/lint.yml

@@ -2,9 +2,6 @@ name: lint
 
 on:
   push:
-    branches: [main]
-  pull_request:
-    branches: [main]
 
 jobs:
   code:
@@ -13,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: CodeForPoznan/actions/setup-infrastructure@v2
         with:
-          terraform-version: 1.5.3
+          terraform-version: 1.12.0
 
       - run: make check
 

.terraform.lock.hcl

@@ -4,19 +4,6 @@ Repository contains description of Code for Poznań infrastructure.
 You'll need AWS credentials into our organization and a tunnel to our bastion server 
 in order to work with this code. This can't be done unless you've been added by one of admins (see ./admins.tf file).
 
-#### version used
-
-```shell
-terraform version
-Terraform v1.5.2
-on darwin_arm64
-+ provider registry.terraform.io/cyrilgdn/postgresql v1.19.0
-+ provider registry.terraform.io/hashicorp/aws v5.7.0
-+ provider registry.terraform.io/hashicorp/cloudinit v2.3.2
-+ provider registry.terraform.io/hashicorp/random v3.5.1
-```
-
-
 #### Initialize project
 
 ```

README.md

@@ -112,8 +112,8 @@ module "codeforpoznan_pl_v3_cloudfront_distribution" {
       origin_path = "/codeforpoznan_pl_v3"
     }
     api_gateway = {
-      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.codeforpoznan_pl_v3_serverless_api.deployment.invoke_url).hostname
-      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.codeforpoznan_pl_v3_serverless_api.deployment.invoke_url).path
+      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.codeforpoznan_pl_v3_serverless_api.stage.invoke_url).hostname
+      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.codeforpoznan_pl_v3_serverless_api.stage.invoke_url).path
       custom_origin = true
     }
   }
@@ -137,6 +137,11 @@ module "codeforpoznan_pl_v3_cloudfront_distribution" {
   ]
 }
 
+import {
+  to = module.codeforpoznan_pl_v3_serverless_api.aws_api_gateway_stage.stage
+  id = "q4ih7hkyl4/devel"
+}
+
 module "codeforpoznan_pl_v3_serverless_api" {
   source = "./serverless_api"
 

codeforpoznan_pl_v3.tf

@@ -16,7 +16,7 @@ resource "aws_db_instance" "db" {
   identifier = "main-postgres"
 
   engine         = "postgres"
-  engine_version = "12.17"
+  engine_version = "12.19"
 
   instance_class    = "db.t3.micro"
   allocated_storage = 8

db.tf

@@ -113,6 +113,11 @@ resource "aws_iam_user_policy_attachment" "dev_codeforpoznan_pl_v3_ses_policy_at
   user       = module.dev_codeforpoznan_pl_v3_user.user.name
 }
 
+import {
+  to = module.dev_codeforpoznan_pl_v3_serverless_api.aws_api_gateway_stage.stage
+  id = "z00svsc3od/devel"
+}
+
 module "dev_codeforpoznan_pl_v3_serverless_api" {
   source = "./serverless_api"
 
@@ -153,8 +158,8 @@ module "dev_codeforpoznan_pl_v3_cloudfront_distribution" {
       origin_path = "/dev_codeforpoznan_pl_v3"
     }
     api_gateway = {
-      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_codeforpoznan_pl_v3_serverless_api.deployment.invoke_url).hostname
-      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_codeforpoznan_pl_v3_serverless_api.deployment.invoke_url).path
+      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_codeforpoznan_pl_v3_serverless_api.stage.invoke_url).hostname
+      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_codeforpoznan_pl_v3_serverless_api.stage.invoke_url).path
       custom_origin = true
     }
   }

dev_codeforpoznan_pl_v3.tf

@@ -65,6 +65,11 @@ module "dev_pah_fm_frontend_assets" {
   iam_user  = module.dev_pah_fm_user.user
 }
 
+import {
+  to = module.dev_pah_fm_serverless_api.aws_api_gateway_stage.stage
+  id = "8sbwf5qbi1/devel"
+}
+
 module "dev_pah_fm_serverless_api" {
   source = "./serverless_api"
 
@@ -112,8 +117,8 @@ module "dev_pah_fm_cloudfront_distribution" {
       origin_path = "/dev_pah_fm"
     }
     api_gateway = {
-      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_pah_fm_serverless_api.deployment.invoke_url).hostname
-      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_pah_fm_serverless_api.deployment.invoke_url).path
+      domain_name   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_pah_fm_serverless_api.stage.invoke_url).hostname
+      origin_path   = regex("https://(?P<hostname>[^/?#]*)(?P<path>[^?#]*)", module.dev_pah_fm_serverless_api.stage.invoke_url).path
       custom_origin = true
     }
   }

dev_pah_fm.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = "~> 1.12.0"
 
   backend "s3" {
     bucket  = "codeforpoznan-tfstate"
@@ -11,20 +11,20 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = "5.61.0"
+      version               = "5.98.0"
       configuration_aliases = [aws.north_virginia]
     }
     random = {
       source  = "hashicorp/random"
-      version = "3.6.2"
+      version = "3.7.2"
     }
     cloudinit = {
       source  = "hashicorp/cloudinit"
-      version = "2.3.4"
+      version = "2.3.7"
     }
     postgresql = {
       source  = "cyrilgdn/postgresql"
-      version = "1.19.0"
+      version = "1.25.0"
     }
   }
 }

providers.tf

@@ -105,22 +105,27 @@ resource "aws_api_gateway_integration" "proxy_integration" {
 
 resource "aws_api_gateway_deployment" "deployment" {
   rest_api_id = aws_api_gateway_rest_api.rest_api.id
-  stage_name  = "devel"
 
   depends_on = [
     aws_api_gateway_integration.root_integration,
     aws_api_gateway_integration.proxy_integration,
   ]
 }
 
+resource "aws_api_gateway_stage" "stage" {
+  deployment_id = aws_api_gateway_deployment.deployment.id
+  rest_api_id   = aws_api_gateway_rest_api.rest_api.id
+  stage_name    = "devel"
+}
+
 resource "aws_lambda_permission" "permission" {
   function_name = module.lambda.function.function_name
   statement_id  = "${replace(title(replace(var.name, "/[\\._]/", " ")), " ", "")}Invoke"
   action        = "lambda:InvokeFunction"
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "${replace(aws_api_gateway_deployment.deployment.execution_arn, "devel", "")}*/*"
+  source_arn    = "${replace(aws_api_gateway_stage.stage.execution_arn, "devel", "")}*/*"
 }
 
-output "deployment" {
-  value = aws_api_gateway_deployment.deployment
+output "stage" {
+  value = aws_api_gateway_stage.stage
 }