Skip to content

Commit

Permalink
update release refs to rc-v0.4.32
Browse files Browse the repository at this point in the history
  • Loading branch information
eschultink committed Jul 27, 2023
1 parent 60cfcd0 commit 6265f33
Show file tree
Hide file tree
Showing 20 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion infra/examples-dev/aws-all/google-workspace.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ provider "google" {

module "worklytics_connectors_google_workspace" {
source = "../../modules/worklytics-connectors-google-workspace"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=rc-v0.4.32"

providers = {
google = google.google_workspace
Expand Down
6 changes: 3 additions & 3 deletions infra/examples-dev/aws-all/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ terraform {
# general cases
module "worklytics_connectors" {
source = "../../modules/worklytics-connectors"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=rc-v0.4.32"

enabled_connectors = var.enabled_connectors
jira_cloud_id = var.jira_cloud_id
Expand Down Expand Up @@ -103,7 +103,7 @@ locals {

module "psoxy" {
source = "../../modules/aws-host"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=rc-v0.4.32"

environment_name = var.environment_name
aws_account_id = var.aws_account_id
Expand Down Expand Up @@ -143,7 +143,7 @@ module "connection_in_worklytics" {
for_each = local.all_instances

source = "../../modules/worklytics-psoxy-connection-generic"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.32"

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand Down
8 changes: 4 additions & 4 deletions infra/examples-dev/aws-all/msft-365.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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


enabled_connectors = var.enabled_connectors
Expand Down Expand Up @@ -41,7 +41,7 @@ module "cognito_identity_pool" {
count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled

source = "../../modules/aws-cognito-pool"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=rc-v0.4.32"

developer_provider_name = local.developer_provider_name
name = "${local.env_qualifier}-azure-ad-federation"
Expand All @@ -51,7 +51,7 @@ module "cognito_identity" {
count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled

source = "../../modules/aws-cognito-identity-cli"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=rc-v0.4.32"

aws_region = data.aws_region.current.id
aws_role = var.aws_assume_role_arn
Expand All @@ -73,7 +73,7 @@ module "msft_connection_auth_federation" {
for_each = module.worklytics_connectors_msft_365.enabled_api_connectors

source = "../../modules/azuread-federated-credentials"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.32"

application_object_id = each.value.connector.id
display_name = "${local.env_qualifier}AccessFromAWS"
Expand Down
2 changes: 1 addition & 1 deletion infra/examples-dev/aws-google-workspace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ data "google_project" "psoxy-google-connectors" {

module "psoxy" {
source = "../../modular-examples/aws-google-workspace"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=rc-v0.4.32"

aws_account_id = var.aws_account_id
aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas)
Expand Down
2 changes: 1 addition & 1 deletion infra/examples-dev/aws-msft-365/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ provider "azuread" {

module "psoxy" {
source = "../../modular-examples/aws-msft-365"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=rc-v0.4.32"

aws_account_id = var.aws_account_id
aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas)
Expand Down
2 changes: 1 addition & 1 deletion infra/examples-dev/aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ provider "azuread" {

module "psoxy" {
source = "../../modular-examples/aws"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws?ref=rc-v0.4.32"

aws_account_id = var.aws_account_id
aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas)
Expand Down
2 changes: 1 addition & 1 deletion infra/examples-dev/gcp-google-workspace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ provider "google" {

module "psoxy" {
source = "../../modular-examples/gcp-google-workspace"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=rc-v0.4.32"

gcp_project_id = var.gcp_project_id
environment_name = var.environment_name
Expand Down
2 changes: 1 addition & 1 deletion infra/examples-dev/gcp/google-workspace.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ provider "google" {

module "worklytics_connectors_google_workspace" {
source = "../../modules/worklytics-connectors-google-workspace"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=rc-v0.4.32"

providers = {
google = google.google_workspace
Expand Down
6 changes: 3 additions & 3 deletions infra/examples-dev/gcp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ locals {
# call this 'generic_source_connectors'?
module "worklytics_connectors" {
source = "../../modules/worklytics-connectors"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=rc-v0.4.32"


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

module "psoxy" {
source = "../../modules/gcp-host"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-host?ref=rc-v0.4.32"

gcp_project_id = var.gcp_project_id
environment_name = var.environment_name
Expand Down Expand Up @@ -125,7 +125,7 @@ module "connection_in_worklytics" {
for_each = local.all_instances

source = "../../modules/worklytics-psoxy-connection-generic"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.32"

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand Down
2 changes: 1 addition & 1 deletion infra/examples/aws-google-workspace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ data "google_project" "psoxy-google-connectors" {

module "psoxy" {
# source = "../../modular-examples/aws-google-workspace"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=rc-v0.4.32"

aws_account_id = var.aws_account_id
aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas)
Expand Down
2 changes: 1 addition & 1 deletion infra/examples/aws-msft-365/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ provider "azuread" {

module "psoxy" {
# source = "../../modular-examples/aws-msft-365"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=rc-v0.4.32"

aws_account_id = var.aws_account_id
aws_assume_role_arn = var.aws_assume_role_arn # role that can test the instances (lambdas)
Expand Down
2 changes: 1 addition & 1 deletion infra/examples/gcp-google-workspace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ provider "google" {

module "psoxy" {
# source = "../../modular-examples/gcp-google-workspace"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/gcp-google-workspace?ref=rc-v0.4.32"

gcp_project_id = var.gcp_project_id
environment_name = var.environment_name
Expand Down
8 changes: 4 additions & 4 deletions infra/examples/msft-365/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ data "azuread_client_config" "current" {}

module "worklytics_connector_specs" {
# source = "../../modules/worklytics-connector-specs"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.32"

enabled_connectors = var.enabled_connectors

Expand All @@ -52,7 +52,7 @@ module "msft-connection" {
for_each = module.worklytics_connector_specs.enabled_msft_365_connectors

# source = "../../modules/azuread-connection"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-connection?ref=rc-v0.4.32"

display_name = "Psoxy Connector - ${each.value.display_name}${var.connector_display_name_suffix}"
tenant_id = var.msft_tenant_id
Expand All @@ -65,7 +65,7 @@ module "msft-connection-auth-federation" {
for_each = module.worklytics_connector_specs.enabled_msft_365_connectors

# source = "../../modules/azuread-federated-credentials"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=rc-v0.4.32"

application_object_id = module.msft-connection[each.key].connector.id
display_name = "AccessFromAWS"
Expand Down Expand Up @@ -107,7 +107,7 @@ module "msft_365_grants" {
for_each = module.worklytics_connector_specs.enabled_msft_365_connectors

# source = "../../modules/azuread-grant-all-users"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=v0.4.31"
source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-grant-all-users?ref=rc-v0.4.32"

psoxy_instance_id = each.key
application_id = module.msft-connection[each.key].connector.application_id
Expand Down
30 changes: 15 additions & 15 deletions infra/modular-examples/aws-google-workspace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ locals {

module "worklytics_connector_specs" {
source = "../../modules/worklytics-connector-specs"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=v0.4.31
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connector-specs?ref=rc-v0.4.32

enabled_connectors = var.enabled_connectors
google_workspace_example_user = var.google_workspace_example_user
Expand All @@ -39,7 +39,7 @@ module "worklytics_connector_specs" {

module "psoxy-aws" {
source = "../../modules/aws"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=v0.4.31
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws?ref=rc-v0.4.32

aws_account_id = var.aws_account_id
region = var.aws_region
Expand All @@ -53,7 +53,7 @@ module "psoxy-aws" {
# secrets shared across all instances
module "global_secrets" {
source = "../../modules/aws-ssm-secrets"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.31
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.32

path = var.aws_ssm_param_root_path
kms_key_id = var.aws_ssm_key_id
Expand Down Expand Up @@ -81,7 +81,7 @@ module "google-workspace-connection" {
for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors

source = "../../modules/google-workspace-dwd-connection"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=v0.4.31
# source = "git::https://github.com/worklytics/psoxy//infra/modules/google-workspace-dwd-connection?ref=rc-v0.4.32

project_id = var.gcp_project_id
connector_service_account_id = "${module.env_id_gcp_sa.id}-${each.key}"
Expand All @@ -99,7 +99,7 @@ module "google-workspace-connection-auth" {
for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors

source = "../../modules/gcp-sa-auth-key"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/gcp-sa-auth-key?ref=rc-v0.4.32"

service_account_id = module.google-workspace-connection[each.key].service_account_id
}
Expand All @@ -108,7 +108,7 @@ module "sa-key-secrets" {
for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors

source = "../../modules/aws-ssm-secrets"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-secrets?ref=rc-v0.4.32"
# other possibly implementations:
# source = "../hashicorp-vault-secrets"

Expand All @@ -127,7 +127,7 @@ module "psoxy-google-workspace-connector" {
for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors

source = "../../modules/aws-psoxy-rest"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.32"

environment_name = var.environment_name
instance_id = each.key
Expand Down Expand Up @@ -169,7 +169,7 @@ module "worklytics-psoxy-connection-google-workspace" {
for_each = module.worklytics_connector_specs.enabled_google_workspace_connectors

source = "../../modules/worklytics-psoxy-connection"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.32"

psoxy_instance_id = each.key
psoxy_host_platform_id = local.host_platform_id
Expand Down Expand Up @@ -215,7 +215,7 @@ module "parameter-fill-instructions" {
for_each = local.long_access_parameters

source = "../../modules/aws-ssm-fill-md"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-ssm-fill-md?ref=rc-v0.4.32"

region = var.aws_region
parameter_name = aws_ssm_parameter.long-access-secrets[each.key].name
Expand All @@ -225,7 +225,7 @@ module "source_token_external_todo" {
for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors_todos

source = "../../modules/source-token-external-todo"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/source-token-external-todo?ref=rc-v0.4.32"

source_id = each.key
connector_specific_external_steps = each.value.external_token_todo
Expand All @@ -238,7 +238,7 @@ module "aws-psoxy-long-auth-connectors" {
for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors

source = "../../modules/aws-psoxy-rest"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-rest?ref=rc-v0.4.32"

environment_name = var.environment_name
instance_id = each.key
Expand Down Expand Up @@ -283,7 +283,7 @@ module "worklytics-psoxy-connection" {
for_each = module.worklytics_connector_specs.enabled_oauth_long_access_connectors

source = "../../modules/worklytics-psoxy-connection"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection?ref=rc-v0.4.32"

psoxy_instance_id = each.key
connector_id = try(each.value.worklytics_connector_id, "")
Expand Down Expand Up @@ -316,7 +316,7 @@ module "psoxy-bulk" {
for_each = merge(module.worklytics_connector_specs.enabled_bulk_connectors, var.custom_bulk_connectors)

source = "../../modules/aws-psoxy-bulk"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-bulk?ref=rc-v0.4.32"

environment_name = var.environment_name
instance_id = each.key
Expand Down Expand Up @@ -356,7 +356,7 @@ module "psoxy-bulk-to-worklytics" {
var.custom_bulk_connectors)

source = "../../modules/worklytics-psoxy-connection-generic"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-generic?ref=rc-v0.4.32"

psoxy_host_platform_id = local.host_platform_id
psoxy_instance_id = each.key
Expand All @@ -376,7 +376,7 @@ module "lookup_output" {
for_each = var.lookup_table_builders

source = "../../modules/aws-psoxy-output-bucket"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=v0.4.31"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-psoxy-output-bucket?ref=rc-v0.4.32"

environment_name = var.environment_name
instance_id = each.key
Expand Down
Loading

0 comments on commit 6265f33

Please sign in to comment.