Skip to content
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

[Snyk] Security upgrade zipp from 3.15.0 to 3.19.1 #36

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
56ecc37
UPSTREAM: <carry>: Add Commit Checker github action
rimolive Apr 26, 2024
3c5170b
Merge pull request #38 from rimolive/rmartine
HumairAK May 27, 2024
d09b624
UPSTREAM: <carry>: Fix Commit Checker workflow to checkout the code
rimolive May 27, 2024
bdd4217
Merge pull request #39 from rimolive/rmartine
HumairAK May 28, 2024
15464f6
UPSTREAM: <carry>: move commit checker to separate wf
HumairAK May 28, 2024
2bc028c
Merge pull request #41 from HumairAK/fix_cc
HumairAK May 28, 2024
abb28bd
UPSTREAM: <carry>: fix commit-checker gh workflow syntax
HumairAK May 28, 2024
0115b8e
Merge pull request #45 from HumairAK/fix_commit_checker
HumairAK May 28, 2024
47fb475
Change Commit Checker to get the PR last commit
rimolive May 29, 2024
7127a61
Merge pull request #47 from rimolive/rmartine-commit-checker
HumairAK May 29, 2024
efb845e
UPSTREAM:<carry>:Fix Commit Checker PR comment formatting
rimolive May 29, 2024
542e1d4
Merge pull request #48 from rimolive/rmartine-commit-checker
HumairAK May 29, 2024
0b53e53
UPSTREAM: <carry>: Add a conditional in the commit checker workflow t…
rimolive May 29, 2024
25f33aa
Merge pull request #49 from rimolive/rmartine-commit-checker
rimolive May 29, 2024
ea12783
Updated ubi8 image and go-toolset version
May 28, 2024
effca01
Merge pull request #44 from amadhusu/RHOAIENG-7423-1.18
HumairAK May 30, 2024
dcbeed8
UPSTREAM: <carry>: Final fix for Commit Checker GH Action
rimolive May 31, 2024
6623b7c
Merge pull request #50 from rimolive/rmartine-commit-checker
HumairAK Jun 4, 2024
624df09
UPSTREAM: <carry>: Fix for default Pipelineroot failures
VaniHaripriya Jun 4, 2024
f3fbc2c
Merge pull request #51 from VaniHaripriya/RHOAIENG-7209
openshift-merge-bot[bot] Jun 6, 2024
bf77909
UPSTREAM: <carry>: add last_run_creation
HumairAK May 31, 2024
2aacfe2
Merge pull request #52 from HumairAK/RHOAIENG-7692
openshift-merge-bot[bot] Jun 11, 2024
a54c07f
UPSTREAM: <carry>: Upgrade DSP api/go.mod package versions
DharmitD Jun 10, 2024
50c0275
Merge pull request #54 from DharmitD/snyk-cve-api
HumairAK Jun 14, 2024
aeb18d2
UPSTREAM: <carry>: Upgrade DSP go.mod package versions
DharmitD Jun 11, 2024
ea68150
Merge pull request #55 from DharmitD/DSP-snyk-HL
HumairAK Jun 14, 2024
f46e510
UPSTREAM: <carry>: Upgrade go version to 1.21 and go.mod package vers…
DharmitD Jun 11, 2024
dadfb38
Merge pull request #56 from DharmitD/go-version-cve
HumairAK Jun 14, 2024
97153ee
Merge pull request #57 from opendatahub-io/v2.3.x
HumairAK Jun 14, 2024
f98be2c
fix: backend/src/apiserver/visualization/requirements.txt to reduce v…
snyk-bot Jul 9, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-prs-trigger.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Trigger build images for PRs
name: Trigger PR CI
on:
pull_request:
paths-ignore:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-prs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build images for PRs
on:
workflow_run:
workflows: ["Trigger build images for PRs"]
workflows: ["Trigger PR CI"]
types:
- completed
env:
Expand Down
96 changes: 96 additions & 0 deletions .github/workflows/commit-check-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: Commit Checker for PRs
on:
workflow_run:
workflows: ["Trigger PR CI"]
types:
- completed
env:
QUAY_ORG: opendatahub
GH_USER_EMAIL: 140449482+dsp-developers@users.noreply.github.com
GH_USER_NAME: dsp-developers
jobs:
fetch-data:
name: Fetch workflow payload
runs-on: ubuntu-latest
if: >
github.event.workflow_run.event == 'pull_request' &&
github.event.workflow_run.conclusion == 'success'
outputs:
pr_state: ${{ steps.vars.outputs.pr_state }}
pr_number: ${{ steps.vars.outputs.pr_number }}
head_sha: ${{ steps.vars.outputs.head_sha }}
event_action: ${{ steps.vars.outputs.event_action }}
steps:
- name: 'Download artifact'
uses: actions/github-script@v3.1.0
with:
script: |
var artifacts = await github.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: ${{github.event.workflow_run.id }},
});
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
return artifact.name == "pr"
})[0];
var download = await github.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: matchArtifact.id,
archive_format: 'zip',
});
var fs = require('fs');
fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
- run: unzip pr.zip
- shell: bash
id: vars
run: |
pr_number=$(cat ./pr_number)
pr_state=$(cat ./pr_state)
head_sha=$(cat ./head_sha)
event_action=$(cat ./event_action)
echo "pr_number=${pr_number}" >> $GITHUB_OUTPUT
echo "pr_state=${pr_state}" >> $GITHUB_OUTPUT
echo "head_sha=${head_sha}" >> $GITHUB_OUTPUT
echo "event_action=${event_action}" >> $GITHUB_OUTPUT

