-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add parent dependency check on samples #195
Closed
michael-valdron
wants to merge
14
commits into
devfile:main
from
michael-valdron:testing/check-parents
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
aa0e1dd
ignore cached remote samples
michael-valdron 81113bf
nightly script for building sample parent stack list
michael-valdron 1abda83
init check parent stacks script
michael-valdron 1321736
convert nightly parents build to on the fly parents build.
michael-valdron 8d71e6c
multi version support for build parent stacks
michael-valdron 9c86d26
ignore any local parents file.
michael-valdron 76b1f4e
rename check_parent_stacks.sh to build_parents_file.sh, build_parents…
michael-valdron 563d791
validate devfile schemas test suite parameters now changeable
michael-valdron 88722d5
validate samples workflow
michael-valdron a5da72e
add check for if there are samples to be checked under validate sampl…
michael-valdron 3464e43
add README instruction on dependency check changes
michael-valdron 959de4d
yq 4.x installation guide link added to testing prerequisites list.
michael-valdron 1b375fb
add missing link to test suite
michael-valdron 7c0d08c
validate_devfile_schemas script accepts relative or absolute paths
michael-valdron File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
# | ||
# Copyright 2023 Red Hat, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
name: Validate child samples | ||
|
||
on: | ||
push: | ||
branches: [main] | ||
pull_request: | ||
branches: [main] | ||
schedule: | ||
- cron: 0 5 * * * | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.event.number || github.ref }} | ||
cancel-in-progress: true | ||
|
||
env: | ||
MINIKUBE_VERSION: "v1.29.0" | ||
KUBERNETES_VERSION: "v1.25.2" | ||
TEST_DELTA: false | ||
|
||
jobs: | ||
validate-devfile-schema: | ||
name: validate devfile schemas | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Install Go | ||
uses: actions/setup-go@v3 | ||
with: | ||
go-version: "1.19" | ||
|
||
- name: Install Ginkgo | ||
run: go install -mod=mod github.com/onsi/ginkgo/v2/[email protected] | ||
|
||
- name: Test delta if on a pull request | ||
if: ${{ github.event_name == 'pull_request' }} | ||
run: echo "TEST_DELTA=true" >> $GITHUB_ENV | ||
|
||
- name: Build parents file and get child samples | ||
run: echo "STACKS=$(bash tests/build_parents_file.sh)" >> $GITHUB_ENV | ||
|
||
- name: Validate samples | ||
if: ${{ env.STACKS != '' }} | ||
run: STACKS_DIR=$(pwd)/samples/.cache bash tests/validate_devfile_schemas.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,5 @@ index-generator | |
registry-support/ | ||
.idea/ | ||
devfile-web/ | ||
samples/.cache | ||
parents.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,240 @@ | ||
#!/bin/bash | ||
|
||
# default samples file path | ||
samples_file=$(pwd)/extraDevfileEntries.yaml | ||
# Cached remote samples directory | ||
samples_dir=$(pwd)/samples/.cache | ||
# default stacks directory | ||
stacks_dir=${STACKS:-"$(pwd)/stacks"} | ||
parents_file=$(pwd)/parents.yaml | ||
|
||
# YAML query cmd path | ||
YQ_PATH=${YQ_PATH:-yq} | ||
|
||
# Read samples file as first argument | ||
# if unset use default samples file path | ||
if [ ! -z "${1}" ]; then | ||
samples_file=${1} | ||
fi | ||
|
||
# Clones remote samples into cache directory | ||
clone_samples() { | ||
samples_len=$($YQ_PATH eval '.samples | length' ${samples_file}) | ||
|
||
# Removes old cached samples directory | ||
if [ -d ${samples_dir} ]; then | ||
rm -rf ${samples_dir} | ||
fi | ||
|
||
for ((s_idx=0;s_idx<${samples_len};s_idx++)); do | ||
name=$($YQ_PATH eval .samples.${s_idx}.name ${samples_file}) | ||
versions=($($YQ_PATH eval .samples.${s_idx}.versions.[].version ${samples_file})) | ||
|
||
# Iterate through sample versions if sample has multi version support | ||
if [ ${#versions[@]} -ne 0 ]; then | ||
for ((v_idx=0;v_idx<${#versions[@]};v_idx++)); do | ||
remote_url=$($YQ_PATH eval .samples.${s_idx}.versions.${v_idx}.git.remotes.origin ${samples_file}) | ||
|
||
git clone --depth=1 ${remote_url} ${samples_dir}/${name}/${versions[$v_idx]} | ||
done | ||
else | ||
remote_url=$($YQ_PATH eval .samples.${s_idx}.git.remotes.origin ${samples_file}) | ||
|
||
git clone --depth=1 ${remote_url} ${samples_dir}/${name} | ||
fi | ||
done | ||
} | ||
|
||
get_parent_version() { | ||
devfile=$1 | ||
name=$2 | ||
version=$($YQ_PATH eval .parent.version ${devfile}) | ||
|
||
if [ "${version}" == "null" ] && [ -f "${stacks_dir}/${name}/stack.yaml" ]; then | ||
version=$($YQ_PATH eval '.versions | filter(.default) | .[0].version' ${stacks_dir}/${name}/stack.yaml) | ||
fi | ||
|
||
echo ${version} | ||
} | ||
|
||
# Get parent index if exists, else returns -1 | ||
parent_index() { | ||
name=$1 | ||
version=$2 | ||
|
||
if [ -z "${version}" ]; then | ||
result=$($YQ_PATH eval ".parents | to_entries | filter(.value.name == \"${name}\") | .[0].key" ${parents_file}) | ||
else | ||
result=$($YQ_PATH eval ".parents | to_entries | filter(.value.name == \"${name}\" and .value.version == \"${version}\") | .[0].key" ${parents_file}) | ||
fi | ||
|
||
if [ "${result}" == "null" ]; then | ||
echo "-1" | ||
else | ||
echo ${result} | ||
fi | ||
} | ||
|
||
# Get child index if exists, else returns -1 | ||
child_index() { | ||
parent_idx=$1 | ||
name=$2 | ||
version=$3 | ||
|
||
if [ -z "${version}" ]; then | ||
result=$($YQ_PATH eval ".parents.[${parent_idx}].children | to_entries | filter(.value.name == \"${name}\") | .[0].key" ${parents_file}) | ||
else | ||
result=$($YQ_PATH eval ".parents.[${parent_idx}].children | to_entries | filter(.value.name == \"${name}\" and .value.version == \"${version}\") | .[0].key" ${parents_file}) | ||
fi | ||
|
||
if [ "${result}" == "null" ]; then | ||
echo "-1" | ||
else | ||
echo ${result} | ||
fi | ||
} | ||
|
||
# Builds sample parents | ||
build_parents() { | ||
parent_name=$1 | ||
parent_version=$2 | ||
|
||
if [ "${parent_version}" == "null" ]; then | ||
parent_version="" | ||
fi | ||
|
||
if [ "${parent_name}" != "null" ]; then | ||
if [ ! -f ${parents_file} ]; then | ||
$YQ_PATH eval -n ".parents[0].name = \"${parent_name}\"" > ${parents_file} | ||
if [ "${parent_version}" != "" ]; then | ||
$YQ_PATH eval ".parents[0].version = \"${parent_version}\"" -i ${parents_file} | ||
fi | ||
|
||
return | ||
fi | ||
|
||
if [ "$($YQ_PATH eval .parents ${parents_file})" == "null" ]; then | ||
$YQ_PATH eval ".parents[0].name = \"${parent_name}\"" -i ${parents_file} | ||
if [ "${parent_version}" != "" ]; then | ||
$YQ_PATH eval ".parents[0].version = \"${parent_version}\"" -i ${parents_file} | ||
fi | ||
|
||
return | ||
fi | ||
|
||
parent_idx=$(parent_index ${parent_name} ${parent_version}) | ||
if [ "${parent_idx}" == "-1" ]; then | ||
next_idx=$($YQ_PATH eval ".parents | length" ${parents_file}) | ||
$YQ_PATH eval ".parents[${next_idx}].name = \"${parent_name}\"" -i ${parents_file} | ||
if [ "${parent_version}" != "" ]; then | ||
$YQ_PATH eval ".parents[${next_idx}].version = \"${parent_version}\"" -i ${parents_file} | ||
fi | ||
fi | ||
else | ||
return 1 | ||
fi | ||
} | ||
|
||
# Builds children of parent stacks | ||
build_children() { | ||
parent_name=$1 | ||
parent_version=$2 | ||
sample_name=$3 | ||
sample_version=$4 | ||
|
||
parent_idx=$(parent_index ${parent_name} ${parent_version}) | ||
|
||
if [ "$($YQ_PATH eval .parents[${parent_idx}].children ${parents_file})" == "null" ]; then | ||
$YQ_PATH eval ".parents[${parent_idx}].children[0].name = \"${sample_name}\"" -i ${parents_file} | ||
if [ "${sample_version}" != "" ]; then | ||
$YQ_PATH eval ".parents[${parent_idx}].children[0].version = \"${sample_version}\"" -i ${parents_file} | ||
fi | ||
|
||
return | ||
fi | ||
|
||
child_idx=$(child_index ${parent_idx} ${sample_name} ${sample_version}) | ||
if [ "${child_idx}" == "-1" ]; then | ||
next_idx=$($YQ_PATH eval ".parents[${parent_idx}].children | length" ${parents_file}) | ||
$YQ_PATH eval ".parents[${parent_idx}].children[${next_idx}].name = \"${sample_name}\"" -i ${parents_file} | ||
if [ "${sample_version}" != "" ]; then | ||
$YQ_PATH eval ".parents[${parent_idx}].children[${next_idx}].version = \"${sample_version}\"" -i ${parents_file} | ||
fi | ||
fi | ||
} | ||
|
||
build_parents_file() { | ||
samples_len=$($YQ_PATH eval '.samples | length' ${samples_file}) | ||
|
||
for ((s_idx=0;s_idx<${samples_len};s_idx++)); do | ||
sample_name=$($YQ_PATH eval .samples.${s_idx}.name ${samples_file}) | ||
sample_versions=($($YQ_PATH eval .samples.${s_idx}.versions.[].version ${samples_file})) | ||
|
||
# Iterate through sample versions if sample has multi version support | ||
if [ ${#sample_versions[@]} -ne 0 ]; then | ||
for ((v_idx=0;v_idx<${#sample_versions[@]};v_idx++)); do | ||
devfile=${samples_dir}/${sample_name}/${sample_versions[$v_idx]}/devfile.yaml | ||
parent_name=$($YQ_PATH eval .parent.id ${devfile}) | ||
parent_version=$(get_parent_version ${devfile} ${parent_name}) | ||
build_parents ${parent_name} ${parent_version} | ||
|
||
if [ $? -eq 0 ]; then | ||
build_children "${parent_name}" "${parent_version}" "${sample_name}" "${sample_versions[$v_idx]}" | ||
fi | ||
done | ||
else | ||
devfile=${samples_dir}/${sample_name}/devfile.yaml | ||
parent_name=$($YQ_PATH eval .parent.id ${devfile}) | ||
parent_version=$(get_parent_version ${devfile} ${parent_name}) | ||
build_parents ${parent_name} ${parent_version} | ||
|
||
if [ $? -eq 0 ]; then | ||
build_children "${parent_name}" "${parent_version}" "${sample_name}" "" | ||
fi | ||
fi | ||
done | ||
} | ||
|
||
# Gets the children sample paths of parents. | ||
# When TEST_DELTA is set to true, only children of parents | ||
# with changes are returned. | ||
get_children_of_parents() { | ||
stack_dirs=$(bash $(pwd)/tests/get_stacks.sh) | ||
children=() | ||
|
||
for stack_dir in $stack_dirs; do | ||
if [ "$(basename $(dirname $stack_dir))" == "." ]; then | ||
stack_name=$(basename $stack_dir) | ||
|
||
names=($($YQ_PATH eval ".parents | filter(.name == \"${stack_name}\") | .[0].children.[].name" ${parents_file})) | ||
versions=($($YQ_PATH eval ".parents | filter(.name == \"${stack_name}\") | .[0].children.[].version" ${parents_file})) | ||
else | ||
stack_name=$(basename $(dirname $stack_dir)) | ||
stack_version=$(basename $stack_dir) | ||
|
||
names=($($YQ_PATH eval ".parents | filter(.name == \"${stack_name}\" and .version == \"${stack_version}\") | .[0].children.[].name" ${parents_file})) | ||
versions=($($YQ_PATH eval ".parents | filter(.name == \"${stack_name}\" and .version == \"${stack_version}\") | .[0].children.[].version" ${parents_file})) | ||
fi | ||
|
||
|
||
for ((c_idx=0;c_idx<${#names[@]};c_idx++)); do | ||
if [ "${versions[$c_idx]}" == "null" ]; then | ||
children+=("${names[$c_idx]}") | ||
else | ||
children+=("${names[$c_idx]}/${versions[$c_idx]}") | ||
fi | ||
done | ||
done | ||
|
||
echo ${children[@]} | ||
} | ||
|
||
clone_samples | ||
|
||
if [ -f ${parents_file} ]; then | ||
rm ${parents_file} | ||
fi | ||
|
||
build_parents_file | ||
|
||
echo $(get_children_of_parents) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tried to test the script locally following the instructions:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thepetk What is your output for
go version
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Made changes 7c0d08c so
STACKS_DIR
can be either a relative or absolute path when executingvalidate_devfile_schemas.sh
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@michael-valdron output is
go version go1.19.1 linux/amd64
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thepetk try running it again with a go 1.18.x runtime, go 1.19.1 could be having issues running it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Finally got it run successfully :)
One thing I had to do other than those steps, was to add a
go.work
file in my repo's root dir.It seems that is working fine :)
One test I tried to make is to update the go-basic sample inside the extraDevfileEntries. I've tried to include multiple sample versions:
In the parent file I had:
(Which is ok)
During testing I was expecting to see the test fail for one of the golang children (go-basic version 2.1.0). Although I had an issue with the
quarkus
. The trace of the test was:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an interesting result, it is reporting the stack as being
code-with-quarkus
but the error in the test seems to be the expected one withgo-basic 2.1.0
, I'll need to check if there is a problem with the inputs or if there is a bug within this test suite which is causing the wrong stack name to be reported.