Skip to content

Commit

Permalink
Update example to v0.4.48
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink committed Feb 16, 2024
1 parent ad6acf3 commit 1e1a8dd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion google-workspace.tf
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.4.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.48"

providers = {
google = google.google_workspace
Expand Down
9 changes: 5 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ 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.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.48"


enabled_connectors = var.enabled_connectors
jira_cloud_id = var.jira_cloud_id
Expand Down Expand Up @@ -76,7 +77,7 @@ locals {
}

module "psoxy" {
source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.48"

gcp_project_id = var.gcp_project_id
environment_name = var.environment_name
Expand Down Expand Up @@ -114,7 +115,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.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.48"

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand Down Expand Up @@ -166,4 +167,4 @@ output "todos_3" {
# description = "Value used to salt pseudonyms (SHA-256) hashes. If migrate to new deployment, you should copy this value."
# value = module.psoxy.pseudonym_salt
# sensitive = true
#}
#}
4 changes: 2 additions & 2 deletions misc-data-source-variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ locals {
# tflint-ignore: terraform_unused_declarations
validate_salesforce_domain = (var.salesforce_domain == null || var.salesforce_domain == "" || can(regex(":|\\/", try(var.salesforce_domain, "")))) && contains(var.enabled_connectors, "salesforce")
validate_salesforce_domain_message = "The salesforce_domain var should be populated and to be with only the domain without protocol or query paths if enabled."
validate_salesforce_domain_check = regex(
validate_salesforce_domain_check = regex(
"^${local.validate_salesforce_domain_message}$",
(!local.validate_salesforce_domain
? local.validate_salesforce_domain_message
Expand All @@ -86,4 +86,4 @@ locals {
(!local.validate_github_enterprise_server_host
? local.validate_github_enterprise_server_host_message
: ""))
}
}
7 changes: 4 additions & 3 deletions msft-365.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# BEGIN MSFT

module "worklytics_connectors_msft_365" {
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.48"


enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
Expand Down Expand Up @@ -29,7 +30,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.47"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.48"

application_object_id = each.value.connector.id
display_name = "GcpFederation"
Expand Down Expand Up @@ -58,4 +59,4 @@ locals {
output "msft_365_api_clients" {
description = "Map of API client identifiers. Useful for configuration of clients, terraform migration."
value = module.worklytics_connectors_msft_365.api_clients
}
}

0 comments on commit 1e1a8dd

Please sign in to comment.