diff --git a/google-workspace.tf b/google-workspace.tf index 84f59ad..40283ec 100644 --- a/google-workspace.tf +++ b/google-workspace.tf @@ -7,7 +7,7 @@ provider "google" { module "worklytics_connectors_google_workspace" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.6.5" google_workspace_connector_settings = var.google_workspace_connector_settings diff --git a/main.tf b/main.tf index 4205c3f..e8523fd 100644 --- a/main.tf +++ b/main.tf @@ -20,7 +20,7 @@ terraform { # general cases module "worklytics_connectors" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.6.5" enabled_connectors = var.enabled_connectors connector_settings = var.connector_settings @@ -119,7 +119,7 @@ locals { } module "psoxy" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.6.5" environment_name = var.environment_name aws_account_id = var.aws_account_id @@ -197,7 +197,7 @@ locals { module "connection_in_worklytics" { for_each = local.all_instances - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-proxy-connection-aws?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-proxy-connection-aws?ref=v0.6.5" proxy_instance_id = each.key worklytics_host = var.worklytics_host @@ -225,24 +225,8 @@ output "api_connector_instances" { value = { for k, v in module.psoxy.api_connector_instances : k => { endpoint_url = v.endpoint_url sanitized_bucket = v.sanitized_bucket - test_examples = merge({ - api_requests = concat( - [for path in try(v.example_api_calls, []) : "GET ${path}"], - [for req in try(v.example_api_requests, []) : merge( - { - request = "${try(req.method, "GET")} ${req.path}" - }, - try(req.method, "GET") == "POST" || try(req.method, "GET") == "PUT" ? merge( - try(req.content_type, null) != null ? { content_type = req.content_type } : {}, - try(req.body, null) != null ? { body = req.body } : {} - ) : {} - )] - ) - }, - try(v.enable_async_processing, false) ? { supports_async = true } : {}, - try(v.example_api_calls_user_to_impersonate, null) != null ? { user_to_impersonate = try(v.example_api_calls_user_to_impersonate, null) } : {} - ) } - } + test_examples = v.test_examples + } } } output "bulk_connector_instances" { diff --git a/msft-365.tf b/msft-365.tf index 43c6a61..c240949 100644 --- a/msft-365.tf +++ b/msft-365.tf @@ -1,7 +1,7 @@ # BEGIN MSFT module "worklytics_connectors_msft_365" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.6.5" msft_365_connector_settings = var.msft_365_connector_settings @@ -50,7 +50,7 @@ data "aws_region" "current" { module "cognito_identity_pool" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled - source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.6.5" developer_provider_name = local.developer_provider_name name = "${local.env_qualifier}-azure-ad-federation" @@ -72,7 +72,7 @@ locals { module "cognito_identity" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled - source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.6.5" aws_region = data.aws_region.current.region @@ -109,7 +109,7 @@ locals { module "msft_connection_auth_federation" { for_each = local.provision_entraid_apps ? local.enabled_to_entraid_object : local.shared_to_entraid_object - source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.6.4" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.6.5" application_id = each.value.connector_id display_name = "${local.env_qualifier}AccessFromAWS" diff --git a/variables.tf b/variables.tf index a8c2f01..d46673f 100644 --- a/variables.tf +++ b/variables.tf @@ -265,6 +265,7 @@ variable "custom_api_connectors" { path = string content_type = optional(string, "application/json") body = optional(string, null) + headers = optional(map(string), {}) })), []) example_api_calls_user_to_impersonate = optional(string) secured_variables = optional(list(object({