misc v0.6.7 fixes (#1313)

* drop lookup buckets from CallerAccess policy

* style fixes

Author: eschultink

infra/modules/aws-host/main.tf

@@ -493,7 +493,6 @@ locals {
   caller_has_configured_output_buckets = (
     length(var.bulk_connectors) > 0 ||
     length(var.webhook_collectors) > 0 ||
-    length(var.lookup_table_builders) > 0 ||
     length([for k, v in var.api_connectors : k if try(v.enable_async_processing, false)]) > 0 ||
     length([for k, v in local.sanitized_side_outputs : k if v != null]) > 0
   )
@@ -503,7 +502,6 @@ locals {
     [for k, v in module.webhook_collectors : v.output_sanitized_bucket_id],
     [for k, v in module.api_connector : v.async_output_bucket_id if try(v.async_output_bucket_id, null) != null],
     [for k, v in module.api_connector : v.side_output_sanitized_bucket_id if try(v.side_output_sanitized_bucket_id, null) != null],
-    [for k, v in module.lookup_output : v.output_bucket],
   )))
 
   caller_output_bucket_read_resources = flatten([

infra/modules/aws-proxy-bulk/provision_testing_infra.tftest.hcl

@@ -1,14 +1,14 @@
 # Plan succeeds with testing IAM/bucket policies enabled and disabled.
 
 variables {
-  environment_name                  = "test"
-  instance_id                       = "hris"
-  aws_account_id                    = "123456789012"
-  path_to_function_zip              = "../aws-proxy-lambda/tests/deployment.zip"
-  function_zip_hash                 = "dummy-hash-for-test"
-  path_to_instance_ssm_parameters   = "PSOXY_TEST_HRIS_"
-  provision_iam_policy_for_testing  = false
-  aws_principal_arn_when_testing    = null
+  environment_name                      = "test"
+  instance_id                           = "hris"
+  aws_account_id                        = "123456789012"
+  path_to_function_zip                  = "../aws-proxy-lambda/tests/deployment.zip"
+  function_zip_hash                     = "dummy-hash-for-test"
+  path_to_instance_ssm_parameters       = "PSOXY_TEST_HRIS_"
+  provision_iam_policy_for_testing      = false
+  aws_principal_arn_when_testing        = null
   aws_write_role_to_assume_when_testing = null
 }
 

infra/modules/gcp-proxy-api/main.tf

@@ -291,7 +291,7 @@ resource "google_cloudfunctions2_function" "function" {
       iterator = secret_environment_variable
 
       content {
-        key        = secret_environment_variable.key
+        key = secret_environment_variable.key
         # project_id string (not number) avoids apply-time drift: number comes from data.google_project
         project_id = var.gcp_project.project_id
         secret     = secret_environment_variable.value.secret_id

infra/modules/gcp-proxy-bulk/main.tf

@@ -251,7 +251,7 @@ resource "google_cloudfunctions2_function" "function" {
       iterator = secret_environment_variable
 
       content {
-        key        = secret_environment_variable.key
+        key = secret_environment_variable.key
         # project_id string (not number) avoids apply-time drift: number comes from data.google_project
         project_id = var.gcp_project.project_id
         secret     = secret_environment_variable.value.secret_id

infra/modules/gcp-webhook-collector/ip_lock_conditions.tftest.hcl

@@ -23,7 +23,7 @@ variables {
   provision_auth_key = {
     rotation_days = 30
   }
-  example_identity               = "test-user@example.com"
+  example_identity = "test-user@example.com"
 
   allowed_webhook_ip_blocks = ["10.0.0.0/16"]
 }

infra/modules/gcp-webhook-collector/main.tf

@@ -367,7 +367,7 @@ resource "google_cloudfunctions2_function" "function" {
       iterator = secret_environment_variable
 
       content {
-        key        = secret_environment_variable.key
+        key = secret_environment_variable.key
         # project_id string (not number) avoids apply-time drift: number comes from data.google_project
         project_id = var.gcp_project.project_id
         secret     = secret_environment_variable.value.secret_id