Skip to content

Commit 61d65ac

Browse files
authored
Merge pull request #23 from kubescape/daily
move versioncheck from kubescape to backend
2 parents 7ff4789 + 1cace43 commit 61d65ac

File tree

7 files changed

+875
-452
lines changed

7 files changed

+875
-452
lines changed

.github/workflows/pr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v4
1818
with:
19-
go-version: '1.20'
19+
go-version: '1.21'
2020

2121
- name: Test race
2222
run: go test -v -race ./...

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Go
1212
uses: actions/setup-go@v4
1313
with:
14-
go-version: '1.20'
14+
go-version: '1.21'
1515

1616
- name: Build
1717
run: go build -v ./...

go.mod

+110-88
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,125 @@
11
module github.com/kubescape/backend
22

3-
go 1.20
3+
go 1.21.1
4+
5+
toolchain go1.21.6
46

57
require (
6-
github.com/armosec/armoapi-go v0.0.254
7-
github.com/armosec/utils-go v0.0.40
8+
github.com/armosec/armoapi-go v0.0.330
9+
github.com/armosec/utils-go v0.0.57
810
github.com/francoispqt/gojay v1.2.13
9-
github.com/google/uuid v1.3.1
11+
github.com/google/uuid v1.6.0
1012
github.com/json-iterator/go v1.1.12
11-
github.com/kubescape/go-logger v0.0.21
12-
github.com/kubescape/opa-utils v0.0.268
13+
github.com/kubescape/go-logger v0.0.22
14+
github.com/kubescape/kubescape/v3 v3.0.4
15+
github.com/kubescape/opa-utils v0.0.278
16+
github.com/mattn/go-isatty v0.0.20
1317
github.com/stretchr/testify v1.8.4
18+
go.opentelemetry.io/otel v1.22.0
19+
golang.org/x/mod v0.15.0
1420
)
1521

