Skip to content

Commit 5b28ab9

Browse files
authored
Merge branch 'master' into fuzzer-test
2 parents b23de4f + f5f7ac8 commit 5b28ab9

17 files changed

+16800
-7024
lines changed

Diff for: .github/workflows/cifuzz.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: CIFuzz
2+
on: [pull_request]
3+
permissions: {}
4+
jobs:
5+
Fuzzing:
6+
runs-on: ubuntu-latest
7+
permissions:
8+
security-events: write
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
sanitizer: [address]
13+
steps:
14+
- name: Build Fuzzers (${{ matrix.sanitizer }})
15+
id: build
16+
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
17+
with:
18+
oss-fuzz-project-name: 'litmuschaos'
19+
language: go
20+
sanitizer: ${{ matrix.sanitizer }}
21+
- name: Run Fuzzers (${{ matrix.sanitizer }})
22+
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
23+
with:
24+
oss-fuzz-project-name: 'litmuschaos'
25+
language: go
26+
fuzz-seconds: 600
27+
sanitizer: ${{ matrix.sanitizer }}
28+
output-sarif: true
29+
- name: Upload Crash
30+
uses: actions/upload-artifact@v3
31+
if: failure() && steps.build.outcome == 'success'
32+
with:
33+
name: ${{ matrix.sanitizer }}-artifacts
34+
path: ./out/artifacts
35+
- name: Upload Sarif
36+
if: always() && steps.build.outcome == 'success'
37+
uses: github/codeql-action/upload-sarif@v2
38+
with:
39+
# Path to SARIF file relative to the root of the repository
40+
sarif_file: cifuzz-sarif/results.sarif
41+
checkout_path: cifuzz-sarif

Diff for: chaoscenter/graphql/server/go.mod

+16-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/litmuschaos/litmus/chaoscenter/graphql/server
33
go 1.20
44

55
require (
6-
github.com/99designs/gqlgen v0.11.3
6+
github.com/99designs/gqlgen v0.17.42
77
github.com/argoproj/argo-workflows/v3 v3.3.1
88
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
99
github.com/gin-contrib/cors v1.3.1
@@ -21,11 +21,11 @@ require (
2121
github.com/stretchr/testify v1.8.2
2222
github.com/tidwall/gjson v1.14.0
2323
github.com/tidwall/sjson v1.2.4
24-
github.com/vektah/gqlparser/v2 v2.1.0
24+
github.com/vektah/gqlparser/v2 v2.5.10
2525
go.mongodb.org/mongo-driver v1.11.4
2626
golang.org/x/crypto v0.17.0
2727
google.golang.org/grpc v1.44.0
28-
google.golang.org/protobuf v1.28.1
28+
google.golang.org/protobuf v1.30.0
2929
gopkg.in/yaml.v2 v2.4.0
3030
k8s.io/api v0.26.0
3131
k8s.io/apimachinery v0.26.0
@@ -40,7 +40,7 @@ require (
4040
github.com/PuerkitoBio/purell v1.1.1 // indirect
4141
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4242
github.com/acomagu/bufpipe v1.0.3 // indirect
43-
github.com/agnivade/levenshtein v1.0.3 // indirect
43+
github.com/agnivade/levenshtein v1.1.1 // indirect
4444
github.com/bytedance/sonic v1.8.0 // indirect
4545
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
4646
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -64,25 +64,26 @@ require (
6464
github.com/google/gofuzz v1.2.0 // indirect
6565
github.com/googleapis/gnostic v0.5.5 // indirect
6666
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
67-
github.com/hashicorp/golang-lru v0.5.3 // indirect
67+
github.com/hashicorp/golang-lru/v2 v2.0.3 // indirect
6868
github.com/imdario/mergo v0.3.12 // indirect
6969
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7070
github.com/josharian/intern v1.0.0 // indirect
7171
github.com/json-iterator/go v1.1.12 // indirect
7272
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
73-
github.com/klauspost/compress v1.14.2 // indirect
73+
github.com/klauspost/compress v1.17.4 // indirect
7474
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
7575
github.com/leodido/go-urn v1.2.1 // indirect
7676
github.com/mailru/easyjson v0.7.7 // indirect
77-
github.com/mattn/go-isatty v0.0.17 // indirect
77+
github.com/mattn/go-isatty v0.0.19 // indirect
7878
github.com/mitchellh/go-homedir v1.1.0 // indirect
79-
github.com/mitchellh/mapstructure v1.4.3 // indirect
79+
github.com/mitchellh/mapstructure v1.5.0 // indirect
8080
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8181
github.com/modern-go/reflect2 v1.0.2 // indirect
8282
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
8383
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
8484
github.com/pmezard/go-difflib v1.0.0 // indirect
85-
github.com/sergi/go-diff v1.1.0 // indirect
85+
github.com/sergi/go-diff v1.3.1 // indirect
86+
github.com/sosodev/duration v1.1.0 // indirect
8687
github.com/spf13/pflag v1.0.5 // indirect
8788
github.com/stretchr/objx v0.5.0 // indirect
8889
github.com/tidwall/match v1.1.1 // indirect
@@ -95,9 +96,9 @@ require (
9596
github.com/xdg-go/stringprep v1.0.3 // indirect
9697
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
9798
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
98-
golang.org/x/net v0.10.0 // indirect
99+
golang.org/x/net v0.17.0 // indirect
99100
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
100-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
101+
golang.org/x/sync v0.2.0 // indirect
101102
golang.org/x/sys v0.15.0 // indirect
102103
golang.org/x/term v0.15.0 // indirect
103104
golang.org/x/text v0.14.0 // indirect
@@ -140,3 +141,7 @@ replace (
140141
)
141142

142143
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
144+
145+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved
146+
147+
replace vbom.ml/util => github.com/fvbommel/util v0.0.0-20160121211510-db5cfe13f5cc

0 commit comments

Comments
 (0)