Skip to content

Commit

Permalink
Merge branch 'main' into rc-v0.4.31
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink authored Jul 27, 2023
2 parents 0ac305c + 14890f5 commit 5b487bf
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Psoxy Deployment Example - GCP

** alpha **

[![Latest Release](https://img.shields.io/github/v/release/Worklytics/psoxy-example-gcp)](https://github.com/Worklytics/psoxy-example-gcp/releases/latest)
![build passing](https://img.shields.io/github/actions/workflow/status/Worklytics/psoxy-example-gcp/terraform_validate.yaml?label=build%20passing)

Expand Down
1 change: 1 addition & 0 deletions google-workspace-variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ locals {
(!local.validate_google_workspace_gcp_project_id
? local.validate_google_workspace_gcp_project_id_message
: ""))

}
1 change: 0 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ locals {
module "worklytics_connectors" {
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.31"


enabled_connectors = var.enabled_connectors
jira_cloud_id = var.jira_cloud_id
jira_server_url = var.jira_server_url
Expand Down
1 change: 1 addition & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ variable "custom_bulk_connector_rules" {
}
}


# build lookup tables to JOIN data you receive back from Worklytics with your original data.
# - `join_key_column` should be the column you expect to JOIN on, usually 'employee_id'
# - `columns_to_include` is an optional a list of columns to include in the lookup table,
Expand Down

0 comments on commit 5b487bf

Please sign in to comment.