1212# The output of sloctl is sanitized, the trailing whitespaces,
1313# if present, are removed for easier output validation.
1414run_sloctl () {
15- run bash -c " set -o pipefail && sloctl $* | sed 's/ *$//'"
15+ run bash -c " set -o pipefail && sloctl $* | sed 's/ *$//'"
1616}
1717
1818# read_files
@@ -31,7 +31,7 @@ run_sloctl() {
3131# documents style.
3232# yq works with json as it is only a preprocessor for jq.
3333read_files () {
34- yq -sY ' [ .[] | if type == "array" then .[] else . end]' " $@ "
34+ yq -sY ' [ .[] | if type == "array" then .[] else . end]' " $@ "
3535}
3636
3737# assert_applied
@@ -44,7 +44,7 @@ read_files() {
4444# Options:
4545# <expected> The expected YAML string.
4646assert_applied () {
47- _assert_objects_existence " apply" " $1 "
47+ _assert_objects_existence " apply" " $1 "
4848}
4949
5050# assert_deleted
@@ -57,7 +57,7 @@ assert_applied() {
5757# Options:
5858# <expected> The expected YAML string.
5959assert_deleted () {
60- _assert_objects_existence " delete" " $1 "
60+ _assert_objects_existence " delete" " $1 "
6161}
6262
6363# _assert_objects_existence
@@ -80,44 +80,44 @@ assert_deleted() {
8080# - apply: assert that the output contains the expected object.
8181# - delete: assert that the output contains 'No resources found'.
8282_assert_objects_existence () {
83- load_lib " bats-support"
84-
85- assert [ -n " $2 "
86- assert [ " $( yq -r ' type' <<< " $2" ) " = " array"
87-
88- yq -c .[] <<< " $2" | while read -r object; do
89- name=$( yq -r .metadata.name <<< " $object" )
90- kind=$( yq -r .kind <<< " $object" )
91- args=(" get" " ${kind,,} " " $name " # Converts kind to lowercase.
92- if [[ " $kind " != " Project" && [[ " $kind " != " RoleBinding" ; then
93- project=$( yq -r .metadata.project <<< " $object" )
94- args+=(-p " $project "
95- fi
96-
97- case " $1 " in
98- apply)
99- run_sloctl " ${args[*]} "
100- # shellcheck disable=2154
101- have=$( yq --sort-keys -y ' [.[] | del(.status)]' <<< " $output" )
102- want=$( yq --sort-keys -y ' [
83+ load_lib " bats-support"
84+
85+ assert [ -n " $2 "
86+ assert [ " $( yq -r ' type' <<< " $2" ) " = " array"
87+
88+ yq -c .[] <<< " $2" | while read -r object; do
89+ name=$( yq -r .metadata.name <<< " $object" )
90+ kind=$( yq -r .kind <<< " $object" )
91+ args=(" get" " ${kind,,} " " $name " # Converts kind to lowercase.
92+ if [[ " $kind " != " Project" && [[ " $kind " != " RoleBinding" ; then
93+ project=$( yq -r .metadata.project <<< " $object" )
94+ args+=(-p " $project "
95+ fi
96+
97+ case " $1 " in
98+ apply)
99+ run_sloctl " ${args[*]} "
100+ # shellcheck disable=2154
101+ have=$( yq --sort-keys -y ' [.[] | del(.status)]' <<< " $output" )
102+ want=$( yq --sort-keys -y ' [
103103 .[] | select(.kind == "' " $kind " ' ") |
104104 select(.metadata.name == "' " $name " ' ") |
105105 if .metadata.project then
106106 select(.metadata.project == "' " $project " ' ")
107107 else
108108 .
109109 end]' <<< " $2" )
110- assert_equal " $have " " $want "
111- ;;
112- delete)
113- run_sloctl " ${args[*]} "
114- assert_output --partial " No resources found"
115- ;;
116- * )
117- fail " Unknown verb '$1 '"
118- ;;
119- esac
120- done
110+ assert_equal " $have " " $want "
111+ ;;
112+ delete)
113+ run_sloctl " ${args[*]} "
114+ assert_output --partial " No resources found"
115+ ;;
116+ * )
117+ fail " Unknown verb '$1 '"
118+ ;;
119+ esac
120+ done
121121}
122122
123123# generate_inputs
@@ -137,44 +137,44 @@ _assert_objects_existence() {
137137# them in parallel or a cleanup after the test fails for whatever reason.
138138# It works for both YAML and JSON files.
139139generate_inputs () {
140- load_lib " bats-support"
140+ load_lib " bats-support"
141141
142- directory=" $1 "
143- test_filename=$( basename " $BATS_TEST_FILENAME " )
144- TEST_INPUTS=" $directory /$test_filename "
145- mkdir " $TEST_INPUTS "
142+ directory=" $1 "
143+ test_filename=$( basename " $BATS_TEST_FILENAME " )
144+ TEST_INPUTS=" $directory /$test_filename "
145+ mkdir " $TEST_INPUTS "
146146
147- test_hash=" ${BATS_TEST_NUMBER} -$( date +%s) $SLOCTL_GIT_REVISION "
148- TEST_PROJECT=" e2e-$test_hash "
147+ test_hash=" ${BATS_TEST_NUMBER} -$( date +%s) $SLOCTL_GIT_REVISION "
148+ TEST_PROJECT=" e2e-$test_hash "
149149
150- files=$( find " $TEST_SUITE_INPUTS /$test_filename " \( -iname \* .json -o -iname \* .yaml -o -iname \* .yml \) )
151- for file in $files ; do
152- pipeline='
150+ files=$( find " $TEST_SUITE_INPUTS /$test_filename " \( -iname \* .json -o -iname \* .yaml -o -iname \* .yml \) )
151+ for file in $files ; do
152+ pipeline='
153153 if .kind == "Project" then
154- .metadata.labels = {"origin": ["sloctl-e2e-tests"]}
154+ .metadata.labels.origin = ["sloctl-e2e-tests"]
155155 else
156156 .
157157 end'
158- filter='
158+ filter='
159159 if type == "array" then
160160 [.[] | ' " $pipeline " ' ]
161161 else
162162 ' " $pipeline " '
163163 end'
164- new_file=" ${file/ $TEST_SUITE_INPUTS / $directory } "
165- mkdir -p " $( dirname " $new_file " ) "
166- sed_replace=" s/<PROJECT>/$TEST_PROJECT /g"
167- if [[ $file =~ .* .ya? ml ]]; then
168- yq -Y " $filter " " $file " | sed " $sed_replace " > " $new_file "
169- elif [[ $file == * .json ]]; then
170- jq " $filter " " $file " | sed " $sed_replace " > " $new_file "
171- else
172- fail " test input file: ${file} must be either YAML or JSON"
173- fi
174- done
175-
176- export TEST_INPUTS
177- export TEST_PROJECT
164+ new_file=" ${file/ $TEST_SUITE_INPUTS / $directory } "
165+ mkdir -p " $( dirname " $new_file " ) "
166+ sed_replace=" s/<PROJECT>/$TEST_PROJECT /g"
167+ if [[ $file =~ .* .ya? ml ]]; then
168+ yq -Y " $filter " " $file " | sed " $sed_replace " > " $new_file "
169+ elif [[ $file == * .json ]]; then
170+ jq " $filter " " $file " | sed " $sed_replace " > " $new_file "
171+ else
172+ fail " test input file: ${file} must be either YAML or JSON"
173+ fi
174+ done
175+
176+ export TEST_INPUTS
177+ export TEST_PROJECT
178178}
179179
180180# select_object
@@ -192,7 +192,7 @@ generate_inputs() {
192192# extract an object by its former name a regex match with jq 'test'
193193# function has to be performed.
194194select_object () {
195- yq ' [if type == "array" then .[] else . end |
195+ yq ' [if type == "array" then .[] else . end |
196196 select(.metadata.name | test("^' " $1 " ' "))]' " $1 " " $2 "
197197}
198198
@@ -208,16 +208,16 @@ select_object() {
208208#
209209# If 'yq' is provided as one of the dependencies, ensure it is coming from https://github.com/kislyuk/yq.
210210ensure_installed () {
211- load_lib " bats-support"
212-
213- for dep in " $@ " ; do
214- if ! command -v " $dep " > /dev/null 2>&1 ; then
215- fail " ERROR: $dep is not installed!"
216- fi
217- if [ " $dep " = " yq" && [ " $( yq --help | grep " kislyuk/yq" ) " -eq 1 ]; then
218- fail " ERROR: yq is not installed from https://github.com/kislyuk/yq!"
219- fi
220- done
211+ load_lib " bats-support"
212+
213+ for dep in " $@ " ; do
214+ if ! command -v " $dep " > /dev/null 2>&1 ; then
215+ fail " ERROR: $dep is not installed!"
216+ fi
217+ if [ " $dep " = " yq" && [ " $( yq --help | grep " kislyuk/yq" ) " -eq 1 ]; then
218+ fail " ERROR: yq is not installed from https://github.com/kislyuk/yq!"
219+ fi
220+ done
221221}
222222
223223# load_lib
@@ -230,6 +230,6 @@ ensure_installed() {
230230# Options:
231231# <name> Name of the library to load.
232232load_lib () {
233- local name=" $1 "
234- load " /usr/lib/bats/${name} /load.bash"
233+ local name=" $1 "
234+ load " /usr/lib/bats/${name} /load.bash"
235235}
0 commit comments