From ef560f93fbc38d3c034d388d96a811340a8ca69e Mon Sep 17 00:00:00 2001 From: Dennis Bell Date: Sat, 9 Jul 2022 16:53:00 -0700 Subject: [PATCH] Cleaned up generation of isolation segments, made portable --- hooks/blueprint | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hooks/blueprint b/hooks/blueprint index 844cf577..268d8063 100755 --- a/hooks/blueprint +++ b/hooks/blueprint @@ -48,17 +48,13 @@ generate_dynamic_isolation_segments() { jq -r '.isolation_segments[] | .name' )" - generated_segments=() - for group in $isolation_groups; do - seg=$(echo $1 | jq -r ".isolation_segments[] | select(.name==\"$group\")") segment_tmp_file="operations/dynamic/isolation_segments_$group.yml" - cat operations/dynamic-templates/isolation-segment.yml > "$segment_tmp_file" - sed -i "" "s/params.isolation_segments.iso_group/params.isolation_segments.$group/g" "$segment_tmp_file" - generated_segments+=("$segment_tmp_file") + sed "s/params.isolation_segments.iso_group/params.isolation_segments.$group/g" \ + < "operations/dynamic-templates/isolation-segment.yml" \ + > "$segment_tmp_file" + echo "$segment_tmp_file" done - - echo ${generated_segments[*]} } @@ -464,7 +460,10 @@ for want in $GENESIS_REQUESTED_FEATURES; do fi ;; isolation-segments) - manifest+=( $(generate_dynamic_isolation_segments "$params") ) ;; + while read -r segment; do + manifest+=( "${segment}" ) + done < <(generate_dynamic_isolation_segments "$params") + ;; +migrated-v1-env) manifest+=( "overlay/addons/migration.yml" ) ;;