Skip to content

Add parent dependency check on samples #397

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

Merged
merged 24 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aced28b
ignore cached remote samples
michael-valdron Jul 14, 2023
da8dfc7
nightly script for building sample parent stack list
michael-valdron Jul 14, 2023
cecd9ca
init check parent stacks script
michael-valdron Jul 14, 2023
b19f793
convert nightly parents build to on the fly parents build.
michael-valdron Jul 18, 2023
804853f
multi version support for build parent stacks
michael-valdron Jul 19, 2023
c99a656
ignore any local parents file.
michael-valdron Jul 25, 2023
1d3f552
rename check_parent_stacks.sh to build_parents_file.sh, build_parents…
michael-valdron Jul 25, 2023
a3092cb
validate devfile schemas test suite parameters now changeable
michael-valdron Jul 25, 2023
50dfb62
validate samples workflow
michael-valdron Jul 25, 2023
6e8a981
add check for if there are samples to be checked under validate sampl…
michael-valdron Jul 26, 2023
b1a6ec7
add README instruction on dependency check changes
michael-valdron Jul 26, 2023
19004ef
yq 4.x installation guide link added to testing prerequisites list.
michael-valdron Jul 31, 2023
4a227ca
add missing link to test suite
michael-valdron Jul 31, 2023
46193a0
validate_devfile_schemas script accepts relative or absolute paths
michael-valdron Jul 31, 2023
f45e89d
use registry-support cache samples
michael-valdron May 17, 2024
959bbce
use yq v4.44.1
michael-valdron May 21, 2024
3b38651
validate-samples actions match revision from other workflows
michael-valdron May 22, 2024
6ef053d
create verbose mode for build_parents_file.sh script, defaults to false
michael-valdron May 23, 2024
a4ac51c
validate_devfile_schemas.sh script unzips resource files if samples
michael-valdron May 23, 2024
a99d261
update README
michael-valdron May 23, 2024
06ee1f7
correct plural meaning to singular meaning for operation names
michael-valdron May 27, 2024
fd0b438
add verbose mode to validate_devfile_schemas script
michael-valdron May 27, 2024
f09095c
set default sample cache dir to .cache/samples
michael-valdron May 27, 2024
8e5576e
remove unused minikube env vars
michael-valdron May 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
USER root

# Install yq
RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o /usr/local/bin/yq && mv ./yq_linux_amd64 /usr/local/bin/yq && chmod +x /usr/local/bin/yq
ENV YQ_VERSION=v4.44.1
RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o /usr/local/bin/yq && mv ./yq_linux_amd64 /usr/local/bin/yq && chmod +x /usr/local/bin/yq

COPY . /registry

Expand Down
3 changes: 2 additions & 1 deletion .ci/Dockerfile.offline
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
USER root

# Install yq
RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o /usr/local/bin/yq && mv ./yq_linux_amd64 /usr/local/bin/yq && chmod +x /usr/local/bin/yq
ENV YQ_VERSION=v4.44.1
RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o /usr/local/bin/yq && mv ./yq_linux_amd64 /usr/local/bin/yq && chmod +x /usr/local/bin/yq

COPY . /registry

Expand Down
64 changes: 64 additions & 0 deletions .github/workflows/validate-samples.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#
# 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:
YQ_VERSION: "v4.44.1"
TEST_DELTA: false

jobs:
validate-devfile-schema:
name: validate devfile schemas
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
fetch-depth: 0

- name: Install Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: "1.19"

- name: Install Ginkgo
run: go install -mod=mod github.com/onsi/ginkgo/v2/[email protected]

- name: Install yq
run: curl -sL -O https://github.com/mikefarah/yq/releases/download/${{ env.YQ_VERSION }}/yq_linux_amd64 -o /usr/local/bin/yq && mv ./yq_linux_amd64 /usr/local/bin/yq && chmod +x /usr/local/bin/yq

- 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 --samples
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ registry-support/
.idea/
devfile-web/
vendor/
.odo
.odo
.cache
parents.yaml
24 changes: 24 additions & 0 deletions tests/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Devfile Registry Testing

## Dependency check

### Prerequisites

- Ensure [yq 4.x](https://github.com/mikefarah/yq/#install) is installed

### Running the build script

- This script performs three actions
- Clones samples from provided `extraDevfileEntries.yaml` under `samples/.cache`
- Creates a `parents.yaml` which contains the dependency tree for parent stacks
- Outputs the child sample paths of parent stacks, `TEST_DELTA=true` will result in only outputting child samples which have changed parent stacks
- The build script takes one optional argument and works off of the current working directory
- `bash tests/build_parents_file.sh`, default samples file is `extraDevfileEntries.yaml`
- `bash tests/build_parents_file.sh <path_to_extraDevfileEntries>`

### Use with testing

- One can test the child samples using the [validate_devfile_schemas](./validate_devfile_schemas/) test suite by performing the following:
```sh
export STACKS=$(bash tests/build_parents_file.sh)
STACKS_DIR=samples/.cache bash tests/validate_devfile_schemas.sh --samples
```

## Validating non-terminating images

### Prerequisites
Expand Down
251 changes: 251 additions & 0 deletions tests/build_parents_file.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
#!/bin/bash

POSITIONAL_ARGS=()
VERBOSE="false"

while [[ $# -gt 0 ]]; do
case $1 in
-v|--verbose)
VERBOSE="true"
shift # past argument
;;
-*|--*)
echo "Unknown option $1"
exit 1
;;
*)
POSITIONAL_ARGS+=("$1") # save positional arg
shift # past argument
;;
esac
done

set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

# default samples file path
samples_file=$(pwd)/extraDevfileEntries.yaml
# Cached remote samples directory
samples_dir=$(pwd)/.cache/samples
# default stacks directory
stacks_dir=${STACKS:-"$(pwd)/stacks"}
parents_file=$(pwd)/parents.yaml
# Base directory path
base_path=$(realpath $(dirname $(dirname $0)))

# 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

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 parent
build_parent() {
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 a child of a parent stack
build_child() {
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_parent ${parent_name} ${parent_version}

if [ $? -eq 0 ]; then
build_child "${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_parent ${parent_name} ${parent_version}

if [ $? -eq 0 ]; then
build_child "${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[@]}
}

if [ ! -d ${base_path}/registry-support ]
then
if [ "$VERBOSE" == "true" ]
then
git clone https://github.com/devfile/registry-support ${base_path}/registry-support
else
git clone -q https://github.com/devfile/registry-support ${base_path}/registry-support
fi
fi

if [ "$VERBOSE" == "true" ]
then
bash ${base_path}/registry-support/build-tools/cache_samples.sh ${samples_file} ${samples_dir}
else
bash ${base_path}/registry-support/build-tools/cache_samples.sh ${samples_file} ${samples_dir} > /dev/null 2>&- echo
fi

if [ -f ${parents_file} ]; then
rm ${parents_file}
fi

build_parents_file

get_children_of_parents
Loading
Loading