From beebf7ba7d694b01185b849369d09dd87bef481b Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Thu, 29 Aug 2024 13:38:52 -0700 Subject: [PATCH] Update example to v0.4.59 --- available-connectors | 3 ++- google-workspace.tf | 2 +- main.tf | 8 ++++---- msft-365.tf | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/available-connectors b/available-connectors index c20e838..8a91fcf 100755 --- a/available-connectors +++ b/available-connectors @@ -12,7 +12,8 @@ MODULE_PATH="${PSOXY_BASE_DIR}infra/modules/worklytics-connector-specs" if [ ! -d "$MODULE_PATH" ]; then printf "${RED}Connector specs module not found at ${MODULE_PATH}.${NC}\n" - printf "(if testing from main psoxy repo, run this script as ${BLUE}./tools/available-connects.sh ./${NC})\n" + printf "(if testing from root of main psoxy repo, run this script as ${BLUE}./tools/available-connectors.sh ./${NC})\n" + printf "(if testing from inside example, run this script as ${BLUE}../../../tools/available-connectors.sh ../../../${NC})\n" printf "Exiting.${NC}\n" exit 1 fi diff --git a/google-workspace.tf b/google-workspace.tf index 5ea966a..8adbb2b 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.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.59" providers = { google = google.google_workspace diff --git a/main.tf b/main.tf index 7095ff5..be46d62 100644 --- a/main.tf +++ b/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.3, < 1.8" + required_version = ">= 1.3, < 1.10" required_providers { google = { @@ -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.4.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.59" enabled_connectors = var.enabled_connectors @@ -79,7 +79,7 @@ locals { } module "psoxy" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.59" gcp_project_id = var.gcp_project_id environment_name = var.environment_name @@ -118,7 +118,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.4.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.59" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key diff --git a/msft-365.tf b/msft-365.tf index a0cf93d..a511db4 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.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.59" enabled_connectors = var.enabled_connectors environment_id = var.environment_name @@ -31,7 +31,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.4.57" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.59" application_object_id = each.value.connector.id display_name = "GcpFederation"