Skip to content

Commit

Permalink
Update example to v0.4.42
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink committed Dec 6, 2023
1 parent 804e42a commit 63ccfa7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion google-workspace.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions msft-365.tf
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand Down

0 comments on commit 63ccfa7

Please sign in to comment.