From 6d006dcde888a59c19588792b0805bdbaf4594a6 Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Tue, 16 Dec 2025 14:55:45 -0800 Subject: [PATCH] Update example to v0.5.15 --- google-workspace.tf | 2 +- main.tf | 6 +++--- msft-365.tf | 4 ++-- variables.tf | 32 ++++++++++++++++---------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/google-workspace.tf b/google-workspace.tf index c50681c..1eb1616 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.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.5.15" providers = { diff --git a/main.tf b/main.tf index c09bb34..78c01d2 100644 --- a/main.tf +++ b/main.tf @@ -28,7 +28,7 @@ locals { # be provisioned via Terraform, so doesn't add any dependencies # call this 'generic_source_connectors'? module "worklytics_connectors" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.5.15" enabled_connectors = var.enabled_connectors chat_gpt_enterprise_example_workspace_id = var.chat_gpt_enterprise_example_workspace_id @@ -85,7 +85,7 @@ locals { module "psoxy" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.5.15" gcp_project_id = var.gcp_project_id environment_name = var.environment_name @@ -145,7 +145,7 @@ locals { module "connection_in_worklytics" { for_each = local.all_instances - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.5.15" host_platform_id = local.host_platform_id proxy_instance_id = each.key diff --git a/msft-365.tf b/msft-365.tf index e5269a5..a0732e5 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.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.5.15" enabled_connectors = var.enabled_connectors environment_id = var.environment_name @@ -32,7 +32,7 @@ locals { 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.5.14" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.5.15" application_id = each.value.connector.id display_name = "GcpFederation" diff --git a/variables.tf b/variables.tf index c2ca640..0772ce6 100644 --- a/variables.tf +++ b/variables.tf @@ -157,34 +157,34 @@ variable "vpc_config" { # serverless_connector: allow null; if provided, must match the full resource name validation { condition = ( - var.vpc_config == null - || try(var.vpc_config.serverless_connector, null) == null - || can(regex("^projects/[^/]+/locations/[^/]+/connectors/[^/]+$", try(var.vpc_config.serverless_connector, ""))) + var.vpc_config == null + || try(var.vpc_config.serverless_connector, null) == null + || can(regex("^projects/[^/]+/locations/[^/]+/connectors/[^/]+$", try(var.vpc_config.serverless_connector, ""))) ) error_message = "If vpc_config.serverless_connector is provided, it must match the format: projects/{project}/locations/{location}/connectors/{connector}" } validation { condition = ( - var.vpc_config == null - || try(var.vpc_config.serverless_connector, null) != null - || - ( - # Accepts a simple network name: lowercase letters, digits, dashes - can(regex("^[a-z0-9-]+$", try(var.vpc_config.network,""))) - || - # Accepts a full self-link (Compute URL format) - can(regex("^projects/[^/]+/(global|regions/[^/]+)/networks/[^/]+$", try(var.vpc_config.network,""))) - ) + var.vpc_config == null + || try(var.vpc_config.serverless_connector, null) != null + || + ( + # Accepts a simple network name: lowercase letters, digits, dashes + can(regex("^[a-z0-9-]+$", try(var.vpc_config.network, ""))) + || + # Accepts a full self-link (Compute URL format) + can(regex("^projects/[^/]+/(global|regions/[^/]+)/networks/[^/]+$", try(var.vpc_config.network, ""))) + ) ) error_message = "vpc_config.network must be lowercase letters, numbers, or dashes." } validation { condition = ( - var.vpc_config == null - || try(var.vpc_config.serverless_connector, null) != null - || (try(var.vpc_config.network, null) != null && try(var.vpc_config.subnet, null) != null) + var.vpc_config == null + || try(var.vpc_config.serverless_connector, null) != null + || (try(var.vpc_config.network, null) != null && try(var.vpc_config.subnet, null) != null) ) error_message = "If vpc_config is provided without serverless_connector, both network and subnet are required." }