From 4733317a6486f8b85047cef265a6622302d566a1 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Sun, 25 Aug 2019 17:42:12 -0700 Subject: [PATCH] Update expected test for new script --- pkg/model/tests/data/bootstrapscript_0.txt | 10 ++--- pkg/model/tests/data/bootstrapscript_1.txt | 10 ++--- pkg/model/tests/data/bootstrapscript_2.txt | 10 ++--- pkg/model/tests/data/bootstrapscript_3.txt | 10 ++--- pkg/model/tests/data/bootstrapscript_4.txt | 10 ++--- pkg/model/tests/data/bootstrapscript_5.txt | 10 ++--- .../cloudformation.json.extracted.yaml | 20 +++++----- .../cloudformation.json.extracted.yaml | 20 +++++----- .../cloudformation.json.extracted.yaml | 20 +++++----- .../cloudformation.json.extracted.yaml | 20 +++++----- .../cloudformation.json.extracted.yaml | 20 +++++----- .../cloudformation.json.extracted.yaml | 40 +++++++++---------- .../cloudformation.json.extracted.yaml | 40 +++++++++---------- 13 files changed, 120 insertions(+), 120 deletions(-) diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 45b6b8a7b4..8fa40b20bf 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 03afdfdc4c..32f5403cd0 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 03afdfdc4c..32f5403cd0 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index 59a1b76e84..978fb14765 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index 38eeb6448f..2c6ec462fe 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index 38eeb6448f..2c6ec462fe 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -101,9 +101,9 @@ validate-hash() { local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -121,9 +121,9 @@ function try-download-release() { local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml index 870352d698..54205df134 100644 --- a/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersadditionalcidrex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersadditionalcidrex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -360,9 +360,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionalcidrexamplecom.Propert local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -380,9 +380,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionalcidrexamplecom.Propert local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml index abab83ef7f..9c48bb1b4a 100644 --- a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml @@ -95,9 +95,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -115,9 +115,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -389,9 +389,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -409,9 +409,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 9f7be53819..fa5f5b0fb1 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -360,9 +360,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -380,9 +380,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index a68b54cc6d..0f828aa3bc 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -380,9 +380,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties. local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -400,9 +400,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties. local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml index 9f7be53819..fa5f5b0fb1 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -360,9 +360,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -380,9 +380,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 2d3b34f305..8f39e5eecd 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -381,9 +381,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -401,9 +401,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -676,9 +676,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -696,9 +696,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -971,9 +971,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -991,9 +991,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 2d3b34f305..8f39e5eecd 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -86,9 +86,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -106,9 +106,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -381,9 +381,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -401,9 +401,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -676,9 +676,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmastersmixedinstancesex local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -696,9 +696,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmastersmixedinstancesex local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})" @@ -971,9 +971,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem local -r expected="$2" local actual - actual=$(sha1sum ${file} | awk '{ print $1 }') || true + actual=$(sha256sum ${file} | awk '{ print $1 }') || true if [[ "${actual}" != "${expected}" ]]; then - echo "== ${file} corrupted, sha1 ${actual} doesn't match expected ${expected} ==" + echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" return 1 fi } @@ -991,9 +991,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem local -r nodeup_hash="${NODEUP_HASH}" else # TODO: Remove? - echo "Downloading sha1 (not found in env)" - download-or-bust nodeup.sha1 "" "${nodeup_urls[@]/%/.sha1}" - local -r nodeup_hash=$(cat nodeup.sha1) + echo "Downloading sha256 (not found in env)" + download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" + local -r nodeup_hash=$(cat nodeup.sha256) fi echo "Downloading nodeup (${nodeup_urls[@]})"