Skip to content

Commit

Permalink
Merge pull request #27 from Worklytics/rc-v0.4.47
Browse files Browse the repository at this point in the history
update to v0.4.47
  • Loading branch information
eschultink authored Feb 12, 2024
2 parents bc36148 + c76fe45 commit ad6acf3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 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.46"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.47"

providers = {
google = google.google_workspace
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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.46"
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
Expand Down Expand Up @@ -76,7 +76,7 @@ locals {
}

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

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

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand Down
10 changes: 5 additions & 5 deletions misc-data-source-variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ locals {
validate_salesforce_domain_check = regex(
"^${local.validate_salesforce_domain_message}$",
(!local.validate_salesforce_domain
? local.validate_salesforce_domain_message
: ""))
? local.validate_salesforce_domain_message
: ""))

validate_github_enterprise_server_host = (var.github_api_host == null && (var.github_enterprise_server_host == null || var.github_enterprise_server_host == "" || can(regex(":|\\/", try(var.github_enterprise_server_host, ""))))) && contains(var.enabled_connectors, "github-enterprise-server")
validate_github_enterprise_server_host_message = "The github_enterprise_server_host var should be populated and to be with only the domain without protocol or query paths if GitHub Enterprise Server is enabled."
validate_github_enterprise_server_host_check = regex(
validate_github_enterprise_server_host_check = regex(
"^${local.validate_github_enterprise_server_host_message}$",
(!local.validate_github_enterprise_server_host
? local.validate_github_enterprise_server_host_message
: ""))
? local.validate_github_enterprise_server_host_message
: ""))
}
4 changes: 2 additions & 2 deletions msft-365.tf
Original file line number Diff line number Diff line change
@@ -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.46"
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
Expand Down Expand Up @@ -29,7 +29,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.46"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.47"

application_object_id = each.value.connector.id
display_name = "GcpFederation"
Expand Down

0 comments on commit ad6acf3

Please sign in to comment.