Skip to content

Commit

Permalink
Promote SCA to 1.0.0
Browse files Browse the repository at this point in the history
Fix a k8s shell issue

Signed-off-by: Jacob Woffenden <[email protected]>
  • Loading branch information
Jacob Woffenden committed May 22, 2024
1 parent 77f7862 commit 34cb995
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 12 deletions.
1 change: 0 additions & 1 deletion features/src/kubernetes/install-kubernetes-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ get_system_architecture
VERSION=${KUBERNETESCLIVERSION:-"latest"}
INSTALL_PROMPT="${INSTALLKUBERNETESCLIPROMPT:-"true"}"


if [[ "${VERSION}" == "latest" ]]; then
VERSION=$(curl --location --silent https://dl.k8s.io/release/stable.txt)
fi
Expand Down
6 changes: 6 additions & 0 deletions features/src/static-analysis/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.0.0] - 2024-05-13

### Changed

- Promoting to 1.0.0

## [0.0.3] - 2024-04-08

### Changed
Expand Down
13 changes: 8 additions & 5 deletions features/src/static-analysis/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
{
"id": "static-analysis",
"version": "0.0.3",
"version": "1.0.0",
"name": "Static Analysis",
"description": "Installs Checkov, Terrascan and Trivy",
"description": "Installs the Checkov CLI, Terrascan CLI and Trivy CLI",
"options": {
"checkovVersion": {
"checkovCliVersion": {
"type": "string",
"description": "Version of Checkov CLI to install",
"proposals": ["latest"],
"default": "latest"
},
"terrascanVersion": {
"terrascanCliVersion": {
"type": "string",
"description": "Version of Terrascan CLI to install",
"proposals": ["latest"],
"default": "latest"
},
"trivyVersion": {
"trivyCliVersion": {
"type": "string",
"description": "Version of Trivy CLI to install",
"proposals": ["latest"],
"default": "latest"
}
}
Expand Down
4 changes: 2 additions & 2 deletions features/src/static-analysis/install-terrascan-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source /usr/local/bin/devcontainer-utils
get_system_architecture

GITHUB_REPOSITORY="tenable/terrascan"
VERSION="${TRIVYCLIVERSION:-"latest"}"
VERSION="${TERRASCANCLIVERSION:-"latest"}"

if [[ "${VERSION}" == "latest" ]]; then
get_github_latest_tag "${GITHUB_REPOSITORY}"
Expand All @@ -33,4 +33,4 @@ tar --extract --file "terrascan_${VERSION_STRIP_V}_Linux_${ARCHITECTURE}.tar.gz"

install --owner=vscode --group=vscode --mode=775 terrascan /usr/local/bin/terrascan

rm --recursive --force rm -rf terrascan LICENSE README.md CHANGELOG.md "terrascan_${VERSION_STRIP_V}_Linux_${ARCHITECTURE}.tar.gz"
rm --recursive --force terrascan LICENSE README.md CHANGELOG.md "terrascan_${VERSION_STRIP_V}_Linux_${ARCHITECTURE}.tar.gz"
2 changes: 1 addition & 1 deletion features/src/static-analysis/install-trivy-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ tar --extract --file "trivy_${VERSION_STRIP_V}_Linux-${ARCHITECTURE}.tar.gz"

install --owner=vscode --group=vscode --mode=775 trivy /usr/local/bin/trivy

rm --recursive --force rm -rf trivy LICENSE README.md contrib "trivy_${VERSION_STRIP_V}_Linux-${ARCHITECTURE}.tar.gz"
rm --recursive --force trivy LICENSE README.md contrib "trivy_${VERSION_STRIP_V}_Linux-${ARCHITECTURE}.tar.gz"
6 changes: 3 additions & 3 deletions features/src/static-analysis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# file not accessible until being built
source /usr/local/bin/devcontainer-utils

logger "info" "Installing Checkov CLI (version: ${CHECKOVVERSION})"
logger "info" "Installing Checkov CLI (version: ${CHECKOVCLIVERSION})"
bash "$(dirname "${0}")"/install-checkov-cli.sh

logger "info" "Installing Terrascan CLI (version: ${TERRASCANVERSION})"
logger "info" "Installing Terrascan CLI (version: ${TERRASCANCLIVERSION})"
bash "$(dirname "${0}")"/install-terrascan-cli.sh

logger "info" "Installing Trivy CLI (version: ${TRIVYVERSION})"
logger "info" "Installing Trivy CLI (version: ${TRIVYCLIVERSION})"
bash "$(dirname "${0}")"/install-trivy-cli.sh

0 comments on commit 34cb995

Please sign in to comment.