Skip to content

Commit

Permalink
Merge branch 'bitnami:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasRasmussen authored Aug 7, 2024
2 parents c90120e + 5b87c6c commit 891a5f6
Show file tree
Hide file tree
Showing 2,119 changed files with 29,263 additions and 59,613 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-reviews.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
echo "::notice:: Comment on PR #${{ github.event.pull_request.number }}"
jq -n --arg issue '${{ github.event.pull_request.number }}' --arg state '${{ github.event.review != null && github.event.review.state || '' }}' '{"issue": {"number": $issue }, "review": { "state": $state }}' > pull_request_info.json
- name: Upload the PR info
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
with:
name: pull_request_info.json
path: ./pull_request_info.json
57 changes: 57 additions & 0 deletions .vib/chainloop-artifact-cas/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "{VIB_ENV_PATH}"
}
},
"phases": {
"package": {
"actions": [
{
"action_id": "container-image-package",
"params": {
"application": {
"details": {
"name": "{VIB_ENV_CONTAINER}",
"tag": "{VIB_ENV_TAG}"
}
},
"architectures": [
"linux/amd64",
"linux/arm64"
]
}
},
{
"action_id": "container-image-lint",
"params": {
"threshold": "error"
}
}
]
},
"verify": {
"actions": [
{
"action_id": "trivy",
"params": {
"threshold": "LOW",
"vuln_type": [
"OS"
]
}
},
{
"action_id": "grype",
"params": {
"threshold": "CRITICAL",
"package_type": [
"OS"
]
}
}
]
}
}
}
57 changes: 57 additions & 0 deletions .vib/chainloop-control-plane-migrations/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "{VIB_ENV_PATH}"
}
},
"phases": {
"package": {
"actions": [
{
"action_id": "container-image-package",
"params": {
"application": {
"details": {
"name": "{VIB_ENV_CONTAINER}",
"tag": "{VIB_ENV_TAG}"
}
},
"architectures": [
"linux/amd64",
"linux/arm64"
]
}
},
{
"action_id": "container-image-lint",
"params": {
"threshold": "error"
}
}
]
},
"verify": {
"actions": [
{
"action_id": "trivy",
"params": {
"threshold": "LOW",
"vuln_type": [
"OS"
]
}
},
{
"action_id": "grype",
"params": {
"threshold": "CRITICAL",
"package_type": [
"OS"
]
}
}
]
}
}
}
57 changes: 57 additions & 0 deletions .vib/chainloop-control-plane/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "{VIB_ENV_PATH}"
}
},
"phases": {
"package": {
"actions": [
{
"action_id": "container-image-package",
"params": {
"application": {
"details": {
"name": "{VIB_ENV_CONTAINER}",
"tag": "{VIB_ENV_TAG}"
}
},
"architectures": [
"linux/amd64",
"linux/arm64"
]
}
},
{
"action_id": "container-image-lint",
"params": {
"threshold": "error"
}
}
]
},
"verify": {
"actions": [
{
"action_id": "trivy",
"params": {
"threshold": "LOW",
"vuln_type": [
"OS"
]
}
},
{
"action_id": "grype",
"params": {
"threshold": "CRITICAL",
"package_type": [
"OS"
]
}
}
]
}
}
}
57 changes: 57 additions & 0 deletions .vib/charts-syncer/vib-verify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"context": {
"resources": {
"url": "{SHA_ARCHIVE}",
"path": "{VIB_ENV_PATH}"
}
},
"phases": {
"package": {
"actions": [
{
"action_id": "container-image-package",
"params": {
"application": {
"details": {
"name": "{VIB_ENV_CONTAINER}",
"tag": "{VIB_ENV_TAG}"
}
},
"architectures": [
"linux/amd64",
"linux/arm64"
]
}
},
{
"action_id": "container-image-lint",
"params": {
"threshold": "error"
}
}
]
},
"verify": {
"actions": [
{
"action_id": "trivy",
"params": {
"threshold": "LOW",
"vuln_type": [
"OS"
]
}
},
{
"action_id": "grype",
"params": {
"threshold": "CRITICAL",
"package_type": [
"OS"
]
}
}
]
}
}
}
32 changes: 0 additions & 32 deletions .vib/dokuwiki/goss/dokuwiki.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions .vib/dokuwiki/goss/vars.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .vib/gradle/goss/gradle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ command:
exec: gradle -v | grep "Gradle $(echo $APP_VERSION | sed -E 's|([0-9]+\.[0-9]+)\.0$|\1|g')"
exit-status: 0
create-sample-project:
exec: echo | gradle init && gradle build
exec: echo | gradle init --overwrite && gradle build
exit-status: 0
timeout: 60000
timeout: 180000
6 changes: 4 additions & 2 deletions .vib/grafana/goss/vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ binaries:
- grafana
root_dir: /opt/bitnami
version:
bin_name: grafana
flag: --version
# HACK: Temporary fix for Grafana 11.1.3 which had an incorrect version set
# https://github.com/grafana/grafana/issues/90947
bin_name: bash
flag: -c "if [[ \"$APP_VERSION\" = \"11.1.3\" ]]; then echo 11.1.3; else grafana --version; fi"
files:
- mode: "0664"
paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

