Skip to content

Commit

Permalink
Update example to v0.4.60 (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink authored Sep 19, 2024
1 parent 244e6fa commit fb1a51a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 21 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.59"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.60"

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 @@ -28,7 +28,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.59"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.60"


enabled_connectors = var.enabled_connectors
Expand Down Expand Up @@ -79,7 +79,7 @@ locals {
}

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

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

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand Down
6 changes: 6 additions & 0 deletions msft-365-variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ variable "msft_teams_example_call_record_guid" {
description = "example of MSFT Id (GUID) of a Teams Call Record for test API calls (OPTIONAL)"
default = "{EXAMPLE_MSFT_TEAMS_CALL_RECORD_GUID}"
}

variable "msft_teams_example_online_meeting_join_url" {
type = string
description = "example of an URL to join into an OnlineMeeting for test API calls (OPTIONAL)"
default = "{EXAMPLE_MSFT_TEAMS_ONLINE_MEETING_URL}"
}
35 changes: 18 additions & 17 deletions msft-365.tf
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
# BEGIN MSFT

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

enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
msft_tenant_id = var.msft_tenant_id
example_msft_user_guid = var.example_msft_user_guid
msft_owners_email = var.msft_owners_email
msft_teams_example_team_guid = var.msft_teams_example_team_guid
msft_teams_example_channel_guid = var.msft_teams_example_channel_guid
msft_teams_example_chat_guid = var.msft_teams_example_chat_guid
msft_teams_example_call_guid = var.msft_teams_example_call_guid
msft_teams_example_call_record_guid = var.msft_teams_example_call_record_guid
msft_connector_app_object_id = var.msft_connector_app_object_id
todos_as_local_files = var.todos_as_local_files
todo_step = 1
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.60"

enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
msft_tenant_id = var.msft_tenant_id
example_msft_user_guid = var.example_msft_user_guid
msft_owners_email = var.msft_owners_email
msft_teams_example_team_guid = var.msft_teams_example_team_guid
msft_teams_example_channel_guid = var.msft_teams_example_channel_guid
msft_teams_example_chat_guid = var.msft_teams_example_chat_guid
msft_teams_example_call_guid = var.msft_teams_example_call_guid
msft_teams_example_call_record_guid = var.msft_teams_example_call_record_guid
msft_teams_example_online_meeting_join_url = var.msft_teams_example_online_meeting_join_url
msft_connector_app_object_id = var.msft_connector_app_object_id
todos_as_local_files = var.todos_as_local_files
todo_step = 1
}

provider "azuread" {
Expand All @@ -31,7 +32,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.59"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.60"

application_object_id = each.value.connector.id
display_name = "GcpFederation"
Expand Down Expand Up @@ -60,4 +61,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 fb1a51a

Please sign in to comment.