Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink committed Feb 12, 2024
2 parents 042f016 + bc36148 commit c76fe45
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ locals {
module "worklytics_connectors" {
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.47"


enabled_connectors = var.enabled_connectors
jira_cloud_id = var.jira_cloud_id
jira_server_url = var.jira_server_url
Expand Down Expand Up @@ -167,4 +166,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
: ""))
}
}
3 changes: 1 addition & 2 deletions msft-365.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module "worklytics_connectors_msft_365" {
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.47"


enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
msft_tenant_id = var.msft_tenant_id
Expand Down Expand Up @@ -59,4 +58,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 c76fe45

Please sign in to comment.