Merge pull request #22 from Worklytics/rc-v0.4.40

update to v0.4.40
Worklytics · Nov 20, 2023 · 9aee1a6 · 9aee1a6
2 parents 67a1a11 + 9ae5b54
commit 9aee1a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/google-workspace.tf b/google-workspace.tf
@@ -7,8 +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.39"
-
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.40"
 
   providers = {
     google = google.google_workspace

diff --git 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.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.40"
 
   enabled_connectors            = var.enabled_connectors
   jira_cloud_id                 = var.jira_cloud_id
@@ -93,7 +93,7 @@ locals {
 }
 
 module "psoxy" {
-  source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.40"
 
   environment_name                = var.environment_name
   aws_account_id                  = var.aws_account_id
@@ -133,7 +133,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.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.40"
 
   psoxy_instance_id  = each.key
   worklytics_host    = var.worklytics_host

diff --git a/msft-365.tf b/msft-365.tf
@@ -1,7 +1,8 @@
 # BEGIN MSFT
 
 module "worklytics_connectors_msft_365" {
-  source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.40"
+
 
   enabled_connectors     = var.enabled_connectors
   environment_id         = var.environment_name
@@ -38,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.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.40"
 
   developer_provider_name = local.developer_provider_name
   name                    = "${local.env_qualifier}-azure-ad-federation"
@@ -47,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.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.40"
 
   aws_region       = data.aws_region.current.id
   aws_role         = var.aws_assume_role_arn
@@ -68,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.39"
+  source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.40"
 
   application_object_id = each.value.connector.id
   display_name          = "${local.env_qualifier}AccessFromAWS"

diff --git a/variables.tf b/variables.tf
@@ -186,18 +186,19 @@ variable "custom_api_connector_rules" {
 variable "custom_bulk_connectors" {
   type = map(object({
     source_kind = string
-    rules = object({
+    rules = optional(object({
       pseudonymFormat       = optional(string, "URL_SAFE_TOKEN")
       columnsToRedact       = optional(list(string)) # columns to remove from CSV
       columnsToInclude      = optional(list(string)) # if you prefer to include only an explicit list of columns, rather than redacting those you don't want
       columnsToPseudonymize = optional(list(string)) # columns to pseudonymize
       columnsToDuplicate    = optional(map(string))  # columns to create copy of; name --> new name
       columnsToRename       = optional(map(string))  # columns to rename: original name --> new name; renames applied BEFORE pseudonymization
-      fieldsToTransform     = optional(map(object({
-        newName = string
+      fieldsToTransform = optional(map(object({
+        newName    = string
         transforms = optional(list(map(string)), [])
       })), {})
-    })
+    }))
+    rules_file          = optional(string)
     memory_size_mb      = optional(number, null)
     settings_to_provide = optional(map(string), {})
   }))
@@ -221,12 +222,12 @@ variable "custom_bulk_connector_rules" {
   type = map(object({
     pseudonymFormat       = optional(string, "URL_SAFE_TOKEN")
     columnsToRedact       = optional(list(string), []) # columns to remove from CSV
-    columnsToInclude      = optional(list(string)) # if you prefer to include only an explicit list of columns, rather than redacting those you don't want
+    columnsToInclude      = optional(list(string))     # if you prefer to include only an explicit list of columns, rather than redacting those you don't want
     columnsToPseudonymize = optional(list(string), []) # columns to pseudonymize
-    columnsToDuplicate    = optional(map(string))  # columns to create copy of; name --> new name
-    columnsToRename       = optional(map(string))  # columns to rename: original name --> new name; renames applied BEFORE pseudonymization
-    fieldsToTransform     = optional(map(object({
-      newName = string
+    columnsToDuplicate    = optional(map(string))      # columns to create copy of; name --> new name
+    columnsToRename       = optional(map(string))      # columns to rename: original name --> new name; renames applied BEFORE pseudonymization
+    fieldsToTransform = optional(map(object({
+      newName    = string
       transforms = optional(list(map(string)), [])
     })))
   }))