1622
require (
17-
cloud.google.com/go/compute v1.23.0 // indirect
23+
cloud.google.com/go/compute v1.23.3 // indirect
1824
cloud.google.com/go/compute/metadata v0.2.3 // indirect
19-
cloud.google.com/go/container v1.24.0 // indirect
20-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
21-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
22-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
25+
cloud.google.com/go/container v1.29.0 // indirect
26+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
27+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
28+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
2329
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization v1.0.0 // indirect
2430
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.1.1 // indirect
2531
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2 v2.4.0 // indirect
26-
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
32+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
2733
github.com/OneOfOne/xxhash v1.2.8 // indirect
2834
github.com/agnivade/levenshtein v1.1.1 // indirect
2935
github.com/armosec/gojay v1.2.15 // indirect
30-
github.com/armosec/utils-k8s-go v0.0.16 // indirect
31-
github.com/aws/aws-sdk-go-v2 v1.19.1 // indirect
32-
github.com/aws/aws-sdk-go-v2/config v1.18.30 // indirect
33-
github.com/aws/aws-sdk-go-v2/credentials v1.13.29 // indirect
34-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.6 // indirect
35-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.36 // indirect
36-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.30 // indirect
37-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.37 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/ecr v1.18.0 // indirect
36+
github.com/armosec/utils-k8s-go v0.0.26 // indirect
37+
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
38+
github.com/aws/aws-sdk-go-v2/config v1.26.6 // indirect
39+
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
40+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
41+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
42+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
43+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
44+
github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 // indirect
3945
github.com/aws/aws-sdk-go-v2/service/eks v1.28.1 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/iam v1.19.0 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.30 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.14 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.14 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/sts v1.20.1 // indirect
45-
github.com/aws/smithy-go v1.13.5 // indirect
46+
github.com/aws/aws-sdk-go-v2/service/iam v1.21.1 // indirect
47+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
52+
github.com/aws/smithy-go v1.19.0 // indirect
4653
github.com/beorn7/perks v1.0.1 // indirect
4754
github.com/briandowns/spinner v1.23.0 // indirect
55+
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4856
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4957
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5058
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
51-
github.com/davecgh/go-spew v1.1.1 // indirect
52-
github.com/docker/docker v24.0.5+incompatible // indirect
53-
github.com/docker/go-connections v0.4.0 // indirect
54-
github.com/docker/go-units v0.5.0 // indirect
55-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
59+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
60+
github.com/docker/docker v25.0.1+incompatible // indirect
61+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5662
github.com/fatih/color v1.15.0 // indirect
57-
github.com/ghodss/yaml v1.0.0 // indirect
63+
github.com/fsnotify/fsnotify v1.7.0 // indirect
64+
github.com/go-gota/gota v0.12.0 // indirect
5865
github.com/go-ini/ini v1.67.0 // indirect
59-
github.com/go-logr/logr v1.2.4 // indirect
66+
github.com/go-logr/logr v1.4.1 // indirect
6067
github.com/go-logr/stdr v1.2.2 // indirect
61-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
62-
github.com/go-openapi/jsonreference v0.20.1 // indirect
63-
github.com/go-openapi/swag v0.22.3 // indirect
68+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
69+
github.com/go-openapi/jsonreference v0.20.4 // indirect
70+
github.com/go-openapi/swag v0.22.9 // indirect
6471
github.com/gobwas/glob v0.2.3 // indirect
6572
github.com/gogo/protobuf v1.3.2 // indirect
66-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
73+
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
6774
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6875
github.com/golang/protobuf v1.5.3 // indirect
69-
github.com/google/gnostic v0.5.7-v3refs // indirect
70-
github.com/google/go-cmp v0.5.9 // indirect
76+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
7177
github.com/google/gofuzz v1.2.0 // indirect
72-
github.com/google/s2a-go v0.1.4 // indirect
73-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
74-
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
75-
github.com/gorilla/mux v1.8.0 // indirect
78+
github.com/google/s2a-go v0.1.7 // indirect
79+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
80+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
81+
github.com/gorilla/mux v1.8.1 // indirect
7682
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
77-
github.com/imdario/mergo v0.3.12 // indirect
83+
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
84+
github.com/imdario/mergo v0.3.16 // indirect
7885
github.com/jmespath/go-jmespath v0.4.0 // indirect
7986
github.com/josharian/intern v1.0.0 // indirect
80-
github.com/kubescape/k8s-interface v0.0.135-0.20230730135750-e6e709507847 // indirect
81-
github.com/kubescape/rbac-utils v0.0.20 // indirect
87+
github.com/kubescape/k8s-interface v0.0.161 // indirect
88+
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 // indirect
89+
github.com/kubescape/regolibrary v1.0.315 // indirect
8290
github.com/kylelemons/godebug v1.1.0 // indirect
91+
github.com/magiconair/properties v1.8.7 // indirect
8392
github.com/mailru/easyjson v0.7.7 // indirect
8493
github.com/mattn/go-colorable v0.1.13 // indirect
85-
github.com/mattn/go-isatty v0.0.19 // indirect
86-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
94+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8795
github.com/mitchellh/mapstructure v1.5.0 // indirect
8896
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8997
github.com/modern-go/reflect2 v1.0.2 // indirect
9098
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
91-
github.com/open-policy-agent/opa v0.55.0 // indirect
99+
github.com/olvrng/ujson v1.1.0 // indirect
100+
github.com/open-policy-agent/opa v0.61.0 // indirect
92101
github.com/opencontainers/go-digest v1.0.0 // indirect
93-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
94-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
102+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
103+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
104+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
95105
github.com/pkg/errors v0.9.1 // indirect
96-
github.com/pmezard/go-difflib v1.0.0 // indirect
106+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
97107
github.com/pquerna/cachecontrol v0.2.0 // indirect
98-
github.com/prometheus/client_golang v1.16.0 // indirect
99-
github.com/prometheus/client_model v0.4.0 // indirect
100-
github.com/prometheus/common v0.42.0 // indirect
101-
github.com/prometheus/procfs v0.10.1 // indirect
102-
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
108+
github.com/prometheus/client_golang v1.18.0 // indirect
109+
github.com/prometheus/client_model v0.5.0 // indirect
110+
github.com/prometheus/common v0.45.0 // indirect
111+
github.com/prometheus/procfs v0.12.0 // indirect
112+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
113+
github.com/sagikazarmark/locafero v0.4.0 // indirect
114+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
103115
github.com/sirupsen/logrus v1.9.3 // indirect
116+
github.com/sourcegraph/conc v0.3.0 // indirect
117+
github.com/spf13/afero v1.11.0 // indirect
118+
github.com/spf13/cast v1.6.0 // indirect
104119
github.com/spf13/pflag v1.0.5 // indirect
120+
github.com/spf13/viper v1.18.2 // indirect
105121
github.com/stripe/stripe-go/v74 v74.28.0 // indirect
122+
github.com/subosito/gotenv v1.6.0 // indirect
106123
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
107124
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.2 // indirect
108125
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.2 // indirect
@@ -111,48 +128,53 @@ require (
111128
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
112129
github.com/yashtewari/glob-intersection v0.2.0 // indirect
113130
go.opencensus.io v0.24.0 // indirect
131+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
114132
go.opentelemetry.io/contrib/instrumentation/runtime v0.44.0 // indirect
115-
go.opentelemetry.io/otel v1.18.0 // indirect
116133
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 // indirect
117134
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
135+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
136+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
120137
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 // indirect
121-
go.opentelemetry.io/otel/metric v1.18.0 // indirect
122-
go.opentelemetry.io/otel/sdk v1.18.0 // indirect
138+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
139+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
123140
go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect
124-
go.opentelemetry.io/otel/trace v1.18.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
125142
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
126143
go.uber.org/multierr v1.11.0 // indirect
127-
go.uber.org/zap v1.26.0 // indirect
128-
golang.org/x/crypto v0.13.0 // indirect
129-
golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect
130-
golang.org/x/net v0.15.0 // indirect
131-
golang.org/x/oauth2 v0.12.0 // indirect
132-
golang.org/x/sync v0.3.0 // indirect
133-
golang.org/x/sys v0.12.0 // indirect
134-
golang.org/x/term v0.12.0 // indirect
135-
golang.org/x/text v0.13.0 // indirect
136-
golang.org/x/time v0.3.0 // indirect
137-
google.golang.org/api v0.126.0 // indirect
138-
google.golang.org/appengine v1.6.7 // indirect
139-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
140-
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
141-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
142-
google.golang.org/grpc v1.58.1 // indirect
143-
google.golang.org/protobuf v1.31.0 // indirect
144+
go.uber.org/zap v1.27.0 // indirect
145+
golang.org/x/crypto v0.19.0 // indirect
146+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
147+
golang.org/x/net v0.21.0 // indirect
148+
golang.org/x/oauth2 v0.16.0 // indirect
149+
golang.org/x/sync v0.6.0 // indirect
150+
golang.org/x/sys v0.17.0 // indirect
151+
golang.org/x/term v0.17.0 // indirect
152+
golang.org/x/text v0.14.0 // indirect
153+
golang.org/x/time v0.5.0 // indirect
154+
gonum.org/v1/gonum v0.9.1 // indirect
155+
google.golang.org/api v0.159.0 // indirect
156+
google.golang.org/appengine v1.6.8 // indirect
157+
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
158+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
160+
google.golang.org/grpc v1.61.0 // indirect
161+
google.golang.org/protobuf v1.32.0 // indirect
144162
gopkg.in/inf.v0 v0.9.1 // indirect
163+
gopkg.in/ini.v1 v1.67.0 // indirect
145164
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
146165
gopkg.in/yaml.v2 v2.4.0 // indirect
147166
gopkg.in/yaml.v3 v3.0.1 // indirect
148-
k8s.io/api v0.27.4 // indirect
149-
k8s.io/apimachinery v0.27.4 // indirect
150-
k8s.io/client-go v0.27.4 // indirect
151-
k8s.io/klog/v2 v2.100.1 // indirect
152-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
167+
k8s.io/api v0.29.2 // indirect
168+
k8s.io/apimachinery v0.29.2 // indirect
169+
k8s.io/client-go v0.29.2 // indirect
170+
k8s.io/klog/v2 v2.110.1 // indirect
171+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
153172
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
154173
sigs.k8s.io/controller-runtime v0.15.0 // indirect
155174
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
156-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
157-
sigs.k8s.io/yaml v1.3.0 // indirect
175+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
176+
sigs.k8s.io/yaml v1.4.0 // indirect
158177
)
178+
179+
// TODO(anubhav06): Remove this once we have a release of copacetic with the support for patching kubescape image scan results.
180+
replace github.com/project-copacetic/copacetic => github.com/anubhav06/copacetic v0.0.0-20230821175613-0a7915a62e10

0 commit comments

Comments
 (0)