providers

Ujstor · Jun 23, 2024 · 1589898 · 1589898
1 parent 4c6693c
commit 1589898
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/tf-lint.yml b/.github/workflows/tf-lint.yml
@@ -1,7 +1,7 @@
 name: terraform-lint
 on:
   push:
-    branches: [ master ]
+    branches: [ lambda ]
   pull_request:
 
 jobs:

diff --git a/aws-infra/main.tf b/aws-infra/main.tf
@@ -1,6 +1,10 @@
 module "lambda" {
   source = "./modules/lambda"
 
+  # providers = {
+  #   aws = aws.snadbox
+  # }
+
   lambda_config = {
     work_dir          = "../"
     bin_name          = "bootstrap"
@@ -16,6 +20,10 @@ module "lambda" {
 module "api_gateway" {
   source = "./modules/API-gateway"
 
+  # providers = {
+  #   aws = aws.snadbox
+  # }
+
   api_gw_conf = {
     name          = "portfolio-web"
     protocol_type = "HTTP"

diff --git a/aws-infra/modules/API-gateway/terraform.tf b/aws-infra/modules/API-gateway/terraform.tf
@@ -2,12 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "5.48.0"
+      version = "~> 5.0"
     }
   }
-  required_version = ">=0.15.1"
-}
-
-provider "aws" {
-  region = var.aws_region
 }
diff --git a/aws-infra/modules/API-gateway/variables.tf b/aws-infra/modules/API-gateway/variables.tf
@@ -1,9 +1,3 @@
-variable "aws_region" {
-  description = "AWS region"
-  type        = string
-  default     = "us-east-1"
-}
-
 variable "api_gw_conf" {
   description = "API Gateway configuration"
   type = object({

diff --git a/aws-infra/modules/lambda/terrafrom.tf b/aws-infra/modules/lambda/terrafrom.tf
@@ -2,16 +2,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "5.48.0"
+      version = "~> 5.0"
     }
     archive = {
       source  = "hashicorp/archive"
-      version = "2.4.2"
+      version = "~> 2.0"
     }
   }
-  required_version = ">=0.15.1"
-}
-
-provider "aws" {
-  region = var.aws_region
 }
diff --git a/aws-infra/modules/lambda/variables.tf b/aws-infra/modules/lambda/variables.tf
@@ -1,9 +1,3 @@
-variable "aws_region" {
-  description = "AWS region"
-  type        = string
-  default     = "us-east-1"
-}
-
 variable "lambda_config" {
   description = "Lambda function configuration"
   type = object({

diff --git a/aws-infra/outputs.tf b/aws-infra/outputs.tf
@@ -3,11 +3,7 @@ output "lambda_arn" {
   value       = module.lambda.lambda_arn
 }
 
-# output "Dynamodb_arn" {
-#   description = "DynamoDB ARN"
-#   value       = module.dynamodb.dynamodb_arn
-# }
-
 output "api_gateway_url" {
-  value = module.api_gateway.api_gateway_url
+  description = "API gateway URL"
+  value       = module.api_gateway.api_gateway_url
 }
diff --git a/aws-infra/terraform.tf b/aws-infra/terraform.tf
@@ -0,0 +1,22 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 1.0.0, < 2.0.0"
+}
+provider "aws" {
+  region = "us-east-1"
+  # alias  = "snadbox"
+
+  # assume_role {
+  #   role_arn = "arn:aws:iam::730335647984:role/OrganizationAccountAccessRole"
+  # }
+}
+