commit_checker:
name: Run Commit Checker report
runs-on: ubuntu-latest
needs: fetch-data
env:
PR_NUMBER: ${{ needs.fetch-data.outputs.pr_number }}
PR_HASH: ${{ needs.fetch-data.outputs.head_sha }}
steps:
- uses: actions/checkout@v3
- name: Get Commits
id: get-commits
run: |
master_commit=$(cat .git/refs/remotes/origin/master)
echo "master_commit_hash=$master_commit" >> $GITHUB_OUTPUT
echo "last_commit_hash=${{ env.PR_HASH }}" >> $GITHUB_OUTPUT
- name: Run Commit Checker
shell: bash
env:
GH_TOKEN: ${{ secrets.GH_TOKEN_PROJECT_EDIT }}
continue-on-error: true
run: |
git config user.email "${{ env.GH_USER_EMAIL }}"
git config user.name "${{ env.GH_USER_NAME }}"
gh pr checkout ${{ env.PR_NUMBER }}

cat <<"EOF" >> /tmp/body-file.txt
### Commit Checker results:

```
**NOTE**: These are the results of the commit checker scans.
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
```
EOF

echo "\`\`\`" >> /tmp/body-file.txt
podman run -q -v ${{ github.workspace }}:/src/app-root quay.io/rmartine/commitchecker:latest --start ${{ steps.get-commits.outputs.master_commit_hash }} --end ${{ steps.get-commits.outputs.last_commit_hash }} >> /tmp/body-file.txt 2>&1 || true
echo "\`\`\`" >> /tmp/body-file.txt

gh pr comment ${{ env.PR_NUMBER }} --body-file /tmp/body-file.txt
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.20.x'
go-version: '1.21.x'
- name: Run Unit Test
working-directory: ${{ github.workspace }}/backend/src
env:
Expand Down
1 change: 1 addition & 0 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ require (
replace (
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.18
golang.org/x/net => golang.org/x/net v0.17.0
golang.org/x/net v0.17.0 => golang.org/x/net v0.23.0
google.golang.org/grpc => google.golang.org/grpc v1.56.3
)
6 changes: 2 additions & 4 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
# Build arguments
ARG SOURCE_CODE=.

#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder

## Build args to be used at this step
ARG SOURCE_CODE
Expand All @@ -34,8 +33,7 @@ COPY ${SOURCE_CODE}/ ./
RUN GO111MODULE=on go build -o /bin/apiserver ./backend/src/apiserver/ && \
dnf clean all

#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

WORKDIR /bin

Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.cacheserver
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Dockerfile for building the source code of cache_server
FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.21.4-alpine3.17 as builder

RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh gcc musl-dev
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.conformance
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Dockerfile for building the source code of conformance tests
FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.21.4-alpine3.17 as builder

RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh gcc musl-dev
Expand Down
6 changes: 2 additions & 4 deletions backend/Dockerfile.driver
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
ARG SOURCE_CODE=.

# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder


## Build args to be used at this step
Expand All @@ -34,8 +33,7 @@ COPY ${SOURCE_CODE}/ ./

RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/driver ./backend/src/v2/cmd/driver/*.go

#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

WORKDIR /bin

Expand Down
6 changes: 2 additions & 4 deletions backend/Dockerfile.launcher
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ ARG CI_CONTAINER_VERSION="unknown"


# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder


## Build args to be used at this step
Expand All @@ -36,8 +35,7 @@ COPY ${SOURCE_CODE}/ ./

RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-extldflags "-static"' -o /bin/launcher-v2 ./backend/src/v2/cmd/launcher-v2/*.go

#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest

WORKDIR /bin

Expand Down
6 changes: 2 additions & 4 deletions backend/Dockerfile.persistenceagent
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ ARG CI_CONTAINER_VERSION="unknown"


# Use ubi8/go-toolset as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder

## Build args to be used at this step
ARG SOURCE_CODE
Expand All @@ -36,8 +35,7 @@ COPY ${SOURCE_CODE}/ ./

RUN GO111MODULE=on go build -o /bin/persistence_agent backend/src/agent/persistence/*.go

#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.9)
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
WORKDIR /bin

COPY --from=builder /bin/persistence_agent /bin/persistence_agent
Expand Down
6 changes: 2 additions & 4 deletions backend/Dockerfile.scheduledworkflow
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
ARG SOURCE_CODE=.

# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.19)
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder

## Build args to be used at this step
ARG SOURCE_CODE
Expand All @@ -41,8 +40,7 @@ COPY ${SOURCE_CODE}/ ./

RUN GO111MODULE=on go build -o /bin/controller backend/src/crd/controller/scheduledworkflow/*.go

#@follow_tag(registry.access.redhat.com/ubi8/ubi-minimal:8.8)
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
WORKDIR /bin

COPY --from=builder /bin/controller /bin/controller
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.viewercontroller
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.21.4-alpine3.17 as builder

RUN apk update && apk upgrade
RUN apk add --no-cache git gcc musl-dev
Expand Down
3 changes: 3 additions & 0 deletions backend/api/v2beta1/experiment.proto
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ message Experiment {

// Output. Specifies whether this experiment is in archived or available state.
StorageState storage_state = 6;

// Output. The creation time of the last run in this experiment.
google.protobuf.Timestamp last_run_created_at = 7;
}

message CreateExperimentRequest {
Expand Down
Loading
Loading