Skip to content

Commit 0e44469

Browse files
committed
Obscure smee url from generated logs
obscured smee url from generated logs in CI. Signed-off-by: Zaki Shaikh <[email protected]>
1 parent 2f78eb8 commit 0e44469

File tree

3 files changed

+43
-4
lines changed

3 files changed

+43
-4
lines changed

.github/workflows/kind-e2e-tests.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
types: [ opened, synchronize, reopened ]
1515
paths:
1616
- "**.go"
17+
- "/hack/gh-workflow-ci.sh"
1718
jobs:
1819
e2e-tests:
1920
concurrency:
@@ -108,7 +109,9 @@ jobs:
108109
- name: Collect logs
109110
if: ${{ always() }}
110111
run: |
111-
./hack/gh-workflow-ci.sh collect_logs
112+
./hack/gh-workflow-ci.sh collect_logs \
113+
"${{ secrets.TEST_GITEA_SMEEURL }}" \
114+
"${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}"
112115
113116
- name: Upload artifacts
114117
if: ${{ always() }}

hack/gh-workflow-ci.sh

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ run_e2e_tests() {
8282
export GO_TEST_FLAGS="-v -race -failfast"
8383

8484
export TEST_BITBUCKET_CLOUD_API_URL=https://api.bitbucket.org/2.0
85-
export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=cboudjna/pac-e2e-tests
85+
export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=zakisk/test-pac
8686
export TEST_BITBUCKET_CLOUD_TOKEN=${bitbucket_cloud_token}
87-
export TEST_BITBUCKET_CLOUD_USER=cboudjna
87+
export TEST_BITBUCKET_CLOUD_USER=zakisk-admin
8888

8989
export TEST_EL_URL="http://${CONTROLLER_DOMAIN_URL}"
9090
export TEST_EL_WEBHOOK_SECRET="${webhook_secret}"
@@ -125,10 +125,42 @@ run_e2e_tests() {
125125
}
126126

127127
collect_logs() {
128+
test_gitea_smee_url="${1}"
129+
github_ghe_smee_url="${2}"
128130
mkdir -p /tmp/logs
129131
kind export logs /tmp/logs
130132
[[ -d /tmp/gosmee-replay ]] && cp -a /tmp/gosmee-replay /tmp/logs/
131133

134+
kind_dir=/tmp/logs/kind-control-plane
135+
files=$(ls $kind_dir/containers)
136+
for file in ${files}; do
137+
if [[ "$file" == *"gosmee"* || "$file" == *"gitea"* ]]; then
138+
sed -i -E "s|(${test_gitea_smee_url}|${github_ghe_smee_url})|SMEE_URL|g" "$kind_dir/containers/$file"
139+
fi
140+
done
141+
142+
gosmee_pod_dirs=""
143+
pods_dir=$(ls $kind_dir/pods)
144+
for dir in ${pods_dir}; do
145+
if [[ "$dir" == *"gosmee"* ]]; then
146+
gosmee_dir="$dir/gosmee"
147+
gosmee_pod_dirs="$gosmee_pod_dirs $gosmee_dir"
148+
continue
149+
fi
150+
151+
if [[ "$dir" == *"gitea"* ]]; then
152+
gitea_dir="$dir/gitea"
153+
gosmee_pod_dirs="$gosmee_pod_dirs $gitea_dir"
154+
fi
155+
done
156+
157+
for log_dir in ${gosmee_pod_dirs}; do
158+
log_files=$(ls $kind_dir/pods/$log_dir)
159+
for log_file in ${log_files}; do
160+
sed -i -E "s|(${test_gitea_smee_url}|${github_ghe_smee_url})|SMEE_URL|g" $kind_dir/pods/$log_dir/$log_file
161+
done
162+
done
163+
132164
kubectl get pipelineruns -A -o yaml >/tmp/logs/pac-pipelineruns.yaml
133165
kubectl get repositories.pipelinesascode.tekton.dev -A -o yaml >/tmp/logs/pac-repositories.yaml
134166
kubectl get configmap -n pipelines-as-code -o yaml >/tmp/logs/pac-configmap
@@ -142,6 +174,9 @@ collect_logs() {
142174
done
143175
kubectl -n ${ns} get events >/tmp/logs/ns/${ns}/events
144176
done
177+
178+
sed -i -E "s|(${test_gitea_smee_url}|${github_ghe_smee_url})|SMEE_URL|g" /tmp/logs/ns/gitea/pods.yaml
179+
sed -i -E "s|(${test_gitea_smee_url}|${github_ghe_smee_url})|SMEE_URL|g" /tmp/logs/ns/pipelines-as-code/pods.yaml
145180
}
146181

147182
help() {
@@ -175,7 +210,7 @@ run_e2e_tests)
175210
run_e2e_tests "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}" "${11}"
176211
;;
177212
collect_logs)
178-
collect_logs
213+
collect_logs "${2}" "${3}"
179214
;;
180215
help)
181216
help

pkg/pipelineascode/pipelineascode.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/settings"
2020
"github.com/openshift-pipelines/pipelines-as-code/pkg/provider"
2121
"github.com/openshift-pipelines/pipelines-as-code/pkg/secrets"
22+
2223
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
2324
"go.uber.org/zap"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

0 commit comments

Comments
 (0)