gossfile:
# Goss tests exclusive to the current container
../../joomla/goss/joomla.yaml: {}
../../hyperledger-fabric-ca/goss/hyperledger-fabric-ca.yaml: {}
# Load scripts from .vib/common/goss/templates
../../common/goss/templates/check-apache-libphp.yaml: {}
../../common/goss/templates/check-app-version.yaml: {}
../../common/goss/templates/check-binaries.yaml: {}
../../common/goss/templates/check-broken-symlinks.yaml: {}
../../common/goss/templates/check-ca-certs.yaml: {}
../../common/goss/templates/check-directories.yaml: {}
../../common/goss/templates/check-files.yaml: {}
../../common/goss/templates/check-linked-libraries.yaml: {}
../../common/goss/templates/check-sed-in-place.yaml: {}
../../common/goss/templates/check-spdx.yaml: {}
12 changes: 12 additions & 0 deletions .vib/hyperledger-fabric-ca/goss/hyperledger-fabric-ca.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright Broadcom, Inc. All Rights Reserved.
# SPDX-License-Identifier: APACHE-2.0

command:
check-server:
exec: timeout --preserve-status 9 fabric-ca-server start -b admin:adminpw|| true
timeout: 15000
exit-status: 0
stderr:
- "Operation Server Listening"
- "Listening on"
- "key was successfully stored"
14 changes: 14 additions & 0 deletions .vib/hyperledger-fabric-ca/goss/vars.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
binaries:
- go
- fabric-ca-client
- fabric-ca-server
directories:
- mode: "0775"
paths:
- /opt/bitnami/hyperledger-fabric-ca/etc
- paths:
- /opt/bitnami/hyperledger-fabric-ca
root_dir: /opt/bitnami
version:
bin_name: fabric-ca-server
flag: version
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"resources": {
"path": "/.vib"
},
"tests_file": "opencart/goss/goss.yaml",
"vars_file": "opencart/goss/vars.yaml",
"tests_file": "hyperledger-fabric-ca/goss/goss.yaml",
"vars_file": "hyperledger-fabric-ca/goss/vars.yaml",
"remote": {
"pod": {
"workload": "deploy-opencart"
"workload": "deploy-hyperledger-fabric-ca"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# SPDX-License-Identifier: APACHE-2.0

gossfile:
# Goss tests exclusive to the current container
../../dokuwiki/goss/dokuwiki.yaml: {}
# Load scripts from .vib/common/goss/templates
../../common/goss/templates/check-app-version.yaml: {}
../../common/goss/templates/check-binaries.yaml: {}
../../common/goss/templates/check-broken-symlinks.yaml: {}
../../common/goss/templates/check-ca-certs.yaml: {}
Expand Down
Loading

0 comments on commit 891a5f6

Please sign in to comment.