From ffe4169229a581930a8299e63fda8686881b7cab Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Wed, 20 Dec 2023 19:17:30 -0800 Subject: [PATCH] update release refs to rc-v0.4.44 --- .../examples-dev/aws-all/google-workspace.tf | 2 +- infra/examples-dev/aws-all/main.tf | 6 +-- infra/examples-dev/aws-all/msft-365.tf | 8 ++-- .../examples-dev/aws-google-workspace/main.tf | 2 +- infra/examples-dev/aws-msft-365/main.tf | 2 +- infra/examples-dev/aws/main.tf | 2 +- .../examples-dev/gcp-google-workspace/main.tf | 2 +- infra/examples-dev/gcp/google-workspace.tf | 2 +- infra/examples-dev/gcp/main.tf | 6 +-- infra/examples-dev/gcp/msft-365.tf | 4 +- infra/examples/aws-google-workspace/main.tf | 2 +- infra/examples/aws-msft-365/main.tf | 2 +- infra/examples/gcp-google-workspace/main.tf | 2 +- infra/examples/msft-365/main.tf | 8 ++-- .../aws-google-workspace/main.tf | 30 ++++++------- infra/modular-examples/aws-msft-365/main.tf | 32 +++++++------- infra/modular-examples/aws/main.tf | 44 +++++++++---------- .../gcp-google-workspace/main.tf | 28 ++++++------ .../impl/HealthCheckRequestHandler.java | 2 +- java/pom.xml | 2 +- tools/init-tfvars.sh | 2 +- 21 files changed, 95 insertions(+), 95 deletions(-) diff --git a/infra/examples-dev/aws-all/google-workspace.tf b/infra/examples-dev/aws-all/google-workspace.tf index 870ad7515..7124acbb1 100644 --- a/infra/examples-dev/aws-all/google-workspace.tf +++ b/infra/examples-dev/aws-all/google-workspace.tf @@ -8,7 +8,7 @@ provider "google" { module "worklytics_connectors_google_workspace" { source = "../../modules/worklytics-connectors-google-workspace" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=rc-v0.4.44" providers = { google = google.google_workspace diff --git a/infra/examples-dev/aws-all/main.tf b/infra/examples-dev/aws-all/main.tf index e588c377c..169f9e362 100644 --- a/infra/examples-dev/aws-all/main.tf +++ b/infra/examples-dev/aws-all/main.tf @@ -19,7 +19,7 @@ terraform { # general cases module "worklytics_connectors" { source = "../../modules/worklytics-connectors" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors jira_cloud_id = var.jira_cloud_id @@ -96,7 +96,7 @@ locals { module "psoxy" { source = "../../modules/aws-host" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=rc-v0.4.44" environment_name = var.environment_name aws_account_id = var.aws_account_id @@ -137,7 +137,7 @@ module "connection_in_worklytics" { for_each = local.all_instances source = "../../modules/worklytics-psoxy-connection-aws" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=rc-v0.4.44" psoxy_instance_id = each.key worklytics_host = var.worklytics_host diff --git a/infra/examples-dev/aws-all/msft-365.tf b/infra/examples-dev/aws-all/msft-365.tf index df2f4d973..f51f044cc 100644 --- a/infra/examples-dev/aws-all/msft-365.tf +++ b/infra/examples-dev/aws-all/msft-365.tf @@ -2,7 +2,7 @@ module "worklytics_connectors_msft_365" { source = "../../modules/worklytics-connectors-msft-365" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors @@ -46,7 +46,7 @@ module "cognito_identity_pool" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled source = "../../modules/aws-cognito-pool" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=rc-v0.4.44" developer_provider_name = local.developer_provider_name name = "${local.env_qualifier}-azure-ad-federation" @@ -56,7 +56,7 @@ module "cognito_identity" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled source = "../../modules/aws-cognito-identity-cli" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=rc-v0.4.44" aws_region = data.aws_region.current.id aws_role = var.aws_assume_role_arn @@ -78,7 +78,7 @@ module "msft_connection_auth_federation" { for_each = module.worklytics_connectors_msft_365.enabled_api_connectors source = "../../modules/azuread-federated-credentials" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.44" application_object_id = each.value.connector.id display_name = "${local.env_qualifier}AccessFromAWS" diff --git a/infra/examples-dev/aws-google-workspace/main.tf b/infra/examples-dev/aws-google-workspace/main.tf index e3425779a..6b01baf9e 100644 --- a/infra/examples-dev/aws-google-workspace/main.tf +++ b/infra/examples-dev/aws-google-workspace/main.tf @@ -59,7 +59,7 @@ data "google_project" "psoxy-google-connectors" { module "psoxy" { source = "../../modular-examples/aws-google-workspace" - # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=rc-v0.4.44" aws_account_id = var.aws_account_id aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas) diff --git a/infra/examples-dev/aws-msft-365/main.tf b/infra/examples-dev/aws-msft-365/main.tf index 51b84782c..99b622a4d 100644 --- a/infra/examples-dev/aws-msft-365/main.tf +++ b/infra/examples-dev/aws-msft-365/main.tf @@ -51,7 +51,7 @@ provider "azuread" { module "psoxy" { source = "../../modular-examples/aws-msft-365" - # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=rc-v0.4.44" aws_account_id = var.aws_account_id aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas) diff --git a/infra/examples-dev/aws/main.tf b/infra/examples-dev/aws/main.tf index bca2c48eb..92be846ee 100644 --- a/infra/examples-dev/aws/main.tf +++ b/infra/examples-dev/aws/main.tf @@ -57,7 +57,7 @@ provider "azuread" { module "psoxy" { source = "../../modular-examples/aws" - # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws?ref=rc-v0.4.44" aws_account_id = var.aws_account_id aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas) diff --git a/infra/examples-dev/gcp-google-workspace/main.tf b/infra/examples-dev/gcp-google-workspace/main.tf index 51ec598a1..026038ce5 100644 --- a/infra/examples-dev/gcp-google-workspace/main.tf +++ b/infra/examples-dev/gcp-google-workspace/main.tf @@ -28,7 +28,7 @@ provider "google" { module "psoxy" { source = "../../modular-examples/gcp-google-workspace" - # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=rc-v0.4.44" gcp_project_id = var.gcp_project_id environment_name = var.environment_name diff --git a/infra/examples-dev/gcp/google-workspace.tf b/infra/examples-dev/gcp/google-workspace.tf index 870ad7515..7124acbb1 100644 --- a/infra/examples-dev/gcp/google-workspace.tf +++ b/infra/examples-dev/gcp/google-workspace.tf @@ -8,7 +8,7 @@ provider "google" { module "worklytics_connectors_google_workspace" { source = "../../modules/worklytics-connectors-google-workspace" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=rc-v0.4.44" providers = { google = google.google_workspace diff --git a/infra/examples-dev/gcp/main.tf b/infra/examples-dev/gcp/main.tf index 98572add5..a899009e8 100644 --- a/infra/examples-dev/gcp/main.tf +++ b/infra/examples-dev/gcp/main.tf @@ -27,7 +27,7 @@ locals { # call this 'generic_source_connectors'? module "worklytics_connectors" { source = "../../modules/worklytics-connectors" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors @@ -77,7 +77,7 @@ locals { module "psoxy" { source = "../../modules/gcp-host" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=rc-v0.4.44" gcp_project_id = var.gcp_project_id environment_name = var.environment_name @@ -116,7 +116,7 @@ module "connection_in_worklytics" { for_each = local.all_instances source = "../../modules/worklytics-psoxy-connection-generic" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key diff --git a/infra/examples-dev/gcp/msft-365.tf b/infra/examples-dev/gcp/msft-365.tf index 84b843946..77aa3c5ee 100644 --- a/infra/examples-dev/gcp/msft-365.tf +++ b/infra/examples-dev/gcp/msft-365.tf @@ -2,7 +2,7 @@ module "worklytics_connectors_msft_365" { source = "../../modules/worklytics-connectors-msft-365" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors @@ -32,7 +32,7 @@ module "msft-connection-auth-federation" { for_each = module.worklytics_connectors_msft_365.enabled_api_connectors source = "../../modules/azuread-federated-credentials" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.44" application_object_id = each.value.connector.id display_name = "GcpFederation" diff --git a/infra/examples/aws-google-workspace/main.tf b/infra/examples/aws-google-workspace/main.tf index 1597f75fc..ae972e997 100644 --- a/infra/examples/aws-google-workspace/main.tf +++ b/infra/examples/aws-google-workspace/main.tf @@ -59,7 +59,7 @@ data "google_project" "psoxy-google-connectors" { module "psoxy" { # source = "../../modular-examples/aws-google-workspace" - source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=rc-v0.4.44" aws_account_id = var.aws_account_id aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas) diff --git a/infra/examples/aws-msft-365/main.tf b/infra/examples/aws-msft-365/main.tf index feb40f40a..0d13cee39 100644 --- a/infra/examples/aws-msft-365/main.tf +++ b/infra/examples/aws-msft-365/main.tf @@ -51,7 +51,7 @@ provider "azuread" { module "psoxy" { # source = "../../modular-examples/aws-msft-365" - source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=rc-v0.4.44" aws_account_id = var.aws_account_id aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas) diff --git a/infra/examples/gcp-google-workspace/main.tf b/infra/examples/gcp-google-workspace/main.tf index 46662ca17..10771ed13 100644 --- a/infra/examples/gcp-google-workspace/main.tf +++ b/infra/examples/gcp-google-workspace/main.tf @@ -28,7 +28,7 @@ provider "google" { module "psoxy" { # source = "../../modular-examples/gcp-google-workspace" - source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=rc-v0.4.44" gcp_project_id = var.gcp_project_id environment_name = var.environment_name diff --git a/infra/examples/msft-365/main.tf b/infra/examples/msft-365/main.tf index bda7a3450..2e1c41b81 100644 --- a/infra/examples/msft-365/main.tf +++ b/infra/examples/msft-365/main.tf @@ -34,7 +34,7 @@ data "azuread_client_config" "current" {} module "worklytics_connector_specs" { # source = "../../modules/worklytics-connector-specs" - source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors @@ -52,7 +52,7 @@ module "msft-connection" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors # source = "../../modules/azuread-connection" - source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=rc-v0.4.44" display_name = "Psoxy Connector - ${each.value.display_name}${var.connector_display_name_suffix}" tenant_id = var.msft_tenant_id @@ -65,7 +65,7 @@ module "msft-connection-auth-federation" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors # source = "../../modules/azuread-federated-credentials" - source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.44" application_object_id = module.msft-connection[each.key].connector.id display_name = "AccessFromAWS" @@ -107,7 +107,7 @@ module "msft_365_grants" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors # source = "../../modules/azuread-grant-all-users" - source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=v0.4.43" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=rc-v0.4.44" psoxy_instance_id = each.key application_id = module.msft-connection[each.key].connector.application_id diff --git a/infra/modular-examples/aws-google-workspace/main.tf b/infra/modular-examples/aws-google-workspace/main.tf index 381a9cb83..515ba42cd 100644 --- a/infra/modular-examples/aws-google-workspace/main.tf +++ b/infra/modular-examples/aws-google-workspace/main.tf @@ -22,7 +22,7 @@ locals { module "worklytics_connector_specs" { source = "../../modules/worklytics-connector-specs" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.44 enabled_connectors = var.enabled_connectors google_workspace_example_user = var.google_workspace_example_user @@ -40,7 +40,7 @@ module "worklytics_connector_specs" { module "psoxy-aws" { source = "../../modules/aws" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=rc-v0.4.44 aws_account_id = var.aws_account_id region = var.aws_region @@ -54,7 +54,7 @@ module "psoxy-aws" { # secrets shared across all instances module "global_secrets" { source = "../../modules/aws-ssm-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.44 path = var.aws_ssm_param_root_path kms_key_id = var.aws_ssm_key_id @@ -82,7 +82,7 @@ module "google-workspace-connection" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/google-workspace-dwd-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=rc-v0.4.44 project_id = var.gcp_project_id connector_service_account_id = "${module.env_id_gcp_sa.id}-${each.key}" @@ -100,7 +100,7 @@ module "google-workspace-connection-auth" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/gcp-sa-auth-key" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=rc-v0.4.44" service_account_id = module.google-workspace-connection[each.key].service_account_id } @@ -109,7 +109,7 @@ module "sa-key-secrets" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/aws-ssm-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.44" # other possibly implementations: # source = "../hashicorp-vault-secrets" @@ -128,7 +128,7 @@ module "psoxy-google-workspace-connector" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -170,7 +170,7 @@ module "worklytics-psoxy-connection-google-workspace" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_instance_id = each.key psoxy_host_platform_id = local.host_platform_id @@ -216,7 +216,7 @@ module "parameter-fill-instructions" { for_each = local.long_access_parameters source = "../../modules/aws-ssm-fill-md" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=rc-v0.4.44" region = var.aws_region parameter_name = aws_ssm_parameter.long-access-secrets[each.key].name @@ -226,7 +226,7 @@ module "source_token_external_todo" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors_todos source = "../../modules/source-token-external-todo" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=rc-v0.4.44" source_id = each.key connector_specific_external_steps = each.value.external_token_todo @@ -239,7 +239,7 @@ module "aws-psoxy-long-auth-connectors" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -284,7 +284,7 @@ module "worklytics-psoxy-connection" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_instance_id = each.key connector_id = try(each.value.worklytics_connector_id, "") @@ -317,7 +317,7 @@ module "psoxy-bulk" { for_each = merge(module.worklytics_connector_specs.enabled_bulk_connectors, var.custom_bulk_connectors) source = "../../modules/aws-psoxy-bulk" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -357,7 +357,7 @@ module "psoxy-bulk-to-worklytics" { var.custom_bulk_connectors) source = "../../modules/worklytics-psoxy-connection-generic" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -377,7 +377,7 @@ module "lookup_output" { for_each = var.lookup_table_builders source = "../../modules/aws-psoxy-output-bucket" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key diff --git a/infra/modular-examples/aws-msft-365/main.tf b/infra/modular-examples/aws-msft-365/main.tf index ea8642efc..657ae4692 100644 --- a/infra/modular-examples/aws-msft-365/main.tf +++ b/infra/modular-examples/aws-msft-365/main.tf @@ -24,7 +24,7 @@ data "azuread_client_config" "current" {} module "worklytics_connector_specs" { source = "../../modules/worklytics-connector-specs" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors msft_tenant_id = var.msft_tenant_id @@ -43,7 +43,7 @@ module "worklytics_connector_specs" { module "psoxy-aws" { source = "../../modules/aws" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=rc-v0.4.44" aws_account_id = var.aws_account_id region = var.aws_region @@ -56,7 +56,7 @@ module "psoxy-aws" { module "global_secrets" { source = "../../modules/aws-ssm-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.44" path = var.aws_ssm_param_root_path kms_key_id = var.aws_ssm_key_id @@ -75,7 +75,7 @@ moved { module "cognito-identity-pool" { source = "../../modules/aws-cognito-pool" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=rc-v0.4.44" developer_provider_name = "azure-access" @@ -90,7 +90,7 @@ module "msft-connection" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=rc-v0.4.44" display_name = "Psoxy Connector - ${each.value.display_name}${var.connector_display_name_suffix}" tenant_id = var.msft_tenant_id @@ -112,7 +112,7 @@ module "msft-connection-auth-federation" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-federated-credentials" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.44" application_object_id = module.msft-connection[each.key].connector.id display_name = "AccessFromAWS" @@ -129,7 +129,7 @@ module "msft_365_grants" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-grant-all-users" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=rc-v0.4.44" psoxy_instance_id = each.key application_id = module.msft-connection[each.key].connector.application_id @@ -143,7 +143,7 @@ module "psoxy-msft-connector" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -193,7 +193,7 @@ module "worklytics-psoxy-connection-msft-365" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -238,7 +238,7 @@ module "parameter-fill-instructions" { for_each = local.long_access_parameters source = "../../modules/aws-ssm-fill-md" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=rc-v0.4.44" region = var.aws_region parameter_name = aws_ssm_parameter.long-access-secrets[each.key].name @@ -248,7 +248,7 @@ module "source_token_external_todo" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors_todos source = "../../modules/source-token-external-todo" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=rc-v0.4.44" source_id = each.key connector_specific_external_steps = each.value.external_token_todo @@ -261,7 +261,7 @@ module "aws-psoxy-long-auth-connectors" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -304,7 +304,7 @@ module "worklytics-psoxy-connection-oauth-long-access" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -363,7 +363,7 @@ module "psoxy-bulk" { var.custom_bulk_connectors) source = "../../modules/aws-psoxy-bulk" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=rc-v0.4.44" environment_name = var.environment_name aws_account_id = var.aws_account_id @@ -408,7 +408,7 @@ module "psoxy-bulk-to-worklytics" { var.custom_bulk_connectors) source = "../../modules/worklytics-psoxy-connection-generic" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -428,7 +428,7 @@ module "lookup_output" { for_each = var.lookup_table_builders source = "../../modules/aws-psoxy-output-bucket" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key diff --git a/infra/modular-examples/aws/main.tf b/infra/modular-examples/aws/main.tf index 322ffb56f..b2a987e2f 100644 --- a/infra/modular-examples/aws/main.tf +++ b/infra/modular-examples/aws/main.tf @@ -33,7 +33,7 @@ locals { module "worklytics_connector_specs" { source = "../../modules/worklytics-connector-specs" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.44 enabled_connectors = var.enabled_connectors google_workspace_example_user = var.google_workspace_example_user @@ -51,7 +51,7 @@ module "worklytics_connector_specs" { module "psoxy_aws" { source = "../../modules/aws" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=rc-v0.4.44 aws_account_id = var.aws_account_id region = data.aws_region.current.id @@ -74,7 +74,7 @@ moved { # secrets shared across all instances module "global_secrets" { source = "../../modules/aws-ssm-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.44 path = var.aws_ssm_param_root_path kms_key_id = var.aws_ssm_key_id @@ -91,7 +91,7 @@ module "google_workspace_connection" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/google-workspace-dwd-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=v0.4.43 + # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=rc-v0.4.44 project_id = var.gcp_project_id connector_service_account_id = "${local.function_name_prefix}${local.deployment_id_sa_id_part}${each.key}" @@ -116,7 +116,7 @@ module "google_workspace_connection_auth" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/gcp-sa-auth-key" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=rc-v0.4.44" service_account_id = module.google_workspace_connection[each.key].service_account_id } @@ -132,7 +132,7 @@ module "sa_key_secrets" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/aws-ssm-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.44" # other possibly implementations: # source = "../hashicorp-vault-secrets" @@ -158,7 +158,7 @@ module "psoxy_google_workspace_connector" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -202,7 +202,7 @@ module "worklytics_psoxy_connection_google_workspace" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_instance_id = each.key psoxy_host_platform_id = local.host_platform_id @@ -236,7 +236,7 @@ module "cognito_identity_pool" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled source = "../../modules/aws-cognito-pool" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=rc-v0.4.44" developer_provider_name = "azure-access" name = "azure-ad-federation" @@ -246,7 +246,7 @@ module "cognito_identity" { count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled source = "../../modules/aws-cognito-identity-cli" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=rc-v0.4.44" identity_pool_id = module.cognito_identity_pool[0].pool_id aws_region = data.aws_region.current.id @@ -268,7 +268,7 @@ module "msft_connection" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=rc-v0.4.44" display_name = "Psoxy Connector - ${each.value.display_name}${var.connector_display_name_suffix}" tenant_id = var.msft_tenant_id @@ -287,7 +287,7 @@ module "msft_connection_auth_federation" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-federated-credentials" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.44" application_object_id = module.msft_connection[each.key].connector.id display_name = "AccessFromAWS" @@ -311,7 +311,7 @@ module "msft_365_grants" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/azuread-grant-all-users" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=rc-v0.4.44" psoxy_instance_id = each.key application_id = module.msft_connection[each.key].connector.application_id @@ -325,7 +325,7 @@ module "psoxy_msft_connector" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -379,7 +379,7 @@ module "worklytics_psoxy_connection_msft_365" { for_each = module.worklytics_connector_specs.enabled_msft_365_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -432,7 +432,7 @@ module "parameter_fill_instructions" { for_each = local.long_access_parameters source = "../../modules/aws-ssm-fill-md" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=rc-v0.4.44" region = data.aws_region.current.id parameter_name = aws_ssm_parameter.long-access-secrets[each.key].name @@ -448,7 +448,7 @@ module "source_token_external_todo" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors_todos source = "../../modules/source-token-external-todo" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=rc-v0.4.44" source_id = each.key connector_specific_external_steps = each.value.external_token_todo @@ -461,7 +461,7 @@ module "aws_psoxy_long_auth_connectors" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/aws-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -509,7 +509,7 @@ module "worklytics_psoxy_connection" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_instance_id = each.key connector_id = try(each.value.worklytics_connector_id, "") @@ -548,7 +548,7 @@ module "psoxy_bulk" { for_each = merge(module.worklytics_connector_specs.enabled_bulk_connectors, var.custom_bulk_connectors) source = "../../modules/aws-psoxy-bulk" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key @@ -592,7 +592,7 @@ module "psoxy_bulk_to_worklytics" { var.custom_bulk_connectors) source = "../../modules/worklytics-psoxy-connection-generic" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -619,7 +619,7 @@ module "lookup_output" { for_each = var.lookup_table_builders source = "../../modules/aws-psoxy-output-bucket" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=rc-v0.4.44" environment_name = var.environment_name instance_id = each.key diff --git a/infra/modular-examples/gcp-google-workspace/main.tf b/infra/modular-examples/gcp-google-workspace/main.tf index b830b2b42..f566bc317 100644 --- a/infra/modular-examples/gcp-google-workspace/main.tf +++ b/infra/modular-examples/gcp-google-workspace/main.tf @@ -13,7 +13,7 @@ locals { module "worklytics_connector_specs" { source = "../../modules/worklytics-connector-specs" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.44" enabled_connectors = var.enabled_connectors @@ -32,7 +32,7 @@ module "worklytics_connector_specs" { module "psoxy-gcp" { source = "../../modules/gcp" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp?ref=rc-v0.4.44" project_id = var.gcp_project_id psoxy_base_dir = var.psoxy_base_dir @@ -46,7 +46,7 @@ module "google-workspace-connection" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/google-workspace-dwd-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=rc-v0.4.44" project_id = var.gcp_project_id connector_service_account_id = "psoxy-${substr(each.key, 0, 24)}" @@ -64,7 +64,7 @@ module "google-workspace-connection-auth" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/gcp-sa-auth-key" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=rc-v0.4.44" service_account_id = module.google-workspace-connection[each.key].service_account_id } @@ -74,7 +74,7 @@ module "google-workspace-key-secrets" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/gcp-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-secrets?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-secrets?ref=rc-v0.4.44" secret_project = var.gcp_project_id default_labels = var.default_labels @@ -115,7 +115,7 @@ module "psoxy-google-workspace-connector" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/gcp-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-rest?ref=rc-v0.4.44" project_id = var.gcp_project_id source_kind = each.value.source_kind @@ -157,7 +157,7 @@ module "worklytics-psoxy-connection" { for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -190,7 +190,7 @@ module "connector-oauth" { for_each = local.long_access_parameters source = "../../modules/gcp-oauth-secrets" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-oauth-secrets?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-oauth-secrets?ref=rc-v0.4.44" secret_name = "PSOXY_${upper(replace(each.value.connector_name, "-", "_"))}_${upper(each.value.secret_name)}" project_id = var.gcp_project_id @@ -211,7 +211,7 @@ module "long-auth-token-secret-fill-instructions" { for_each = local.long_access_parameters source = "../../modules/gcp-secret-fill-md" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-secret-fill-md?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-secret-fill-md?ref=rc-v0.4.44" project_id = var.gcp_project_id secret_id = module.connector-oauth[each.key].secret_id @@ -221,7 +221,7 @@ module "source_token_external_todo" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors_todos source = "../../modules/source-token-external-todo" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=rc-v0.4.44" source_id = each.key connector_specific_external_steps = each.value.external_token_todo @@ -234,7 +234,7 @@ module "connector-long-auth-function" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/gcp-psoxy-rest" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-rest?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-rest?ref=rc-v0.4.44" project_id = var.gcp_project_id source_kind = each.value.source_kind @@ -278,7 +278,7 @@ module "worklytics-psoxy-connection-long-auth" { for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors source = "../../modules/worklytics-psoxy-connection" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.44" psoxy_host_platform_id = "GCP" psoxy_instance_id = each.key @@ -296,7 +296,7 @@ module "psoxy-gcp-bulk" { var.custom_bulk_connectors) source = "../../modules/gcp-psoxy-bulk" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-bulk?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-psoxy-bulk?ref=rc-v0.4.44" project_id = var.gcp_project_id worklytics_sa_emails = var.worklytics_sa_emails @@ -329,7 +329,7 @@ module "psoxy-bulk-to-worklytics" { var.custom_bulk_connectors) source = "../../modules/worklytics-psoxy-connection-generic" - # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.43" + # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.44" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key diff --git a/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/HealthCheckRequestHandler.java b/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/HealthCheckRequestHandler.java index 85ce1cbab..f1389e2dd 100644 --- a/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/HealthCheckRequestHandler.java +++ b/java/core/src/main/java/co/worklytics/psoxy/gateway/impl/HealthCheckRequestHandler.java @@ -30,7 +30,7 @@ @Log public class HealthCheckRequestHandler { - static final String JAVA_SOURCE_CODE_VERSION = "v0.4.43"; + static final String JAVA_SOURCE_CODE_VERSION = "rc-v0.4.44"; @Inject EnvVarsConfigService envVarsConfigService; diff --git a/java/pom.xml b/java/pom.xml index a5ac27081..eae86012e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ pom - 0.4.43 + 0.4.44 UTF-8 1.18.30 2.40.5 diff --git a/tools/init-tfvars.sh b/tools/init-tfvars.sh index af796b596..d14c4c911 100755 --- a/tools/init-tfvars.sh +++ b/tools/init-tfvars.sh @@ -7,7 +7,7 @@ PSOXY_BASE_DIR=$2 DEPLOYMENT_ENV=${3:-"local"} HOST_PLATFORM=${4:-"aws"} -SCRIPT_VERSION="v0.4.43" +SCRIPT_VERSION="rc-v0.4.44" if [ -z "$PSOXY_BASE_DIR" ]; then printf "Usage: init-tfvars.sh [DEPLOYMENT_ENV]\n"