Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.5.0 logistics #842

Merged
merged 1 commit into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/examples-dev/aws/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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.5.0"

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

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

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

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

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

proxy_instance_id = each.key
worklytics_host = var.worklytics_host
Expand Down
8 changes: 4 additions & 4 deletions infra/examples-dev/aws/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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.5.0"

enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
Expand Down Expand Up @@ -48,7 +48,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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.5.0"

developer_provider_name = local.developer_provider_name
name = "${local.env_qualifier}-azure-ad-federation"
Expand All @@ -71,7 +71,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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.5.0"

aws_region = data.aws_region.current.id
aws_role = var.aws_assume_role_arn
Expand Down Expand Up @@ -108,7 +108,7 @@ module "msft_connection_auth_federation" {
for_each = local.provision_entraid_apps ? local.enabled_to_entraid_object : local.shared_to_entraid_object

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

application_id = each.value.connector_id
display_name = "${local.env_qualifier}AccessFromAWS"
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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.5.0"

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

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

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

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

host_platform_id = local.host_platform_id
proxy_instance_id = each.key
Expand Down
4 changes: 2 additions & 2 deletions infra/examples-dev/gcp/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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.5.0"

enabled_connectors = var.enabled_connectors
environment_id = var.environment_name
Expand Down Expand Up @@ -34,7 +34,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=rc-v0.5.0"
# source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.5.0"

application_id = each.value.connector.id
display_name = "GcpFederation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@Log
public class HealthCheckRequestHandler {

static final String JAVA_SOURCE_CODE_VERSION = "rc-v0.5.0";
static final String JAVA_SOURCE_CODE_VERSION = "v0.5.0";

@Inject
EnvVarsConfigService envVarsConfigService;
Expand Down
2 changes: 1 addition & 1 deletion tools/init-tfvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PSOXY_BASE_DIR=$2
DEPLOYMENT_ENV=${3:-"local"}
HOST_PLATFORM=${4:-"aws"}

SCRIPT_VERSION="rc-v0.5.0"
SCRIPT_VERSION="v0.5.0"

if [ -z "$PSOXY_BASE_DIR" ]; then
printf "Usage: init-tfvars.sh <path-to-terraform.tfvars> <path-to-psoxy-base-directory> [DEPLOYMENT_ENV]\n"
Expand Down
Loading