diff --git a/google-workspace.tf b/google-workspace.tf index 159b8e2..9231b9a 100644 --- a/google-workspace.tf +++ b/google-workspace.tf @@ -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.44" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.45" providers = { google = google.google_workspace diff --git a/main.tf b/main.tf index da2d1b3..8d7d91b 100644 --- a/main.tf +++ b/main.tf @@ -26,20 +26,20 @@ 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.44" - - - enabled_connectors = var.enabled_connectors - jira_cloud_id = var.jira_cloud_id - jira_server_url = var.jira_server_url - jira_example_issue_id = var.jira_example_issue_id - salesforce_domain = var.salesforce_domain - github_api_host = var.github_api_host - github_enterprise_server_host = var.github_enterprise_server_host - github_installation_id = var.github_installation_id - github_organization = var.github_organization - github_example_repository = var.github_example_repository - salesforce_example_account_id = var.salesforce_example_account_id + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.45" + + enabled_connectors = var.enabled_connectors + jira_cloud_id = var.jira_cloud_id + jira_server_url = var.jira_server_url + jira_example_issue_id = var.jira_example_issue_id + salesforce_domain = var.salesforce_domain + github_api_host = var.github_api_host + github_enterprise_server_host = var.github_enterprise_server_host + github_enterprise_server_version = var.github_enterprise_server_version + github_installation_id = var.github_installation_id + github_organization = var.github_organization + github_example_repository = var.github_example_repository + salesforce_example_account_id = var.salesforce_example_account_id } # sources which require additional dependencies are split into distinct Terraform files, following @@ -76,7 +76,7 @@ locals { } module "psoxy" { - source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.44" + source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.45" gcp_project_id = var.gcp_project_id environment_name = var.environment_name @@ -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.44" + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.45" psoxy_host_platform_id = local.host_platform_id psoxy_instance_id = each.key @@ -166,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 -#} \ No newline at end of file +#} diff --git a/misc-data-source-variables.tf b/misc-data-source-variables.tf index 6644a01..072878e 100644 --- a/misc-data-source-variables.tf +++ b/misc-data-source-variables.tf @@ -39,6 +39,12 @@ variable "github_enterprise_server_host" { description = "(Only required if using Github Enterprise Server connector) Host of the Github instance (ex: github.mycompany.com)." } +variable "github_enterprise_server_version" { + type = string + default = "v3" + description = "(Only required if using Github Enterprise Server connector) Version of the server to use (ex: v3). By default, v3" +} + variable "github_installation_id" { type = string default = null @@ -48,7 +54,7 @@ variable "github_installation_id" { variable "github_organization" { type = string default = null - description = "(Only required if using Github connector) Name of the organization to be used as part of example calls for Github (ex: Worklytics)" + description = "(Only required if using Github connector) Name of the organization to be used as part of example calls for Github (ex: Worklytics). NOTE: If using Enterprise Server, this can be a list of organizations split by commas (ex: Worklytics,Worklytics2)" } variable "github_example_repository" { @@ -80,4 +86,4 @@ locals { (!local.validate_github_enterprise_server_host ? local.validate_github_enterprise_server_host_message : "")) -} \ No newline at end of file +} diff --git a/msft-365.tf b/msft-365.tf index 13f00f1..35de556 100644 --- a/msft-365.tf +++ b/msft-365.tf @@ -1,8 +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.44" - + source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.45" enabled_connectors = var.enabled_connectors environment_id = var.environment_name @@ -30,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.44" + source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.45" application_object_id = each.value.connector.id display_name = "GcpFederation" @@ -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 -} \ No newline at end of file +}