From cf7ff17e1affd17449bb340812c91ac210a5fd7a Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Thu, 12 Oct 2023 17:26:18 +0300 Subject: [PATCH 1/7] EDSF-427 Add S3 bucket location variable --- examples/sonar_upgrade/main.tf | 13 +++- modules/aws/sonar-upgrader/main.tf | 1 + modules/aws/sonar-upgrader/outputs.tf | 3 + .../aws/sonar-upgrader/provision_script.tpl | 3 +- .../sonar-upgrader/python_upgrader/main.py | 62 ++++++++++++------- .../python_upgrader/upgrade_v4_10.sh | 23 +++---- modules/aws/sonar-upgrader/variables.tf | 16 ++++- 7 files changed, 84 insertions(+), 37 deletions(-) diff --git a/examples/sonar_upgrade/main.tf b/examples/sonar_upgrade/main.tf index 8cd4f7c16..9ddebdbc4 100644 --- a/examples/sonar_upgrade/main.tf +++ b/examples/sonar_upgrade/main.tf @@ -1,5 +1,7 @@ module "sonar_upgrader" { source = "../../modules/aws/sonar-upgrader" + + # Fill the details of the Agentless Gateways and DSF Hubs that you want to upgrade agentless_gws = [ { "main" = { @@ -70,11 +72,20 @@ module "sonar_upgrader" { } ] + # Fill full Sonar version (short format, e.g., 4.12, is not supported) target_version = "4.12.0.10.0" - # options + + # Configuration options for controlling the upgrade flow test_connection = true run_preflight_validations = true run_upgrade = true run_postflight_validations = true stop_on_failure = true + + # Fill if using your S3 bucket, remove if using Imperva's S3 bucket + tarball_location = { + "s3_bucket" = "myBucket" + "s3_region" = "us-east-1" + "s3_key" = "prefix/jsonar-x.y.z.w.u.tar.gz" + } } diff --git a/modules/aws/sonar-upgrader/main.tf b/modules/aws/sonar-upgrader/main.tf index 41c1c101d..2e89a78a5 100644 --- a/modules/aws/sonar-upgrader/main.tf +++ b/modules/aws/sonar-upgrader/main.tf @@ -11,6 +11,7 @@ locals { run_postflight_validations = var.run_postflight_validations clean_old_deployments = var.clean_old_deployments stop_on_failure = var.stop_on_failure + tarball_location = jsonencode(var.tarball_location) }) } diff --git a/modules/aws/sonar-upgrader/outputs.tf b/modules/aws/sonar-upgrader/outputs.tf index ca8697cda..097c5fc15 100644 --- a/modules/aws/sonar-upgrader/outputs.tf +++ b/modules/aws/sonar-upgrader/outputs.tf @@ -34,3 +34,6 @@ output "stop_on_failure" { value = var.stop_on_failure } +output "tarball_location" { + value = var.tarball_location +} diff --git a/modules/aws/sonar-upgrader/provision_script.tpl b/modules/aws/sonar-upgrader/provision_script.tpl index 1babbd075..96586e945 100755 --- a/modules/aws/sonar-upgrader/provision_script.tpl +++ b/modules/aws/sonar-upgrader/provision_script.tpl @@ -18,4 +18,5 @@ python3 -u ${path}/python_upgrader/main.py \ --run_upgrade "${run_upgrade}" \ --run_postflight_validations "${run_postflight_validations}" \ --clean_old_deployments "${clean_old_deployments}" \ - --stop_on_failure "${stop_on_failure}" + --stop_on_failure "${stop_on_failure}" \ + --tarball_location '${tarball_location}' diff --git a/modules/aws/sonar-upgrader/python_upgrader/main.py b/modules/aws/sonar-upgrader/python_upgrader/main.py index 5ebd25567..f007d6864 100644 --- a/modules/aws/sonar-upgrader/python_upgrader/main.py +++ b/modules/aws/sonar-upgrader/python_upgrader/main.py @@ -162,10 +162,11 @@ def main(args): agentless_gws = json.loads(args.agentless_gws) hubs = json.loads(args.dsf_hubs) + tarball_location = json.loads(args.tarball_location) print("********** Inputs ************") - print_inputs(agentless_gws, hubs, args) + print_inputs(agentless_gws, hubs, tarball_location, args) print("********** Start ************") @@ -204,7 +205,8 @@ def main(args): if args.run_upgrade or args.run_postflight_validations or args.clean_old_deployments: success = maybe_upgrade_and_postflight(agentless_gws, hubs, args.target_version, args.run_upgrade, args.run_postflight_validations, args.clean_old_deployments, - python_location_dict, args.stop_on_failure, upgrade_state_service) + python_location_dict, args.stop_on_failure, tarball_location, + upgrade_state_service) print_upgrade_result = args.run_upgrade print_postflight_result = not args.run_upgrade and args.run_postflight_validations if print_upgrade_result: @@ -222,7 +224,9 @@ def main(args): print(f"### An error occurred, aborting upgrade...") print("********** Summary ************") - print(upgrade_state_service.get_summary()) + # TODO uncomment when upgrade status API will be implemented + # print(upgrade_state_service.get_summary()) + print("Coming soon") print("********** End ************") @@ -256,11 +260,13 @@ def parse_args(): parser.add_argument("--stop_on_failure", type=str_to_bool, help="Whether to stop or continue to upgrade the next DSF nodes in case of failure " "on a DSF node") + parser.add_argument("--tarball_location", + help="JSON-encoded S3 bucket location of the DSF installation software") args = parser.parse_args() return args -def print_inputs(agentless_gws, hubs, args): +def print_inputs(agentless_gws, hubs, tarball_location, args): print("List of Agentless Gateways:") print_hadr_sets(agentless_gws) print("List of DSF Hubs:") @@ -273,6 +279,7 @@ def print_inputs(agentless_gws, hubs, args): print(f"run_postflight_validations: {args.run_postflight_validations}") print(f"clean_old_deployments: {args.clean_old_deployments}") print(f"stop_on_failure: {args.stop_on_failure}") + print(f"tarball_location: {tarball_location}") def test_connection_to_extended_nodes(extended_nodes, stop_on_failure, upgrade_state_service): @@ -492,7 +499,8 @@ def are_preflight_validations_passed(preflight_validations_result): def maybe_upgrade_and_postflight(agentless_gws, hubs, target_version, run_upgrade, run_postflight_validations, - clean_old_deployments, python_location_dict, stop_on_failure, upgrade_state_service): + clean_old_deployments, python_location_dict, stop_on_failure, tarball_location, + upgrade_state_service): if run_upgrade: print("----- Upgrade") @@ -505,6 +513,7 @@ def maybe_upgrade_and_postflight(agentless_gws, hubs, target_version, run_upgrad "clean_old_deployments.sh", python_location_dict, stop_on_failure, + tarball_location, upgrade_state_service) hub_upgrade_and_postflight_succeeded = maybe_upgrade_and_postflight_hadr_sets(hubs, "DSF Hub", target_version, @@ -516,6 +525,7 @@ def maybe_upgrade_and_postflight(agentless_gws, hubs, target_version, run_upgrad "clean_old_deployments.sh", python_location_dict, stop_on_failure, + tarball_location, upgrade_state_service) return gws_upgrade_and_postflight_succeeded and hub_upgrade_and_postflight_succeeded @@ -525,7 +535,7 @@ def maybe_upgrade_and_postflight_hadr_sets(hadr_sets, dsf_node_type, target_vers run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): all_success_or_skip = True for hadr_set in hadr_sets: succeed_or_skipped = maybe_upgrade_and_postflight_hadr_set(hadr_set, dsf_node_type, target_version, @@ -536,6 +546,7 @@ def maybe_upgrade_and_postflight_hadr_sets(hadr_sets, dsf_node_type, target_vers clean_old_deployments_script_file_name, python_location_dict, stop_on_failure, + tarball_location, upgrade_state_service) all_success_or_skip = all_success_or_skip and succeed_or_skipped return all_success_or_skip @@ -545,24 +556,24 @@ def maybe_upgrade_and_postflight_hadr_set(hadr_set, dsf_node_type, target_versio run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): print(f"Running upgrade and/or postflight validations for an {dsf_node_type} HADR replica set") if maybe_upgrade_and_postflight_dsf_node(hadr_set.get('minor'), dsf_node_type, 'Minor', target_version, upgrade_script_file_name, run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): if maybe_upgrade_and_postflight_dsf_node(hadr_set.get('dr'), dsf_node_type, 'DR', target_version, upgrade_script_file_name, run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): if maybe_upgrade_and_postflight_dsf_node(hadr_set.get('main'), dsf_node_type, 'Main', target_version, upgrade_script_file_name, run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): return True else: print(f"Upgrade of HADR DR node failed, will not continue to Main if exists.") @@ -575,7 +586,7 @@ def maybe_upgrade_and_postflight_dsf_node(dsf_node, dsf_node_type, hadr_node_typ upgrade_script_file_name, run_upgrade, do_run_postflight_validations, postflight_validations_script_file_name, clean_old_deployments, clean_old_deployments_script_file_name, python_location_dict, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): if dsf_node is None: return True # TODO refactor to use the extended node already created in previous steps @@ -584,7 +595,7 @@ def maybe_upgrade_and_postflight_dsf_node(dsf_node, dsf_node_type, hadr_node_typ extended_node = create_extended_node(dsf_node, dsf_node_id, dsf_node_name) if run_upgrade: upgrade_success_or_skip = maybe_upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, - stop_on_failure, upgrade_state_service) + stop_on_failure, tarball_location, upgrade_state_service) if not upgrade_success_or_skip: return False @@ -608,20 +619,22 @@ def maybe_upgrade_and_postflight_dsf_node(dsf_node, dsf_node_type, hadr_node_typ def maybe_upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, - stop_on_failure, upgrade_state_service): + stop_on_failure, tarball_location, upgrade_state_service): if upgrade_state_service.should_run_upgrade(extended_node.get('dsf_node_id')): return upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, stop_on_failure, - upgrade_state_service) + tarball_location, upgrade_state_service) return True -def upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, stop_on_failure, upgrade_state_service): +def upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, stop_on_failure, tarball_location, + upgrade_state_service): print(f"Running upgrade for {extended_node.get('dsf_node_name')}") print(f"You may follow the upgrade process in the DSF node by running SSH to it and looking at " f"/var/log/upgrade.log. When the DSF node's upgrade will complete, this log will also appear here.") upgrade_state_service.update_upgrade_status(extended_node.get('dsf_node_id'), UpgradeState.RUNNING_UPGRADE) - success, script_output = run_upgrade_script(extended_node.get('dsf_node'), target_version, upgrade_script_file_name) + success, script_output = run_upgrade_script(extended_node.get('dsf_node'), target_version, tarball_location, + upgrade_script_file_name) if success: print(f"Upgrading {extended_node.get('dsf_node_name')} was ### successful ###") upgrade_state_service.update_upgrade_status(extended_node.get('dsf_node_id'), @@ -635,7 +648,7 @@ def upgrade_dsf_node(extended_node, target_version, upgrade_script_file_name, st return success -def run_upgrade_script(dsf_node, target_version, upgrade_script_file_name): +def run_upgrade_script(dsf_node, target_version, tarball_location, upgrade_script_file_name): if run_dummy_upgrade: print(f"Running dummy upgrade script") script_file_name = 'dummy_upgrade_script.sh' @@ -644,8 +657,7 @@ def run_upgrade_script(dsf_node, target_version, upgrade_script_file_name): script_file_path = get_file_path(script_file_name) script_contents = read_file_contents(script_file_path) - tarball = get_tarball_name(target_version) - args = f"1ef8de27-ed95-40ff-8c08-7969fc1b7901 {tarball} us-east-1" + args = get_upgrade_script_args(target_version, tarball_location) script_run_command = build_bash_script_run_command(script_contents, args) # print(f"script_run_command: {script_run_command}") @@ -656,8 +668,16 @@ def run_upgrade_script(dsf_node, target_version, upgrade_script_file_name): return "Upgrade completed" in script_output, script_output -# TODO move up to the Helper functions -def get_tarball_name(target_version): +def get_upgrade_script_args(target_version, tarball_location): + if tarball_location.get('s3_key') is None: + s3_key = get_tarball_s3_key(target_version) + else: + s3_key = tarball_location.get('s3_key') + args = f"{tarball_location.get('s3_bucket')} {tarball_location.get('s3_region')} {s3_key}" + return args + + +def get_tarball_s3_key(target_version): return f"jsonar-{target_version}.tar.gz" diff --git a/modules/aws/sonar-upgrader/python_upgrader/upgrade_v4_10.sh b/modules/aws/sonar-upgrader/python_upgrader/upgrade_v4_10.sh index cdb424ec6..fd86d756f 100644 --- a/modules/aws/sonar-upgrader/python_upgrader/upgrade_v4_10.sh +++ b/modules/aws/sonar-upgrader/python_upgrader/upgrade_v4_10.sh @@ -26,22 +26,19 @@ echo "Running in directory: $(pwd)" # starting the argument count from 0 since this script is run by "bash -c" installation_s3_bucket="$0" -installation_s3_key="$1" -installation_s3_region="$2" +installation_s3_region="$1" +installation_s3_key="$2" echo "Tarball file name: ${installation_s3_key}, in bucket: ${installation_s3_bucket}, in region: ${installation_s3_region}" -#installation_s3_bucket="1ef8de27-ed95-40ff-8c08-7969fc1b7901" -#installation_s3_key="jsonar-4.12.0.10.0.tar.gz" -#installation_s3_region="us-east-1" - -TARBALL_FILE=$(basename ${installation_s3_key}) - JSONAR_BASEDIR=$(grep "^JSONAR_BASEDIR=" /etc/sysconfig/jsonar | cut -d"=" -f2) # In deployments by eDSF Kit, the value is /imperva STATE_DIR=$(echo "$JSONAR_BASEDIR" | sed "s|/apps/jsonar/apps.*||") echo "State directory: ${STATE_DIR}" APPS_DIR=$STATE_DIR/apps +TARBALL_FILE_NAME=$(basename ${installation_s3_key}) +TARBALL_FILE=$APPS_DIR/$TARBALL_FILE_NAME + VERSION="${TARBALL_FILE#*-}" VERSION="${VERSION%.tar.gz}" echo "Version: $VERSION" @@ -51,7 +48,7 @@ echo "Tarball extraction directory: $EXTRACTION_DIR" function extract_tarball() { echo "Extracting tarball..." - sudo tar -xf ./$TARBALL_FILE -gz -C $APPS_DIR + sudo tar -xf $TARBALL_FILE_NAME -gz -C $APPS_DIR sudo chown -R sonarw:sonar $APPS_DIR echo "Extracting tarball completed" } @@ -59,16 +56,16 @@ function extract_tarball() { function download_and_extract_tarball() { if [ -e $EXTRACTION_DIR ]; then echo "Tarball file is already extracted" - elif [ -e ./$TARBALL_FILE ]; then + elif [ -e $TARBALL_FILE_NAME ]; then echo "Tarball file already exists on disk" extract_tarball - rm ./$TARBALL_FILE + rm $TARBALL_FILE_NAME else echo "Downloading tarball..." - /usr/local/bin/aws s3 cp s3://${installation_s3_bucket}/${installation_s3_key} ./$TARBALL_FILE --region ${installation_s3_region} >/dev/null + /usr/local/bin/aws s3 cp s3://${installation_s3_bucket}/${installation_s3_key} $TARBALL_FILE_NAME --region ${installation_s3_region} >/dev/null echo "Downloading tarball completed" extract_tarball - rm ./$TARBALL_FILE + rm $TARBALL_FILE_NAME fi } diff --git a/modules/aws/sonar-upgrader/variables.tf b/modules/aws/sonar-upgrader/variables.tf index 698c0d6ff..8f28ef7d4 100644 --- a/modules/aws/sonar-upgrader/variables.tf +++ b/modules/aws/sonar-upgrader/variables.tf @@ -121,4 +121,18 @@ variable "stop_on_failure" { type = bool default = true description = "Whether to stop or continue to upgrade the next DSF nodes in case of failure on a DSF node" -} \ No newline at end of file +} + +variable "tarball_location" { + type = object({ + s3_bucket = string + s3_region = string + s3_key = string + }) + description = "S3 bucket location of the DSF installation software. s3_key is the full path to the tarball file within the bucket, for example, 'prefix/jsonar-x.y.z.w.u.tar.gz'" + default = { + s3_bucket = "1ef8de27-ed95-40ff-8c08-7969fc1b7901" + s3_region = "us-east-1" + s3_key = null + } +} From 96c9dd3c1059e1d6e8339f15866af89338630f2b Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Thu, 12 Oct 2023 17:34:29 +0300 Subject: [PATCH 2/7] Sonar upgrade - updated upgrade status with SUCCEEDED status --- modules/aws/sonar-upgrader/python_upgrader/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/aws/sonar-upgrader/python_upgrader/main.py b/modules/aws/sonar-upgrader/python_upgrader/main.py index f007d6864..0a25127d5 100644 --- a/modules/aws/sonar-upgrader/python_upgrader/main.py +++ b/modules/aws/sonar-upgrader/python_upgrader/main.py @@ -719,6 +719,8 @@ def run_postflight_validations(extended_node, target_version, script_file_name, print(f"### Postflight validations passed for {extended_node.get('dsf_node_name')}") upgrade_state_service.update_upgrade_status(extended_node.get('dsf_node_id'), UpgradeState.POSTFLIGHT_VALIDATIONS_SUCCEEDED) + upgrade_state_service.update_upgrade_status(extended_node.get('dsf_node_id'), + UpgradeState.SUCCEEDED) else: print(f"### Postflight validations didn't pass for {extended_node.get('dsf_node_name')}") upgrade_state_service.update_upgrade_status(extended_node.get('dsf_node_id'), From 67453809d70b35e26a5ce21a42229a44b1f5fcb8 Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Sun, 15 Oct 2023 15:01:12 +0300 Subject: [PATCH 3/7] Updated release date in version history [skip actions] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c439bc050..44c27a579 100644 --- a/README.md +++ b/README.md @@ -395,7 +395,7 @@ The following table lists the released eDSF Kit versions, their release date and - Coming soon + 15 Oct 2023 1.5.6 From aa7817a9f29a62ffb5de2f5a7fa8fa7a79a18d0f Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Sun, 15 Oct 2023 15:06:55 +0300 Subject: [PATCH 4/7] Upgrade Alpha release: used PUSH_TO_OTHER_REPOS_TOKEN_ADMIN instead of PUSH_TO_OTHER_REPOS_TOKEN in release.yml as well [skip actions] --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93ca8e566..82c0e2d46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,7 +130,7 @@ jobs: with: fetch-depth: 0 ref: ${{ env.dst_branch }} - token: ${{ secrets.PUSH_TO_OTHER_REPOS_TOKEN }} + token: ${{ secrets.PUSH_TO_OTHER_REPOS_TOKEN_ADMIN }} - name: Merge run: | @@ -162,7 +162,7 @@ jobs: needs: tag_branch uses: ./.github/workflows/deploy_module.yml secrets: - PUSH_TO_OTHER_REPOS_TOKEN: ${{ secrets.PUSH_TO_OTHER_REPOS_TOKEN }} + PUSH_TO_OTHER_REPOS_TOKEN_ADMIN: ${{ secrets.PUSH_TO_OTHER_REPOS_TOKEN_ADMIN }} test_plan: needs: deploy_modules From d6494e3eedddf21c7585f83b9b4061a2de326527 Mon Sep 17 00:00:00 2001 From: lindanasredin Date: Sun, 15 Oct 2023 12:08:07 +0000 Subject: [PATCH 5/7] Automatic commit before release [release=1.5.6] | [skip actions] --- README.md | 48 +++++++++--------- .../dsf_deployment/dsf_deployment_1_5_6.zip | Bin 0 -> 6725 bytes examples/azure/dsf_deployment/main.tf | 2 +- examples/azure/dsf_deployment/sonar.tf | 14 ++--- .../dsf_single_account_deployment/dam.tf | 6 +-- .../dsf_single_account_deployment/dra.tf | 4 +- .../dsf_single_account_deployment_1_5_6.zip | Bin 0 -> 15357 bytes .../dsf_single_account_deployment/main.tf | 18 +++---- .../dsf_single_account_deployment/sonar.tf | 14 ++--- .../sonar_multi_account_deployment/main.tf | 24 ++++----- .../sonar_multi_account_deployment_1_5_6.zip | Bin 0 -> 9378 bytes .../sonar_single_account_deployment/main.tf | 16 +++--- .../sonar_single_account_deployment_1_5_6.zip | Bin 0 -> 8193 bytes examples/poc/dsf_deployment/agent_sources.tf | 2 +- .../poc/dsf_deployment/agentless_sources.tf | 6 +-- examples/poc/dsf_deployment/dam.tf | 6 +-- examples/poc/dsf_deployment/dra.tf | 4 +- .../dsf_deployment/dsf_deployment_1_5_6.zip | Bin 0 -> 12631 bytes examples/poc/dsf_deployment/main.tf | 4 +- examples/poc/dsf_deployment/sonar.tf | 14 ++--- examples/poc/sonar_basic_deployment/main.tf | 16 +++--- .../sonar_basic_deployment_1_5_6.zip | Bin 0 -> 5963 bytes examples/poc/sonar_hadr_deployment/main.tf | 24 ++++----- .../sonar_hadr_deployment_1_5_6.zip | Bin 0 -> 6700 bytes examples/sonar_upgrade/main.tf | 14 ++--- .../sonar_upgrade/sonar_upgrade_1_5_6.zip | Bin 0 -> 2511 bytes modules/aws/agent-gw/README.md | 2 +- modules/aws/agentless-gw/README.md | 2 +- modules/aws/db-with-agent/README.md | 2 +- modules/aws/dra-admin/README.md | 2 +- modules/aws/dra-analytics/README.md | 2 +- modules/aws/hub/README.md | 2 +- modules/aws/mx/README.md | 2 +- modules/aws/rds-mssql-db/README.md | 2 +- modules/aws/sonar-upgrader/main.tf | 2 +- modules/aws/sonar-upgrader/variables.tf | 44 ++++++++-------- modules/azurerm/agentless-gw/README.md | 2 +- modules/azurerm/hub/README.md | 2 +- modules/sonar_python_upgrader_1_5_6.zip | Bin 0 -> 16281 bytes 39 files changed, 151 insertions(+), 151 deletions(-) create mode 100644 examples/azure/dsf_deployment/dsf_deployment_1_5_6.zip create mode 100644 examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_6.zip create mode 100644 examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip create mode 100644 examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_6.zip create mode 100644 examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip create mode 100644 examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_6.zip create mode 100644 examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip create mode 100644 examples/sonar_upgrade/sonar_upgrade_1_5_6.zip create mode 100644 modules/sonar_python_upgrader_1_5_6.zip diff --git a/README.md b/README.md index 44c27a579..d19d8cdb2 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ This guide references the following information and links, some of which are ava - eDSF Kit GitHub Repository + eDSF Kit GitHub Repository @@ -447,7 +447,7 @@ e.g., with or without DRA, the number of Agentless Gateways, with or without HAD We provide several of out-of-the-box Terraform recipes we call "examples" which are already configured to deploy common DSF environments. You can use the example as is, or customize it to accommodate your deployment requirements. -These examples can be found in the eDSF Kit GitHub Repository under the examples directory. +These examples can be found in the eDSF Kit GitHub Repository under the examples directory. Some examples are intended for Lab or POC and others for actual DSF deployments by Professional Services and customers. For more details about each example, click on the example name. @@ -464,63 +464,63 @@ For more details about each example, click on the example name. - Sonar Basic Deployment + Sonar Basic Deployment Lab/POC A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment.zip + sonar_basic_deployment.zip - Sonar HADR Deployment + Sonar HADR Deployment Lab/POC A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment.zip + sonar_hadr_deployment.zip - Sonar Single Account Deployment + Sonar Single Account Deployment PS/Customer A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment.zip + sonar_single_account_deployment.zip - Sonar Multi Account Deployment + Sonar Multi Account Deployment PS/Customer A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment.zip + sonar_multi_account_deployment.zip - DSF Deployment + DSF Deployment Lab/POC A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment.zip + dsf_deployment.zip - DSF Single Account Deployment + DSF Single Account Deployment PS/Customer A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment.zip + dsf_single_account_deployment.zip @@ -598,7 +598,7 @@ The first thing to do in this deployment mode is to [download Terraform ](https: **NOTE:** Update the values for the required parameters to complete the installation: example_name, aws_access_key_id, aws_secret_access_key and region -1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -686,7 +686,7 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2 7. Expand the “Advanced details” panel:
![Advanced details](https://user-images.githubusercontent.com/87799317/203825918-31879c4b-ca61-48e3-a522-c325335c4419.png) -8. Copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.5.5/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox.
![User data](https://user-images.githubusercontent.com/87799317/203826003-661c829f-d704-43c4-adb7-854b8008577c.png) +8. Copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.5.6/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox.
![User data](https://user-images.githubusercontent.com/87799317/203826003-661c829f-d704-43c4-adb7-854b8008577c.png) 9. Click on **Launch Instance**. At this stage, the installer machine is initializing and downloading the necessary dependencies. @@ -705,30 +705,30 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2 For example: `chmode 400 a_key_pair.pem` -11. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +11. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. Run: ```bash - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/poc/dsf_deployment/dsf_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.5/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip ``` 12. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. @@ -951,7 +951,7 @@ In case of failure, the Terraform may have deployed some resources before failin Information about additional topics can be found in specific examples' READMEs, when relevant. -For example: Sonar Single Account Deployment +For example: Sonar Single Account Deployment These topics include: - Storing Terraform state in S3 bucket diff --git a/examples/azure/dsf_deployment/dsf_deployment_1_5_6.zip b/examples/azure/dsf_deployment/dsf_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..93de1430f8e8c2d9a82c2e6c43a20373c29dbe7d GIT binary patch literal 6725 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 literal 0 HcmV?d00001 diff --git a/examples/azure/dsf_deployment/main.tf b/examples/azure/dsf_deployment/main.tf index 8e48d96e9..b6281badb 100644 --- a/examples/azure/dsf_deployment/main.tf +++ b/examples/azure/dsf_deployment/main.tf @@ -8,7 +8,7 @@ provider "azurerm" { module "globals" { source = "imperva/dsf-globals/azurerm" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag } diff --git a/examples/azure/dsf_deployment/sonar.tf b/examples/azure/dsf_deployment/sonar.tf index 43d583864..227316af4 100644 --- a/examples/azure/dsf_deployment/sonar.tf +++ b/examples/azure/dsf_deployment/sonar.tf @@ -4,7 +4,7 @@ locals { module "hub_main" { source = "imperva/dsf-hub/azurerm" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub"]) @@ -34,7 +34,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/azurerm" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar && var.hub_hadr ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) @@ -66,7 +66,7 @@ module "hub_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.hub_dr) > 0 ? 1 : 0 sonar_version = var.sonar_version @@ -84,7 +84,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/azurerm" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.agentless_gw_count friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index]) @@ -115,7 +115,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/azurerm" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.agentless_gw_hadr ? local.agentless_gw_count : 0 friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "DR"]) @@ -149,7 +149,7 @@ module "agentless_gw_dr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.agentless_gw_dr) sonar_version = var.sonar_version @@ -193,7 +193,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = local.hub_gw_combinations hub_info = { diff --git a/examples/installation/dsf_single_account_deployment/dam.tf b/examples/installation/dsf_single_account_deployment/dam.tf index 7cb11c0d3..58d5efbb7 100644 --- a/examples/installation/dsf_single_account_deployment/dam.tf +++ b/examples/installation/dsf_single_account_deployment/dam.tf @@ -8,7 +8,7 @@ locals { module "mx" { source = "imperva/dsf-mx/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_dam ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "mx"]) @@ -37,7 +37,7 @@ module "mx" { module "agent_gw" { source = "imperva/dsf-agent-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.agent_gw_count friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index]) @@ -66,7 +66,7 @@ module "agent_gw" { module "agent_gw_cluster_setup" { source = "imperva/dsf-agent-gw-cluster-setup/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.create_agent_gw_cluster cluster_name = var.cluster_name != null ? var.cluster_name : join("-", [local.deployment_name_salted, "agent", "gw", "cluster"]) diff --git a/examples/installation/dsf_single_account_deployment/dra.tf b/examples/installation/dsf_single_account_deployment/dra.tf index b3e9682fe..04c03ee9e 100644 --- a/examples/installation/dsf_single_account_deployment/dra.tf +++ b/examples/installation/dsf_single_account_deployment/dra.tf @@ -6,7 +6,7 @@ locals { module "dra_admin" { source = "imperva/dsf-dra-admin/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_dra ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "dra", "admin"]) @@ -27,7 +27,7 @@ module "dra_admin" { module "dra_analytics" { source = "imperva/dsf-dra-analytics/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.dra_analytics_count friendly_name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) diff --git a/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_6.zip b/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..e7e28bc9b77b01d6deaa3edfaaf7b539a66bb452 GIT binary patch literal 15357 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 T@!)^|upt0|>EF|N0N{TC!IWi= literal 0 HcmV?d00001 diff --git a/examples/installation/dsf_single_account_deployment/main.tf b/examples/installation/dsf_single_account_deployment/main.tf index 66dbdbe75..db4c34d7b 100644 --- a/examples/installation/dsf_single_account_deployment/main.tf +++ b/examples/installation/dsf_single_account_deployment/main.tf @@ -1,6 +1,6 @@ module "globals" { source = "imperva/dsf-globals/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = var.sonar_version dra_version = var.dra_version @@ -39,7 +39,7 @@ locals { module "key_pair_hub_main" { count = var.hub_main_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-hub-main" private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}" tags = local.tags @@ -51,7 +51,7 @@ module "key_pair_hub_main" { module "key_pair_hub_dr" { count = var.hub_dr_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-hub-dr" private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}" tags = local.tags @@ -63,7 +63,7 @@ module "key_pair_hub_dr" { module "key_pair_agentless_gw_main" { count = var.agentless_gw_main_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-gw-main" private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-main-${terraform.workspace}" tags = local.tags @@ -75,7 +75,7 @@ module "key_pair_agentless_gw_main" { module "key_pair_agentless_gw_dr" { count = var.agentless_gw_dr_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-gw-dr" private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-dr-${terraform.workspace}" tags = local.tags @@ -87,7 +87,7 @@ module "key_pair_agentless_gw_dr" { module "key_pair_mx" { count = var.mx_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-mx" private_key_filename = "ssh_keys/dsf_ssh_key-mx-${terraform.workspace}" tags = local.tags @@ -99,7 +99,7 @@ module "key_pair_mx" { module "key_pair_agent_gw" { count = var.agent_gw_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-agent-gw" private_key_filename = "ssh_keys/dsf_ssh_key-agent-gw-${terraform.workspace}" tags = local.tags @@ -111,7 +111,7 @@ module "key_pair_agent_gw" { module "key_pair_dra_admin" { count = var.dra_admin_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-dra-admin" private_key_filename = "ssh_keys/dsf_ssh_key-dra-admin-${terraform.workspace}" tags = local.tags @@ -123,7 +123,7 @@ module "key_pair_dra_admin" { module "key_pair_dra_analytics" { count = var.dra_analytics_key_pair == null ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-dra-analytics" private_key_filename = "ssh_keys/dsf_ssh_key-dra-analytics-${terraform.workspace}" tags = local.tags diff --git a/examples/installation/dsf_single_account_deployment/sonar.tf b/examples/installation/dsf_single_account_deployment/sonar.tf index ce58e72f7..c5dbabcfc 100644 --- a/examples/installation/dsf_single_account_deployment/sonar.tf +++ b/examples/installation/dsf_single_account_deployment/sonar.tf @@ -12,7 +12,7 @@ locals { module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) @@ -58,7 +58,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar && var.hub_hadr ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) @@ -101,7 +101,7 @@ module "hub_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.hub_dr) > 0 ? 1 : 0 sonar_version = module.globals.tarball_location.version @@ -126,7 +126,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.agentless_gw_count friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "main"]) @@ -164,7 +164,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.agentless_gw_hadr ? local.agentless_gw_count : 0 friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "DR"]) @@ -205,7 +205,7 @@ module "agentless_gw_dr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.agentless_gw_dr) sonar_version = module.globals.tarball_location.version @@ -251,7 +251,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = local.hub_gw_combinations hub_info = { diff --git a/examples/installation/sonar_multi_account_deployment/main.tf b/examples/installation/sonar_multi_account_deployment/main.tf index b41cb4123..861c13a07 100644 --- a/examples/installation/sonar_multi_account_deployment/main.tf +++ b/examples/installation/sonar_multi_account_deployment/main.tf @@ -1,6 +1,6 @@ module "globals" { source = "imperva/dsf-globals/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = var.sonar_version } @@ -25,7 +25,7 @@ locals { module "key_pair_hub_main" { count = local.should_create_hub_main_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-hub-main" private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}" tags = local.tags @@ -37,7 +37,7 @@ module "key_pair_hub_main" { module "key_pair_hub_dr" { count = local.should_create_hub_dr_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-hub-dr" private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}" tags = local.tags @@ -49,7 +49,7 @@ module "key_pair_hub_dr" { module "key_pair_gw_main" { count = local.should_create_gw_main_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-gw" private_key_filename = "ssh_keys/dsf_ssh_key-gw-main-${terraform.workspace}" tags = local.tags @@ -61,7 +61,7 @@ module "key_pair_gw_main" { module "key_pair_gw_dr" { count = local.should_create_gw_dr_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-gw-dr" private_key_filename = "ssh_keys/dsf_ssh_key-gw-dr-${terraform.workspace}" tags = local.tags @@ -106,7 +106,7 @@ locals { ############################## module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) subnet_id = var.subnet_hub_main security_group_ids = var.security_group_ids_hub_main @@ -142,7 +142,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) subnet_id = var.subnet_hub_dr security_group_ids = var.security_group_ids_hub_dr @@ -182,7 +182,7 @@ module "hub_dr" { module "agentless_gw_main" { count = var.gw_count source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "main"]) subnet_id = var.subnet_gw_main security_group_ids = var.security_group_ids_gw_main @@ -219,7 +219,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { count = var.gw_count source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "DR"]) subnet_id = var.subnet_gw_dr security_group_ids = var.security_group_ids_gw_dr @@ -258,7 +258,7 @@ module "agentless_gw_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = module.globals.tarball_location.version dsf_main_ip = module.hub_main.private_ip dsf_main_private_ip = module.hub_main.private_ip @@ -282,7 +282,7 @@ module "hub_hadr" { module "agentless_gw_hadr" { count = var.gw_count source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = module.globals.tarball_location.version dsf_main_ip = module.agentless_gw_main[count.index].private_ip dsf_main_private_ip = module.agentless_gw_main[count.index].private_ip @@ -316,7 +316,7 @@ locals { module "federation" { count = length(local.hub_gws_combinations) source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag gw_info = { gw_ip_address = local.hub_gws_combinations[count.index][1].instance.private_ip gw_private_ssh_key_path = local.hub_gws_combinations[count.index][1].private_key_file_path diff --git a/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip b/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..ed985e50896e4c03ad4b840a08b73c212b061279 GIT binary patch literal 9378 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 literal 0 HcmV?d00001 diff --git a/examples/poc/dsf_deployment/agent_sources.tf b/examples/poc/dsf_deployment/agent_sources.tf index 54e043d2e..0e39643b1 100644 --- a/examples/poc/dsf_deployment/agent_sources.tf +++ b/examples/poc/dsf_deployment/agent_sources.tf @@ -4,7 +4,7 @@ locals { module "db_with_agent" { source = "imperva/dsf-db-with-agent/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(local.db_types_for_agent) friendly_name = join("-", [local.deployment_name_salted, "db", "with", "agent", count.index]) diff --git a/examples/poc/dsf_deployment/agentless_sources.tf b/examples/poc/dsf_deployment/agentless_sources.tf index e3bef6dd8..f5530523f 100644 --- a/examples/poc/dsf_deployment/agentless_sources.tf +++ b/examples/poc/dsf_deployment/agentless_sources.tf @@ -4,7 +4,7 @@ locals { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(local.db_types_for_agentless, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -14,7 +14,7 @@ module "rds_mysql" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(local.db_types_for_agentless, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -29,7 +29,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/poc/dsf_deployment/dam.tf b/examples/poc/dsf_deployment/dam.tf index 5735608c9..4536e4947 100644 --- a/examples/poc/dsf_deployment/dam.tf +++ b/examples/poc/dsf_deployment/dam.tf @@ -8,7 +8,7 @@ locals { module "mx" { source = "imperva/dsf-mx/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_dam ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "mx"]) @@ -41,7 +41,7 @@ module "mx" { module "agent_gw" { source = "imperva/dsf-agent-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.agent_gw_count friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index]) @@ -67,7 +67,7 @@ module "agent_gw" { module "agent_gw_cluster_setup" { source = "imperva/dsf-agent-gw-cluster-setup/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.create_agent_gw_cluster cluster_name = join("-", [local.deployment_name_salted, "agent", "gw", "cluster"]) diff --git a/examples/poc/dsf_deployment/dra.tf b/examples/poc/dsf_deployment/dra.tf index 930f54d7f..97d8398c6 100644 --- a/examples/poc/dsf_deployment/dra.tf +++ b/examples/poc/dsf_deployment/dra.tf @@ -6,7 +6,7 @@ locals { module "dra_admin" { source = "imperva/dsf-dra-admin/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_dra ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "dra", "admin"]) @@ -28,7 +28,7 @@ module "dra_admin" { module "dra_analytics" { source = "imperva/dsf-dra-analytics/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.dra_analytics_count friendly_name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) diff --git a/examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip b/examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..f676d2bfeb6b6bc0930c54053d554a774d165f75 GIT binary patch literal 12631 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 KojKZn{QEz`)mA$I literal 0 HcmV?d00001 diff --git a/examples/poc/dsf_deployment/main.tf b/examples/poc/dsf_deployment/main.tf index be771b370..298ba07c7 100644 --- a/examples/poc/dsf_deployment/main.tf +++ b/examples/poc/dsf_deployment/main.tf @@ -8,7 +8,7 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = var.sonar_version dra_version = var.dra_version @@ -16,7 +16,7 @@ module "globals" { module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" diff --git a/examples/poc/dsf_deployment/sonar.tf b/examples/poc/dsf_deployment/sonar.tf index 5f64fcd95..957133305 100644 --- a/examples/poc/dsf_deployment/sonar.tf +++ b/examples/poc/dsf_deployment/sonar.tf @@ -11,7 +11,7 @@ locals { module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) @@ -46,7 +46,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.enable_sonar && var.hub_hadr ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) @@ -78,7 +78,7 @@ module "hub_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.hub_dr) > 0 ? 1 : 0 sonar_version = module.globals.tarball_location.version @@ -96,7 +96,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = local.agentless_gw_count friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "main"]) @@ -126,7 +126,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.agentless_gw_hadr ? local.agentless_gw_count : 0 friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "DR"]) @@ -159,7 +159,7 @@ module "agentless_gw_dr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(module.agentless_gw_dr) sonar_version = module.globals.tarball_location.version @@ -203,7 +203,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = local.hub_gw_combinations hub_info = { diff --git a/examples/poc/sonar_basic_deployment/main.tf b/examples/poc/sonar_basic_deployment/main.tf index 22446e172..3985c24b7 100644 --- a/examples/poc/sonar_basic_deployment/main.tf +++ b/examples/poc/sonar_basic_deployment/main.tf @@ -8,14 +8,14 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = var.sonar_version } module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" @@ -80,7 +80,7 @@ data "aws_subnet" "gw" { module "hub" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub"]) instance_type = var.hub_instance_type @@ -106,7 +106,7 @@ module "hub" { module "agentless_gw" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) @@ -135,7 +135,7 @@ module "agentless_gw" { module "federation" { source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = { for idx, val in module.agentless_gw : idx => val } hub_info = { @@ -161,7 +161,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -171,7 +171,7 @@ module "rds_mysql" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -186,7 +186,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_6.zip b/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..8a5267a0a65dba8c22067dd4ab315e197a4b9621 GIT binary patch literal 5963 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 literal 0 HcmV?d00001 diff --git a/examples/poc/sonar_hadr_deployment/main.tf b/examples/poc/sonar_hadr_deployment/main.tf index 8337afe0c..f1d4bb4ed 100644 --- a/examples/poc/sonar_hadr_deployment/main.tf +++ b/examples/poc/sonar_hadr_deployment/main.tf @@ -8,13 +8,13 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = var.sonar_version } module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" tags = local.tags @@ -87,7 +87,7 @@ module "vpc" { ############################## module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) instance_type = var.hub_instance_type @@ -114,7 +114,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) instance_type = var.hub_instance_type @@ -143,7 +143,7 @@ module "hub_dr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "main"]) @@ -173,7 +173,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "DR"]) @@ -206,7 +206,7 @@ module "agentless_gw_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag sonar_version = module.globals.tarball_location.version dsf_main_ip = module.hub_main.public_ip @@ -223,7 +223,7 @@ module "hub_hadr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = var.gw_count sonar_version = module.globals.tarball_location.version @@ -256,7 +256,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = length(local.hub_gw_combinations) hub_info = { @@ -282,7 +282,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -293,7 +293,7 @@ module "rds_mysql" { # create a RDS SQL Server DB module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -308,7 +308,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.5.5" # latest release tag + version = "1.5.6" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip b/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..d4377971a8d5455e67c7058fff96549658253158 GIT binary patch literal 6700 zcma)AbySq?z8$(jknVDbVd$3bp`}G>hGytgKx&ZgkZx3(0YthR=~lW^LIfl(-#K^P z`+4v6p7XrxiGSX`pLea_yMB9bO%)VWY`|Xw)l5VGABX>3NCDIUHz$~xtBH-7rK^c0 z)Y-ww#}Nv1=hD@|0-&(WfS|yK>EVq7KtkO`c>oA_cvJHMkN9E71fV?NIe2iNxMKnU zaBcvA=8t%eX0|X+cdLKE{ssAez#bZYb6OO96fkPi@qy|QLH&gLH(G2<6gcv$dD2&rgfS8)07L*8;KhRdM>3w;#6$X)XoIqXATAO z)~aLhUHCy7W_0ykzQlJFumR)iQqjhS(o*H9X1gBYA#smsRtAd~>Np*<1Bx$xAnO*K z%P>D(DN$-u*NPESV%ZdrfxKiYrz16yWaUJCv29Lupk8}1vpow zaSQ$yxysEt)Y*$H;FTBIg?~q;#)3mVvr}#J=eq!_a`2XXI$gb(b~45j6_QvppMVXB zCk2Pp0T?|{ew$UcwFum7sugrny$Vd4QFpJW>~eBA34*$`7U2cQD}^ z!{jg9zmC@-XmORsP~~*3Yg0=fxidkfWa?V*+gkQ5u7zH;`F7=W?TH^;Ska$Fj^{*@ zZIETVAnj&4VmdPvQm@+%2{e2yo6@{mAo}zMjVnC@H_7uJP`ey9%fQdcO}+^&{z~3p zYq3Hpc>P36kmO=NjAzU{#N2*WLkBxhr)Wbaac{8nq;>+wKIBv(kJ~}mF37x9StO3V zF%WYJ5sa_>L^%c++y%F`UlL9{mq^8)9J#vMhW7P7ZOmqvbwpQWr?4X%~6;xJMHV|T`m2Y6Nz9a9|<}NWoN`p28T|hKaSU0Sb zB&sP;fkMZ|kRT@P<&iWyhR0l1P}2$ zEsn+#G+4OK&S$}uM(*JA1H8o``+PMLnamp2H7%{=fR%T(Z};k7Zi$hi6vS{| z%(gt}uck#pT-SF3l)GJ+%yos7NU$GE9*4+coWDvm&Mi44xN0&{z)s6F7%6=5(1v&l zj1;$cD0^*YD7Yk0MbTrl-S;wevwD3dMwtbWpm{55v5XQzi_8Cm-TiGdqi8n;;W!~p zU}pdesV~40GXQ8dzl~IVHnz`J1x@p<6|(z4mT@b`YQJy}#2H5jb4R&ox8r@`J5!cU zv*fw=mLbpucU9fugv3*pxNCWCD%iR53KWT@s)Oae_3porNz_{2=TsA!(L6-Nf;ciEG@E9J+nD#Tbgu z=zOb4-H-ZDABI@?Jy@^>4O_SfhQ8hH2k^6)pr;p@4tJld^FMmIO0{H*VRx2M105gh z`&f0ggbVMl6Ko8?q+U);DLAS3hi*F8CJNxlWw?CdH!xp)54g@oCh#)}BqR%-7bT`` zts;+(SpDYoe)}T#OX@1+J*3m3tT|w!K_qBL-2oRqsUsaMZ6%=7*K=uc?9P+J%@{j9 z#HkLNQmOH{3za%?UK3G&NASh-!(5YEAf<=DLv>4+sp4?z%MRCdUaeHaujN@=RuNpF zqG#FCtvb|l%X|zFT)*R(B28Wlebps;dGNZNgdYm>Xa2_*QwWLPGM}& zDb+zlbYolDUSVGjB649=L256s^Krad&krSDP53$+-mYnTM~ifYC6zUIRAfs>g40oVe*H)>!|qb~>~dEi zz2nHfKfOgB6fpA67Iz1Y<(sPU-jE*1Z>HC4w^k2p`=^)Fa^f=nalpMm+K*$VT%-#l zQWozh5Xc4?s~kx8Lx_gx*({+`2gFTg_XfL!l2>U?^~rt+ zPFPunoq$)zicLi^rScAXV$`cTeQmtF6F43hETelmdS}n~hX|KtMC6ZaiofkJF;k=0xc2$)uQ z$)h?ro1$ox36%?(_bdkzHwuB50n3Q><@$*^(9^>S9m!Uc78buHM1%wR^NnYS9?QN$ zl40`Zr@lM<(mPUe-Eld$v159+-MjmKqR|a^_wl!nr_)U zi=zDdM2||ghlM&+nztN*S6tH;W5w55 z?J%n7zDDP3`}a5nUQ&%!*97N9i#|BpoDR3#B>{;L-goa8!jR2{{OI25X>;-Ii`fWW zZOvb~_g+DvVUAwax>|~XpNC4B4ypG!-)rr&GkReqYkAE#L>3eOB#S_(_RQUo5IFY!YQP2cT9RK%ouFZLVKa%BiPQijg_;6_EOU4mAx#&kkich!+>{bECB&s%Fh->jEs0U+tU(p>QB;_i645JqUi!pK$<2E>?CV}jv_MH4LY$V@tp z@9cIs>SATW2DZAnyC+^&rE4{td+{d6dy-wX!oQ(0?hcw7ygmKH|Ilwg2B9iQ;#Md3 zggOyeT3Fd6wrEK#=LBBB8w~+TDvy3GPG5d<5nskVvb-kqF@t4*t&DS&0pJQ=sb%EF z&I-mkavAcfGND||)oseYr0%BK1(U>ncs7!DPcPnF#eAiy;w6dTUVv=Vq@4;w@F|*m zz&BS%93tl5n-pvsrkJWXAOU2!RIu!&NMAV-AHg0;|6lQHzD%}Zt@ig>zW3QT-7C~+ zhDSx?1EaWKIC}X`F!0m+1MW{fLZbtxBacm5JBXGlIaf!HPGe`|ZaP?sF!KH+a*FtTV^{1p5J zMQ9mdq;i_b&Pic0O71$6@xMD3I2*cKD=DHJmZA2d4BAxxQs0}m04!pOaX|mn zS5&3oaz!AlMjM;h&;B~JAd7rOTj+$2l=tW@m4X&|mT#5!B82KI;kiBrYl3z40UqW; z#St#3sB_;hMNMcp)eZf4$D*^PM4ra8$}93Fgj;DGOe=*hy7BlI&hPDnt*(=S8Up|T zkpTdVfBeNf&0KBG%pIWrs-a99IR0gi@3Ku?Cg1c>ILxc3dVu1PztzAxjN_)eF7ohD z4f7p2iP++jXuS3VmT4et^~@!8U^9h=NqVdh1X;8xeMglhWmKo6 z9g=4c!*u5J?7%GrUC~V-yfl-qOPYPi1q)I2+y$#Kf#^q*n%7LH!W;>=639XqsShj} zV@C6mx>HZrRPW;;-^zrJD5jSJYxK3s6TXSKiAsctlF;qiCyLzIP;PWZHAi1)gTf;5 zJF5jx+tz*`yW571jD^mHY++GfFZWs)vT2f~=yNwUb_vwG(Y0M$f}^(F1&V( zDI`yj)KhvAy+x6zJqV=qe58#5#AW=J6nRM&jN~{^5WDQa)EN#k3O8Cp+N#GC$2W>Q zG4*g)(>I#EujuiyGPu@vP$jN5kU%AmU+&d9mnW-Z!*E}mQVzA?Sw8Q{Yme*9d^I)J zmuyhc032FA#31t+CH%>(|G~|grFA=ZtIZ-Gw>fMJ!dp2(1@mG$f(w{jj~x*#e|H2) zE@inR%q~!a<`zOk!?~=u_G`bdD}WEsyC`QTLPuBSledX8bZIJ9h&fOjmD=HxYb159 zs}0>K46weor__p{P6Yj_oYvSC*iKFlU8W!o;nx?>UcwS|bSEyd@Sl^oRXmj`He&U6 z1r7MQ-u4g?*vI6-op^o;I@r@Dc_+!#iF~I9hMg5Zugl?8(ZAqNrpHQbV6j%V8dlgH zeq~=}nTKS5H1)#hB#acZlTZS#?+w=-4_#+}@3NZjtfk9$)LrtiJ>l&o`EVS6X6IO-dkH4WZXe_%joTlMkT>|CK9SLJ+)hk2GYQhh9e zKN$y2g9sU@yguV-nmbzSx4WtN$Xc(tkC9TGq!1hWIScGXD!zoMV8Ses9dDPh&|fZ- zYYdt{XgY~39a;#EmQwv*_Eb^!bwl|escyTb;AaVUH-@SA1we>55omu7-K#mYi_5@~ zTzai0H{m>3Q7CeCv%uN>9hWnQhRjnX<>GjmJi~Qqd%{@SiIaRnWEjFl7h2g8QbE`i zo0KcV`8K(IaA87>DwZ!fUHH);c?<0*=-uY)=HffC(-sT;ub6JW8&Wi2Q2dEYc#+pl zkLBqGhw*&==6a**<7YrlXF8ecVvm+I|E2ZwN_~@K>e7@!tw@0xM7NIHK)H`xx$9ub z`q`0N*{k|MqalxE)vy#OWlz~ zs}l*?L3ex7i|ucBo4sEV0Ri=Ol8f<<__-HHdGevxU7MjzCiI|{Ppoik6FlM>0uzBF zP8DxY^ULfrBJXDlU=Ov%Er$>n{_-h1Ftu3`6{gv7T5~GdrznkQEV>{H%XqR}%hn$) z4Qyk@t@5jD3P_{0!x^4B*0HXD|+It<~j26J3PZD}F|4^-cKtQ1?{Ypzt;Xt}GJ>*jB~ ztiCS3mqtC9?!oo{`o;e)?wC|gftMn_fkHv+3S%eSV&uNxEA>B| zwUxBw$WH3UG#~0%1SNWq?VeD)K*R1xO17%n$9Em*jo9%uP&qwZxpo%niCM`oP}2%> zSLMu|9qhJA_Zl7fb~-N&NEhM@K>EG!el{&`eDjb`4?j$XKlfdztDCJ8>|eEA-RKVN zPVPr?$5#;y*5SoSEpvAfA^a0k9{a`R7~#uHbJ)E@yxdMpG1>FR;ZELIZ*DEH4;F_G zM9>=x;0|^+(4?i+%q|E`A?rY(Exu!~K9Xq;Ph~x>T>6~PYq6|oBj@fe38vG<`+J@} zn|fgRCl>2poqA)(=*bh3!r{!Mnkq=hv?zay@5vuN@vrd+a47xP{--b>?Vn-({|fT| z!v0f~|4(eB2h_qq%|BxQSFry;@qdK+|GfTxQ~YkR|4u=L^{4Cq-EjYVEWewZzq4TA z{)y#pR_EU%`CZ=qoy3mdPb9yKy?>AA_j3L_&l>3;dH!D9f1*Kquzmml`or`5A@pc@ JP^kdGe*j7$-d6ws literal 0 HcmV?d00001 diff --git a/examples/sonar_upgrade/main.tf b/examples/sonar_upgrade/main.tf index 9ddebdbc4..8acb2c97a 100644 --- a/examples/sonar_upgrade/main.tf +++ b/examples/sonar_upgrade/main.tf @@ -20,7 +20,7 @@ module "sonar_upgrader" { "host" = "10.0.1.2" "ssh_user" = "ec2-user" "ssh_private_key_file_path" = "/home/ssh_key2.pem" - "proxy" = { + "proxy" = { "host" = "52.8.8.8" "ssh_user" = "ec2-user" "ssh_private_key_file_path" = "/home/ssh_key2.pem" @@ -30,7 +30,7 @@ module "sonar_upgrader" { "host" = "10.2.1.2" "ssh_user" = "ec2-user" "ssh_private_key_file_path" = "/home/ssh_key2.pem" - "proxy" = { + "proxy" = { "host" = "52.8.8.8" "ssh_user" = "ec2-user" "ssh_private_key_file_path" = "/home/ssh_key2.pem" @@ -76,16 +76,16 @@ module "sonar_upgrader" { target_version = "4.12.0.10.0" # Configuration options for controlling the upgrade flow - test_connection = true - run_preflight_validations = true - run_upgrade = true + test_connection = true + run_preflight_validations = true + run_upgrade = true run_postflight_validations = true - stop_on_failure = true + stop_on_failure = true # Fill if using your S3 bucket, remove if using Imperva's S3 bucket tarball_location = { "s3_bucket" = "myBucket" "s3_region" = "us-east-1" - "s3_key" = "prefix/jsonar-x.y.z.w.u.tar.gz" + "s3_key" = "prefix/jsonar-x.y.z.w.u.tar.gz" } } diff --git a/examples/sonar_upgrade/sonar_upgrade_1_5_6.zip b/examples/sonar_upgrade/sonar_upgrade_1_5_6.zip new file mode 100644 index 0000000000000000000000000000000000000000..5141eccb04f252c9b3167ed392f47b5cda4d7c66 GIT binary patch literal 2511 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 G!2bgortHlC literal 0 HcmV?d00001 From 19be4eebdfd674a6da0406b464ccec3dbe30bf11 Mon Sep 17 00:00:00 2001 From: "linda.nasredin" Date: Sun, 15 Oct 2023 17:54:06 +0300 Subject: [PATCH 6/7] Upgrade Alpha release: Updated the formatted version in the examples' zip file name and removed old version-less zip files [skip actions] --- .github/workflows/release.yml | 17 ++++----- README.md | 34 +++++++++++------- .../azure/dsf_deployment/dsf_deployment.zip | Bin 6724 -> 0 bytes .../dsf_deployment.zip | Bin 12156 -> 0 bytes .../dsf_single_account_deployment.zip | Bin 15357 -> 0 bytes .../sonar_multi_account_deployment.zip | Bin 9377 -> 0 bytes .../sonar_single_account_deployment.zip | Bin 8193 -> 0 bytes .../poc/dsf_deployment/dsf_deployment.zip | Bin 12629 -> 0 bytes .../sonar_basic_deployment.zip | Bin 5963 -> 0 bytes .../sonar_hadr_deployment.zip | Bin 6699 -> 0 bytes examples/sonar_upgrade/README.md | 2 +- 11 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 examples/azure/dsf_deployment/dsf_deployment.zip delete mode 100644 examples/installation/dsf_single_account_deployment/dsf_deployment.zip delete mode 100644 examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip delete mode 100644 examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip delete mode 100644 examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip delete mode 100644 examples/poc/dsf_deployment/dsf_deployment.zip delete mode 100644 examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip delete mode 100644 examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82c0e2d46..0f2e95b8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,14 +73,23 @@ jobs: terraform_wrapper: false terraform_version: ~1.6.0 + - name: Format version for zip file name + run: | + version="${{ github.event.inputs.future_release }}" + formatted_version=${version//./_} + echo "FORMATTED_VERSION=$formatted_version" >> $GITHUB_OUTPUT + id: format-version + - name: Update modules' versions in examples run: | find ./examples/ -type f -exec sed -i 's;.*latest release tag.*;version="'${{ github.event.inputs.future_release }}'" # latest release tag;' {} \; - name: Update READMEs run: | + echo "Formatted version: ${{ steps.format-version.outputs.FORMATTED_VERSION }}" find . -type f -name 'README.md' -exec sed -E -i 's;github.com/imperva/dsfkit/tree/([0-9]*\.){2}[0-9]*;github.com/imperva/dsfkit/tree/'${{ github.event.inputs.future_release }}';g' {} \; find . -type f -name 'README.md' -exec sed -E -i 's;github.com/imperva/dsfkit/raw/([0-9]*\.){2}[0-9]*;github.com/imperva/dsfkit/raw/'${{ github.event.inputs.future_release }}';g' {} \; + find . -type f -name 'README.md' -exec sed -E -i '/\/examples\// s;([0-9]+_){2}[0-9]+\.zip;${{ steps.format-version.outputs.FORMATTED_VERSION }}\.zip;g' {} \; - name: Update installer machine link run: | @@ -90,16 +99,8 @@ jobs: run: | terraform fmt -recursive - - name: Format version for zip file name - run: | - version="${{ github.event.inputs.future_release }}" - formatted_version=${version//./_} - echo "FORMATTED_VERSION=$formatted_version" >> $GITHUB_OUTPUT - id: format-version - - name: Zip per examples run: | - echo "Formatted version: ${{ steps.format-version.outputs.FORMATTED_VERSION }}" for d in $(find ./examples -type d -links 2); do _d=$(dirname ${d}); _b=$(basename ${d}); pushd $_d; zip -FSr ${_b}/${_b}_${{ steps.format-version.outputs.FORMATTED_VERSION }}.zip ${_b} -x "*.zip"; popd; done - name: Zip Sonar python upgrader diff --git a/README.md b/README.md index d19d8cdb2..aa8d32ab2 100644 --- a/README.md +++ b/README.md @@ -470,7 +470,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment.zip + sonar_basic_deployment_1_5_5.zip @@ -480,7 +480,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment.zip + sonar_hadr_deployment_1_5_5.zip @@ -490,7 +490,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment.zip + sonar_single_account_deployment_1_5_5.zip @@ -500,7 +500,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment.zip + sonar_multi_account_deployment_1_5_5.zip @@ -510,7 +510,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment.zip + dsf_deployment_1_5_5.zip @@ -520,7 +520,17 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment.zip + dsf_single_account_deployment_1_5_5.zip + + + + Sonar Upgrade (Alpha) + + All + + Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). + + sonar_upgrade_1_5_5.zip @@ -708,27 +718,27 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2 11. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. Run: ```bash - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_5.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_5.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_5.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_5.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment_1_5_5.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_5.zip ``` 12. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. diff --git a/examples/azure/dsf_deployment/dsf_deployment.zip b/examples/azure/dsf_deployment/dsf_deployment.zip deleted file mode 100644 index 9fbe9ede33642139145cedb5b2a090a7669567aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6724 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 diff --git a/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip b/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip deleted file mode 100644 index ef1e16c9e983a22a6c983372b81f1c22a365cbfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5963 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 Date: Sun, 15 Oct 2023 14:57:46 +0000 Subject: [PATCH 7/7] Automatic commit before release [release=1.5.6] | [skip actions] --- README.md | 26 +++++++++--------- .../dsf_deployment/dsf_deployment_1_5_6.zip | Bin 6725 -> 6725 bytes .../dsf_single_account_deployment_1_5_6.zip | Bin 15357 -> 15357 bytes .../sonar_multi_account_deployment_1_5_6.zip | Bin 9378 -> 9378 bytes .../sonar_single_account_deployment_1_5_6.zip | Bin 8193 -> 8193 bytes .../dsf_deployment/dsf_deployment_1_5_6.zip | Bin 12631 -> 12631 bytes .../sonar_basic_deployment_1_5_6.zip | Bin 5963 -> 5963 bytes .../sonar_hadr_deployment_1_5_6.zip | Bin 6700 -> 6700 bytes .../sonar_upgrade/sonar_upgrade_1_5_6.zip | Bin 2511 -> 2510 bytes modules/sonar_python_upgrader_1_5_6.zip | Bin 16281 -> 16281 bytes 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index aa8d32ab2..9b65e9a2d 100644 --- a/README.md +++ b/README.md @@ -470,7 +470,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment_1_5_5.zip + sonar_basic_deployment_1_5_6.zip @@ -480,7 +480,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment_1_5_5.zip + sonar_hadr_deployment_1_5_6.zip @@ -490,7 +490,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment_1_5_5.zip + sonar_single_account_deployment_1_5_6.zip @@ -500,7 +500,7 @@ For more details about each example, click on the example name. A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment_1_5_5.zip + sonar_multi_account_deployment_1_5_6.zip @@ -510,7 +510,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment_1_5_5.zip + dsf_deployment_1_5_6.zip @@ -520,7 +520,7 @@ For more details about each example, click on the example name. A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment_1_5_5.zip + dsf_single_account_deployment_1_5_6.zip @@ -530,7 +530,7 @@ For more details about each example, click on the example name. Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). - sonar_upgrade_1_5_5.zip + sonar_upgrade_1_5_6.zip @@ -718,27 +718,27 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2 11. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. Run: ```bash - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_basic_deployment/sonar_basic_deployment_1_5_6.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_5_6.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip or - wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_5.zip + wget https://github.com/imperva/dsfkit/raw/1.5.6/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_5_6.zip ``` 12. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. diff --git a/examples/azure/dsf_deployment/dsf_deployment_1_5_6.zip b/examples/azure/dsf_deployment/dsf_deployment_1_5_6.zip index 93de1430f8e8c2d9a82c2e6c43a20373c29dbe7d..943fd508af0754bf8a4c80fb2bd0c94c841f4c62 100644 GIT binary patch delta 261 zcmX?Va@2$;z?+$civa}8$|v%uDZluuo%$SzODnh;7+GF2Gcd5!10_MqM1V90NLi>Z z8%WuUzZ*MRn3&AUC-X5Iuz@ta_`BJKc^61%5}OfB#DZ-iJ4n%KUOlL`&Hs7RSV2PR z!p1OF3xqA0K|;604531k1;uB9MAnL%FunLY*k&=0|1UJUdsRg delta 261 zcmX?Va@2$;z?+$civa{!5-0MgDXU-8PE`Zq(h6<{MwXY%K=FE@BuJSEkmg`uPMjF3 z%LY=Sc5P!v3lkG_;$%K%1E|Pm7v^0cp-F5;FcAy3iR>Unr+M{YLjQTwSV2PR!p1P6 z1;Q50Afa1ghESo&g5tB7SQ00%6*pm0zc$%kLKY;?Bw@{@2Is{|*dg)uN;n|#7V6}%XL}AdYw|gcnIJ`(oG_8i>p0i2fP`ZB;QHqB zwKIW))CBEdMr8>KbAg2Fr5&M0Z9XO)CIAwW)3JrAO4K>T4iZu|fvK9DW6}%~`Do$< zbAqMmZji_~QwNxcjoEyV$XzpMrWb!F_nOOsc#h^?NW3-Xo=7|~3ty(^aFs16yiXR$ mDq}2tko29j^heTXY2}S1x6}$*PSiR8NoAY0ABcC&S{(qwlC0(c delta 424 zcmexc{7V6}%hYC$T$1xM6D3cQ=vUwfn8WxaH3?E$I zT)uWDkdT_79n7dKL18YCP`$JxOz4<&m;gvfPRAA|l&Euv9VDb`0#h|P$D|n~^3lWz z<^)UA-5`-~rVcO>8?*ULEQyovnmIG6Uz^-(E(?-(H1}dsgY(vydm{0~EPRo8EhxNC n7RV}NEPaqvp0xBw;#pdGBk`76Ax9 diff --git a/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip b/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_5_6.zip index ed985e50896e4c03ad4b840a08b73c212b061279..1b292a995b07ca84d362a3db578692216c882748 100644 GIT binary patch delta 283 zcmZ4FxyX|zz?+$civa}8$|v%evAy`Ko%-VMvXzi|x0HO5RC*`} UAgSDm!qZamhsX&}?o$x~0IDr-fdBvi delta 283 zcmZ4FxyX|zz?+$civa{!5-0MQv8i9vPF1@$xlmD=IcI`Ithitzn;W=lnLtASdF-KzHoNeyVgm_%5O#tIS%@fbgM^~w zVM3D^$u9(nxGFfp4DV5x%fym6SzFPCNgd=WS&;k$MQQt>?jL^8Ywg`S zpyJ&OlP7Sfi6$i`XQ$?+=#`{}hHx@4KL=}`{E~epQ1|2(4o5bK$mY`=4on~+UTz1d ziJODDAFzUiOa+}`s_F!LxxlJqoS;IJLuKZIM83$lGQIda*;-Z>#EX*kLE;^k^=Enx cmot|`<}H`=LsBUwABd!~Lp}h+yCts<0B&z*jsO4v delta 265 zcmZp4XmsES@MdP=VgLb_#ECrSZ0gsvQ`N3b^ps{|PMnx#$EF76Z(Q|_jgL9eKm4HA z+Pif?#k(0MPvB4!O-fA8PR&cvD@h9t;bdTjD4zV1eI`)%%^pa(+m1V)B7Vybk#Q5bu_}Isp5)P=5db diff --git a/examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip b/examples/poc/dsf_deployment/dsf_deployment_1_5_6.zip index f676d2bfeb6b6bc0930c54053d554a774d165f75..ae7395f9f69368a7fb8153101f67bb20584a6509 100644 GIT binary patch delta 427 zcmcbfbUleDz?+$civa}8$|v%uDZluuoeILG72FJrEH9ZE7+C6ok|1RwK$-)jEL4{b zqHJTw6-Fkr^2u>bI#7|#6PV^OgM{?h4A`E7&Dxy8wu%KLB)|<<<;3mA1QP1v)rV=^ z&szspWiMm|(^xK)%?(oZL{<-`NHLtJJMv z`d+DD04v&~Wd;-aq4gN-_`5nLOfUXUUZ5`v(qp7+jl}EIwL;>()U{)J4p-@+hb*^P p&lX7~qrL-@$|QXoB)R?ij!1Hf2KGq2MgtEdm9Gq3Ks*CObpTUqsu}T^MgR;gRT z6unZv09Ld|%M2#;L+ddk6HDUcyE-OJ>enVO(3b`2G19eWQiJpQbghthFLmvZcpiGl ra*OqBk>nWl9guiQ`Zh?s{rZkbJVgV0BwnL|2NLgD$9frV6gtzfEBdFO*QvWZwig(ka-%mwLtB4Wez;_u|QqOu^K iqo^|yZ>gvo({s2SkC-cxT#=XulH6@EcMwlSTpa+{5mMR! delta 206 zcmX@DcUq4pz?+$civa{!5-0NLv8i9vPF1@$(LtJtIdNjFDVrLYzj4MCHlV;{J$4JI z$mSgOIwp|N8%}eWkS5nJu#hUR6-+3VcRpAnn}{V;XtJxwTqc&p$xlRVnAERLek&>q jGR0BUnMn=KTPo^?#N!cjMdB5Sc_8s_i@Ae%D&pz@#f(1| diff --git a/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip b/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_5_6.zip index d4377971a8d5455e67c7058fff96549658253158..db6260a6ca78f2f439f4921d879e88996ff3fe24 100644 GIT binary patch delta 219 zcmZ2uvc`lbz?+$civa}8$|v&Zvc34Lo%-VMYr}WdaEa^O!*uZT9C;Wd;eA@ms=FZRIy-2MN6svw#Xs))Aiz5;-ky t%>=el7Q|DRa6;mBNw_jS2e}3;_d&u1NiI~<9Z7Dlq#J}MJXu0Y1OS;^RC)ja delta 219 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 diff --git a/modules/sonar_python_upgrader_1_5_6.zip b/modules/sonar_python_upgrader_1_5_6.zip index 613c5864ef6f11e9c4f0fc64e8bdf099d1715a85..33487e51ffbfa88fb425bba474d7f09dc17daf8b 100644 GIT binary patch delta 476 zcmbPPKeL`Ez?+$civa{o%O~>avOW8&o%-VMM0;r_AV0XRQ(+UBki5teF_6$v zEtu((IkdGvA|~3-Fh#Z6{frb=tp=qaMSl!nF5m2Ks0>z= zW9$jjx7#=#>~t9mJD5;{g*MpqUQ27HXMZQ#S;>Nod1)Dp#EZ4^M&g~c@`dokC+l0Y zfmEAY2O-I?vW`IFDcd-qscy4DHtmy5Ad>17TW2KR30r?8o`oHj)&CvW*j(>NXo>(>~b*BB@TXbw=Wyu=PjcS=b@FX^mYtlAMaY4~SP} GuMPm-#F2#n