Skip to content

update to v0.5.15 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eschultink merged 1 commit into from
Dec 17, 2025
Merged

update to v0.5.15 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google-workspace.tf
View file
Open in desktop
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.5.14"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.5.15"


providers = {
Expand Down
6 changes: 3 additions & 3 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions msft-365.tf
View file
Open in desktop
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.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
Expand Down Expand Up @@ -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"
Expand Down
32 changes: 16 additions & 16 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
Expand Down