From 63ccfa7bbe4a6cbd40353ba1edbd59155e3ac576 Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Wed, 6 Dec 2023 13:23:27 -0800 Subject: [PATCH] Update example to v0.4.42 --- google-workspace.tf | 2 +- main.tf | 6 +++--- msft-365.tf | 8 ++++---- variables.tf | 9 +++++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/google-workspace.tf b/google-workspace.tf index a300803..d75fe8b 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.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.42" providers = { google = google.google_workspace diff --git a/main.tf b/main.tf index 0dc98b4..b491a3b 100644 --- a/main.tf +++ b/main.tf @@ -18,7 +18,7 @@ terraform { # general cases module "worklytics_connectors" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.42" enabled_connectors = var.enabled_connectors jira_cloud_id = var.jira_cloud_id @@ -94,7 +94,7 @@ locals { } module "psoxy" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.42" environment_name = var.environment_name aws_account_id = var.aws_account_id @@ -134,7 +134,7 @@ locals { module "connection_in_worklytics" { for_each = local.all_instances - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.42" psoxy_instance_id = each.key worklytics_host = var.worklytics_host diff --git a/msft-365.tf b/msft-365.tf index 54f5d3a..d8e25af 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.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.42" enabled_connectors = var.enabled_connectors @@ -39,7 +39,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.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.42" developer_provider_name = local.developer_provider_name name = "${local.env_qualifier}-azure-ad-federation" @@ -48,7 +48,7 @@ module "cognito_identity_pool" { 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.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.42" aws_region = data.aws_region.current.id aws_role = var.aws_assume_role_arn @@ -69,7 +69,7 @@ resource "aws_iam_role_policy_attachment" "cognito_lambda_policy" { module "msft_connection_auth_federation" { for_each = module.worklytics_connectors_msft_365.enabled_api_connectors - source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.41" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.42" application_object_id = each.value.connector.id display_name = "${local.env_qualifier}AccessFromAWS" diff --git a/variables.tf b/variables.tf index 8f90491..b0246e0 100644 --- a/variables.tf +++ b/variables.tf @@ -183,9 +183,14 @@ variable "custom_api_connector_rules" { default = {} } + variable "custom_bulk_connectors" { type = map(object({ - source_kind = string + source_kind = string + display_name = optional(string, "Custom Bulk Connector") + worklytics_connector_id = optional(string, "bulk-import-psoxy") + worklytics_connector_name = optional(string, "Custom Bulk Data via Psoxy") + rules_file = optional(string) rules = optional(object({ pseudonymFormat = optional(string, "URL_SAFE_TOKEN") columnsToRedact = optional(list(string)) # columns to remove from CSV @@ -198,9 +203,9 @@ variable "custom_bulk_connectors" { transforms = optional(list(map(string)), []) })), {}) })) - rules_file = optional(string) memory_size_mb = optional(number, null) settings_to_provide = optional(map(string), {}) + example_file = optional(string) })) description = "specs of custom bulk connectors to create"