[IGNORE] Checking a11y

terraform/sandbox/providers.tf

@@ -2,6 +2,10 @@ terraform {
   required_version = "~> 1.0"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.1.0"
+    }
+    cloudfoundry-community = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "~>0.53.1"
     }
@@ -18,8 +22,17 @@ terraform {
   }
 }
 
+
 provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
 }
+
+# Backwards compatability provider for all modules < v2.0.0
+# https://github.com/GSA-TTS/terraform-cloudgov/blob/main/UPGRADING.md#using-v1-and-v2-together
+provider "cloudfoundry-community" {
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}

terraform/shared/modules/sandbox/app.tf

@@ -25,6 +25,8 @@ module "fac-app" {
 }
 
 resource "cloudfoundry_network_policy" "app-network-policy" {
+  provider = cloudfoundry-community
+
   policy {
     source_app      = module.fac-app.app_id
     destination_app = module.https-proxy.app_id

terraform/shared/modules/sandbox/clamav.tf

@@ -7,32 +7,31 @@ data "docker_registry_image" "clamav" {
 }
 
 module "clamav" {
-  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v1.1.0"
+  source = "github.com/gsa-tts/terraform-cloudgov//clamav?ref=v2.0.0"
 
   # This generates eg "fac-av-staging.apps.internal", avoiding collisions with routes for other projects and spaces
-  name           = local.clam_name
-  app_name_or_id = "gsa-fac"
+  name = local.clam_name
 
   cf_org_name   = var.cf_org_name
   cf_space_name = var.cf_space_name
+
   clamav_image  = "ghcr.io/gsa-tts/fac/clamav@${data.docker_registry_image.clamav.sha256_digest}"
+  clamav_memory = var.clamav_memory
   max_file_size = "30M"
   instances     = var.clamav_instances
-  clamav_memory = var.clamav_memory
 
   proxy_server   = module.https-proxy.domain
   proxy_port     = module.https-proxy.port
   proxy_username = module.https-proxy.username
   proxy_password = module.https-proxy.password
-  # depends_on     = [module.fac-app.app_id]
-  # depends_on     = [ module.https-proxy.https_proxy ]
 }
 
-# resource "cloudfoundry_network_policy" "clamav-network-policy" {
-#   policy {
-#     source_app      = module.clamav.app_id
-#     destination_app = module.https-proxy.app_id
-#     port            = "61443"
-#     protocol        = "tcp"
-#   }
-# }
+resource "cloudfoundry_network_policy" "clamav-network-policy" {
+  provider = cloudfoundry-community
+  policy {
+    source_app      = module.clamav.app_id
+    destination_app = module.https-proxy.app_id
+    port            = "61443"
+    protocol        = "tcp"
+  }
+}

terraform/shared/modules/sandbox/env.tf

@@ -42,6 +42,7 @@ module "s3-private" {
 
 # Stuff used for apps in this space
 data "cloudfoundry_space" "apps" {
+  provider = cloudfoundry-community
   org_name = var.cf_org_name
   name     = var.cf_space_name
 }

terraform/shared/modules/sandbox/newrelic.tf

@@ -1,4 +1,6 @@
 resource "cloudfoundry_user_provided_service" "credentials" {
+  provider = cloudfoundry-community
+
   name  = "newrelic-creds"
   space = data.cloudfoundry_space.apps.id
   credentials = {

terraform/shared/modules/sandbox/postgrest.tf

@@ -3,12 +3,16 @@ locals {
 }
 
 resource "cloudfoundry_route" "postgrest" {
+  provider = cloudfoundry-community
+
   space    = data.cloudfoundry_space.apps.id
   domain   = data.cloudfoundry_domain.public.id
   hostname = "fac-${var.cf_space_name}-${local.postgrest_name}"
 }
 
 resource "cloudfoundry_service_key" "postgrest" {
+  provider = cloudfoundry-community
+
   name             = "postgrest"
   service_instance = module.database.instance_id
 }
@@ -18,6 +22,8 @@ data "docker_registry_image" "postgrest" {
 }
 
 resource "cloudfoundry_app" "postgrest" {
+  provider = cloudfoundry-community
+
   name         = local.postgrest_name
   space        = data.cloudfoundry_space.apps.id
   docker_image = "ghcr.io/gsa-tts/fac/postgrest@${data.docker_registry_image.postgrest.sha256_digest}"

terraform/shared/modules/sandbox/providers.tf

@@ -2,6 +2,11 @@ terraform {
   required_version = "~> 1.0"
   required_providers {
     cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "1.1.0"
+    }
+
+    cloudfoundry-community = {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "~>0.53.1"
     }

terraform/shared/modules/sandbox/routes.tf

@@ -5,18 +5,24 @@ locals {
 }
 
 data "cloudfoundry_space" "client_space" {
+  provider = cloudfoundry-community
+
   org_name = var.cf_org_name
   name     = local.client_space
 }
 
 data "cloudfoundry_app" "clients" {
+  provider = cloudfoundry-community
+
   for_each   = local.clients
   name_or_id = each.key
   space      = data.cloudfoundry_space.client_space.id
   depends_on = [module.fac-app, module.clamav, cloudfoundry_app.postgrest, module.https-proxy]
 }
 
 resource "cloudfoundry_network_policy" "client_routing" {
+  provider = cloudfoundry-community
+
   for_each = local.clients
   policy {
     source_app      = data.cloudfoundry_app.clients[each.key].id

terraform/shared/modules/sandbox/variables.tf

@@ -75,9 +75,9 @@ variable "clamav_fs_instances" {
 }
 
 variable "clamav_memory" {
-  type        = number
+  type        = string
   description = "memory in MB to allocate to clamav app"
-  default     = 2048
+  default     = "2048M"
 }
 
 variable "pgrst_jwt_secret" {