Merge pull request #970 from AlexsLemonade/avrohom/upgrade-aws-provid…

…er-version

Upgrade aws provider version to 4.0.0

infrastructure/api.tf

@@ -52,8 +52,9 @@ resource "aws_instance" "api_server_1" {
           database_user = aws_db_instance.postgres_db.username
           database_name = aws_db_instance.postgres_db.db_name
           database_password = var.database_password
-          aws_batch_job_queue_name = module.batch.job_queue_name
-          aws_batch_job_definition_name = module.batch.job_definition_name
+          # TODO: enable batch
+          # aws_batch_job_queue_name = module.batch.job_queue_name
+          # aws_batch_job_definition_name = module.batch.job_definition_name
           aws_region  = var.region
           aws_s3_bucket_name = aws_s3_bucket.scpca_portal_bucket.id
           sentry_dsn = var.sentry_dsn

infrastructure/batch.tf

@@ -1,24 +1,25 @@
-module "batch" {
-  source = "./batch"
+# TODO: enable batch
+# module "batch" {
+#   source = "./batch"
 
   # networking
-  scpca_portal_vpc = aws_vpc.scpca_portal_vpc
-  scpca_portal_subnet_1a = aws_subnet.scpca_portal_1a
+#  scpca_portal_vpc = aws_vpc.scpca_portal_vpc
+#  scpca_portal_subnet_1a = aws_subnet.scpca_portal_1a
 
   # job_definition envars
-  dockerhub_account = var.dockerhub_account
-  django_secret_key = var.django_secret_key
-  database_password = var.database_password
-  region = var.region
-  scpca_portal_bucket = aws_s3_bucket.scpca_portal_bucket
-  sentry_dsn = var.sentry_dsn
-  postgres_db = aws_db_instance.postgres_db
+#  dockerhub_account = var.dockerhub_account
+#  django_secret_key = var.django_secret_key
+#  database_password = var.database_password
+#  region = var.region
+#  scpca_portal_bucket = aws_s3_bucket.scpca_portal_bucket
+#  sentry_dsn = var.sentry_dsn
+#  postgres_db = aws_db_instance.postgres_db
 
   # security
-  scpca_portal_db_security_group = aws_security_group.scpca_portal_db
+#  scpca_portal_db_security_group = aws_security_group.scpca_portal_db
 
   # general configuration
-  user = var.user
-  stage = var.stage
-  default_tags = var.default_tags
-}
+#  user = var.user
+#  stage = var.stage
+#  default_tags = var.default_tags
+#}

infrastructure/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
-      version = "5.12.0"
+      version = "4.0.0"
 
     }
   }