Skip to content

Commit 97be334

Browse files
UPSTREAM: <carry>: [DefaultCatalogTests]: Add initial implementation
From: - openshift#320 - openshift#345 - openshift#348 - openshift#347 - openshift#350 - openshift#351 - openshift#355 - openshift#358 NOTE: The commits were squashed but no changes are applied.
1 parent b64dbc9 commit 97be334

File tree

3,898 files changed

+1600864
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,898 files changed

+1600864
-0
lines changed
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Get the directory where this Makefile is, so we can use it below for including
2+
# Include the same Bingo variables used by the project
3+
DIR := $(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
4+
include $(DIR)/../../.bingo/Variables.mk
5+
6+
#SECTION General
7+
8+
# The help target prints out all targets with their descriptions organized
9+
# beneath their categories. The categories are represented by '#SECTION' and the
10+
# target descriptions by '#HELP' or '#EXHELP'. The awk commands is responsible for reading the
11+
# entire set of makefiles included in this invocation, looking for lines of the
12+
# file as xyz: #HELP something, and then pretty-format the target and help. Then,
13+
# if there's a line with #SECTION something, that gets pretty-printed as a category.
14+
# More info on the usage of ANSI control characters for terminal formatting:
15+
# https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters
16+
# More info on the awk command:
17+
# http://linuxcommand.org/lc3_adv_awk.php
18+
# The extended-help target uses '#EXHELP' as the delineator.
19+
20+
.PHONY: help
21+
help: #HELP Display essential help.
22+
@awk 'BEGIN {FS = ":[^#]*#HELP"; printf "\nUsage:\n make \033[36m<target>\033[0m\n\n"} /^[a-zA-Z_0-9-]+:.*#HELP / { printf " \033[36m%-17s\033[0m %s\n", $$1, $$2 } ' $(MAKEFILE_LIST)
23+
24+
#SECTION Tests
25+
26+
.PHONY: test-catalog
27+
test-catalog: #HELP Run the set of tests to validate the quality of catalogs
28+
E2E_GINKGO_OPTS="$(if $(ARTIFACT_DIR),--output-dir='$(ARTIFACT_DIR)') --junit-report junit_e2e.xml" \
29+
go test -count=1 -v ./test/validate/...;
30+
31+
#SECTION Development
32+
33+
.PHONY: verify #HELP To verify the code
34+
verify: tidy fmt vet lint
35+
36+
.PHONY: tidy #HELP Run go mod tidy.
37+
tidy:
38+
go mod tidy
39+
40+
.PHONY: fmt
41+
fmt: #HELP Run go fmt against code.
42+
go fmt ./...
43+
44+
.PHONY: vet
45+
vet: #HELP Run go vet against code.
46+
go vet ./...
47+
48+
.PHONY: lint
49+
lint: $(GOLANGCI_LINT) #HELP Run golangci linter.
50+
$(GOLANGCI_LINT) run
51+
52+
.PHONY: fix-lint
53+
fix-lint: $(GOLANGCI_LINT) #HELP Fix lint issues
54+
$(GOLANGCI_LINT) run --fix
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Default Catalog Consistency
2+
========================
3+
4+
Those tests are used to check the consistency of the default catalogs in OpenShift.
5+
6+
### Running Tests
7+
8+
```bash
9+
make test-catalog
10+
```
11+
12+
### Before Pushing Changes
13+
14+
Before pushing changes to the repository, you should verify that the tests pass.
15+
This can be done by running:
16+
17+
```bash
18+
make verify
19+
```
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
module github/operator-framework-operator-controller/openshift/default-catalog-consistency
2+
3+
go 1.23.4
4+
5+
require (
6+
github.com/containerd/containerd v1.7.26
7+
github.com/containers/image/v5 v5.34.3
8+
github.com/onsi/ginkgo/v2 v2.22.2
9+
github.com/onsi/gomega v1.36.2
10+
github.com/opencontainers/image-spec v1.1.1
11+
github.com/operator-framework/operator-controller v1.2.0
12+
github.com/operator-framework/operator-registry v1.51.0
13+
oras.land/oras-go/v2 v2.5.0
14+
sigs.k8s.io/yaml v1.4.0
15+
)
16+
17+
require (
18+
github.com/BurntSushi/toml v1.5.0 // indirect
19+
github.com/Microsoft/go-winio v0.6.2 // indirect
20+
github.com/Microsoft/hcsshim v0.12.9 // indirect
21+
github.com/VividCortex/ewma v1.2.0 // indirect
22+
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
23+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
24+
github.com/blang/semver/v4 v4.0.0 // indirect
25+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
26+
github.com/containerd/continuity v0.4.4 // indirect
27+
github.com/containerd/errdefs v1.0.0 // indirect
28+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
29+
github.com/containerd/log v0.1.0 // indirect
30+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
31+
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
32+
github.com/containers/ocicrypt v1.2.1 // indirect
33+
github.com/containers/storage v1.58.0 // indirect
34+
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
35+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
36+
github.com/distribution/reference v0.6.0 // indirect
37+
github.com/docker/distribution v2.8.3+incompatible // indirect
38+
github.com/docker/docker v28.1.0+incompatible // indirect
39+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
40+
github.com/docker/go-connections v0.5.0 // indirect
41+
github.com/docker/go-units v0.5.0 // indirect
42+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
43+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
44+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
45+
github.com/go-git/go-git/v5 v5.16.0 // indirect
46+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
47+
github.com/go-logr/logr v1.4.2 // indirect
48+
github.com/go-openapi/analysis v0.23.0 // indirect
49+
github.com/go-openapi/errors v0.22.1 // indirect
50+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
51+
github.com/go-openapi/jsonreference v0.21.0 // indirect
52+
github.com/go-openapi/loads v0.22.0 // indirect
53+
github.com/go-openapi/runtime v0.28.0 // indirect
54+
github.com/go-openapi/spec v0.21.0 // indirect
55+
github.com/go-openapi/strfmt v0.23.0 // indirect
56+
github.com/go-openapi/swag v0.23.1 // indirect
57+
github.com/go-openapi/validate v0.24.0 // indirect
58+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
59+
github.com/gogo/protobuf v1.3.2 // indirect
60+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
61+
github.com/golang/protobuf v1.5.4 // indirect
62+
github.com/google/gnostic-models v0.6.9 // indirect
63+
github.com/google/go-cmp v0.7.0 // indirect
64+
github.com/google/go-containerregistry v0.20.3 // indirect
65+
github.com/google/gofuzz v1.2.0 // indirect
66+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
67+
github.com/google/uuid v1.6.0 // indirect
68+
github.com/gorilla/mux v1.8.1 // indirect
69+
github.com/h2non/filetype v1.1.3 // indirect
70+
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
71+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
72+
github.com/joelanford/ignore v0.1.1 // indirect
73+
github.com/josharian/intern v1.0.0 // indirect
74+
github.com/json-iterator/go v1.1.12 // indirect
75+
github.com/klauspost/compress v1.18.0 // indirect
76+
github.com/klauspost/pgzip v1.2.6 // indirect
77+
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
78+
github.com/mailru/easyjson v0.9.0 // indirect
79+
github.com/mattn/go-runewidth v0.0.16 // indirect
80+
github.com/mattn/go-sqlite3 v1.14.27 // indirect
81+
github.com/miekg/pkcs11 v1.1.1 // indirect
82+
github.com/mitchellh/mapstructure v1.5.0 // indirect
83+
github.com/moby/sys/capability v0.4.0 // indirect
84+
github.com/moby/sys/mountinfo v0.7.2 // indirect
85+
github.com/moby/sys/sequential v0.5.0 // indirect
86+
github.com/moby/sys/user v0.4.0 // indirect
87+
github.com/moby/sys/userns v0.1.0 // indirect
88+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
89+
github.com/modern-go/reflect2 v1.0.2 // indirect
90+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
91+
github.com/oklog/ulid v1.3.1 // indirect
92+
github.com/opencontainers/go-digest v1.0.0 // indirect
93+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
94+
github.com/operator-framework/api v0.30.0 // indirect
95+
github.com/pkg/errors v0.9.1 // indirect
96+
github.com/proglottis/gpgme v0.1.4 // indirect
97+
github.com/rivo/uniseg v0.4.7 // indirect
98+
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
99+
github.com/sigstore/fulcio v1.6.6 // indirect
100+
github.com/sigstore/protobuf-specs v0.4.1 // indirect
101+
github.com/sigstore/rekor v1.3.10 // indirect
102+
github.com/sigstore/sigstore v1.9.3 // indirect
103+
github.com/sirupsen/logrus v1.9.3 // indirect
104+
github.com/smallstep/pkcs7 v0.1.1 // indirect
105+
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
106+
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
107+
github.com/ulikunitz/xz v0.5.12 // indirect
108+
github.com/vbatts/tar-split v0.12.1 // indirect
109+
github.com/vbauerster/mpb/v8 v8.9.3 // indirect
110+
github.com/x448/float16 v0.8.4 // indirect
111+
go.mongodb.org/mongo-driver v1.14.0 // indirect
112+
go.opencensus.io v0.24.0 // indirect
113+
golang.org/x/crypto v0.37.0 // indirect
114+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
115+
golang.org/x/net v0.39.0 // indirect
116+
golang.org/x/oauth2 v0.29.0 // indirect
117+
golang.org/x/sync v0.13.0 // indirect
118+
golang.org/x/sys v0.32.0 // indirect
119+
golang.org/x/term v0.31.0 // indirect
120+
golang.org/x/text v0.24.0 // indirect
121+
golang.org/x/time v0.11.0 // indirect
122+
golang.org/x/tools v0.32.0 // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
125+
google.golang.org/grpc v1.71.0 // indirect
126+
google.golang.org/protobuf v1.36.6 // indirect
127+
gopkg.in/inf.v0 v0.9.1 // indirect
128+
gopkg.in/warnings.v0 v0.1.2 // indirect
129+
gopkg.in/yaml.v3 v3.0.1 // indirect
130+
k8s.io/api v0.32.3 // indirect
131+
k8s.io/apimachinery v0.32.3 // indirect
132+
k8s.io/client-go v0.32.3 // indirect
133+
k8s.io/klog/v2 v2.130.1 // indirect
134+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
135+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
136+
sigs.k8s.io/controller-runtime v0.20.4 // indirect
137+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
138+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
139+
)

0 commit comments

Comments
 (0)