From 2e12b2d2fe2ef071c5690c076be34c73984f7643 Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Tue, 4 Oct 2022 10:59:35 -0700 Subject: [PATCH 1/3] fix bad output var ref --- infra/examples/aws-msft-365/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/examples/aws-msft-365/main.tf b/infra/examples/aws-msft-365/main.tf index 3db635ac8..2619ac9da 100644 --- a/infra/examples/aws-msft-365/main.tf +++ b/infra/examples/aws-msft-365/main.tf @@ -159,7 +159,7 @@ module "psoxy-msft-connector" { api_caller_role_arn = module.psoxy-aws.api_caller_role_arn environment_variables = { CLIENT_ID = module.msft-connection[each.key].connector.application_id - REFRESH_ENDPOINT = module.worklytics_connector_specs.msft_365_refresh_endpoint + REFRESH_ENDPOINT = module.worklytics_connector_specs.msft_token_refresh_endpoint PSEUDONYMIZE_APP_IDS = tostring(var.pseudonymize_app_ids) } global_parameter_arns = module.psoxy-aws.global_parameters_arns From ce2a89dd70ef048bb1e5d93110745f6502c23ae3 Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Tue, 4 Oct 2022 11:14:41 -0700 Subject: [PATCH 2/3] doc terraform dep --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d82b3f25..b2b9e732c 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ versions of all of the following: - git - Java 11+ JDK variant - [Maven 3.6+](https://maven.apache.org/docs/history.html) - - [terraform](https://www.terraform.io/) optional; if you don't use this, you'll need to configure + - [terraform 1.3.x+](https://www.terraform.io/) optional; if you don't use this, you'll need to configure your GCP/AWS project via the web console/CLI tools. Writing your own terraform config that re-uses our modules will simplify things greatly. From e0c3223771f84db3399727d3e4a4e6db06de580c Mon Sep 17 00:00:00 2001 From: Erik Schultink Date: Tue, 4 Oct 2022 12:18:57 -0700 Subject: [PATCH 3/3] remove -jrc refs --- infra/examples-dev/gcp-google-workspace/main.tf | 1 - infra/examples/aws-msft-365/main.tf | 1 - infra/examples/gcp-google-workspace/main.tf | 3 --- infra/modules/aws/variables.tf | 2 +- infra/modules/gcp/variables.tf | 2 +- infra/modules/psoxy-package/variable.tf | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/infra/examples-dev/gcp-google-workspace/main.tf b/infra/examples-dev/gcp-google-workspace/main.tf index d1bb728e0..58a1adb74 100644 --- a/infra/examples-dev/gcp-google-workspace/main.tf +++ b/infra/examples-dev/gcp-google-workspace/main.tf @@ -72,7 +72,6 @@ module "psoxy-gcp" { project_id = google_project.psoxy-project.project_id invoker_sa_emails = var.worklytics_sa_emails psoxy_base_dir = var.psoxy_base_dir - psoxy_version = "0.4.5-jrc" bucket_location = var.gcp_region depends_on = [ diff --git a/infra/examples/aws-msft-365/main.tf b/infra/examples/aws-msft-365/main.tf index 2619ac9da..b4e304f6c 100644 --- a/infra/examples/aws-msft-365/main.tf +++ b/infra/examples/aws-msft-365/main.tf @@ -90,7 +90,6 @@ module "psoxy-aws" { aws_account_id = var.aws_account_id psoxy_base_dir = var.psoxy_base_dir - psoxy_version = "0.4.5-jrc" caller_aws_arns = var.caller_aws_arns caller_gcp_service_account_ids = var.caller_gcp_service_account_ids diff --git a/infra/examples/gcp-google-workspace/main.tf b/infra/examples/gcp-google-workspace/main.tf index 5b4fa41b5..73dc04afa 100644 --- a/infra/examples/gcp-google-workspace/main.tf +++ b/infra/examples/gcp-google-workspace/main.tf @@ -75,10 +75,8 @@ module "psoxy-gcp" { project_id = google_project.psoxy-project.project_id invoker_sa_emails = var.worklytics_sa_emails psoxy_base_dir = var.psoxy_base_dir - psoxy_version = "0.4.5-jrc" bucket_location = var.gcp_region - depends_on = [ google_project.psoxy-project ] @@ -91,7 +89,6 @@ module "google-workspace-connection" { # source = "../../modules/google-workspace-dwd-connection" source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=v0.4.5" - project_id = google_project.psoxy-project.project_id connector_service_account_id = "psoxy-${each.key}-dwd" display_name = "Psoxy Connector - ${each.value.display_name}${var.connector_display_name_suffix}" diff --git a/infra/modules/aws/variables.tf b/infra/modules/aws/variables.tf index 315d125dc..bce7ea0a4 100644 --- a/infra/modules/aws/variables.tf +++ b/infra/modules/aws/variables.tf @@ -48,7 +48,7 @@ variable "caller_aws_arns" { variable "psoxy_version" { type = string description = "version of psoxy to deploy" - default = "0.4.5-jrc" + default = "0.4.5" } diff --git a/infra/modules/gcp/variables.tf b/infra/modules/gcp/variables.tf index 3f818760b..d90dc47a1 100644 --- a/infra/modules/gcp/variables.tf +++ b/infra/modules/gcp/variables.tf @@ -23,5 +23,5 @@ variable "psoxy_base_dir" { variable "psoxy_version" { type = string description = "version of psoxy to deploy" - default = "0.4.5-jrc" + default = "0.4.5" } diff --git a/infra/modules/psoxy-package/variable.tf b/infra/modules/psoxy-package/variable.tf index f6563eb77..d5f85a7e6 100644 --- a/infra/modules/psoxy-package/variable.tf +++ b/infra/modules/psoxy-package/variable.tf @@ -13,6 +13,6 @@ variable "implementation" { variable "psoxy_version" { type = string description = "version of psoxy to deploy" - default = "0.4.5-jrc" + default = "0.4.5" }