Skip to content

Commit 80968a6

Browse files
imilchevimilchev
committed
🧹 fix integration tests
Signed-off-by: Ivan Milchev <ivan@mondoo.com>
1 parent d77a0cf commit 80968a6

File tree

6 files changed

+38
-30
lines changed

6 files changed

+38
-30
lines changed

‎.github/env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
golang-version=1.23.1
1+
golang-version=1.24.3
22
operator-sdk-version=v1.33.0
33
MONDOO_ORG_MRN=//captain.api.mondoo.app/organizations/mondoo-operator-testing
44
MONDOO_GQL_ENDPOINT=https://api.mondoo.com/query

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module go.mondoo.com/mondoo-operator
22

3-
go 1.22.0
3+
go 1.24
44

5-
toolchain go1.22.4
5+
toolchain go1.24.3
66

77
replace go.mondoo.com/cnquery/v11/providers/k8s => github.com/mondoohq/cnquery/providers/k8s v0.0.0-20240730122727-3ad8a202a925
88

@@ -23,11 +23,11 @@ require (
2323
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
2424
github.com/rs/zerolog v1.33.0
2525
github.com/spf13/cobra v1.8.1
26-
github.com/stretchr/testify v1.9.0
26+
github.com/stretchr/testify v1.10.0
2727
go.mondoo.com/cnquery/v11 v11.15.0
2828
go.mondoo.com/cnquery/v11/providers/k8s v0.0.0-00010101000000-000000000000
2929
go.mondoo.com/cnspec/v11 v11.15.0
30-
go.mondoo.com/mondoo-go v0.0.0-20240716062427-ec95d879cbe7
30+
go.mondoo.com/mondoo-go v0.0.0-20250604000435-11732353461f
3131
// pin v0.28.9
3232
k8s.io/api v0.29.5
3333
// pin v0.28.9
@@ -114,7 +114,7 @@ require (
114114
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
115115
github.com/go-git/go-billy/v5 v5.5.0 // indirect
116116
github.com/go-git/go-git/v5 v5.12.0 // indirect
117-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
117+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
118118
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
119119
github.com/go-logr/stdr v1.2.2 // indirect
120120
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -259,7 +259,7 @@ require (
259259
go.uber.org/zap v1.27.0
260260
golang.org/x/crypto v0.25.0 // indirect
261261
golang.org/x/net v0.27.0 // indirect
262-
golang.org/x/oauth2 v0.21.0 // indirect
262+
golang.org/x/oauth2 v0.30.0 // indirect
263263
golang.org/x/sys v0.22.0 // indirect
264264
golang.org/x/term v0.22.0 // indirect
265265
golang.org/x/text v0.16.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXY
348348
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
349349
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
350350
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
351-
github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
352-
github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
351+
github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
352+
github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
353353
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
354354
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
355355
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -865,8 +865,9 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
865865
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
866866
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
867867
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
868-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
869868
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
869+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
870+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
870871
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
871872
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
872873
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
@@ -904,8 +905,8 @@ go.mondoo.com/cnquery/v11 v11.15.0 h1:CFbb5PNy2+Ldxbep/ge3A1bpWdbneZwYrKBS6odFPk
904905
go.mondoo.com/cnquery/v11 v11.15.0/go.mod h1:ZtFx4/48GzOObnhjb/vydx/3r8NRfj9teyXmDpMLUbA=
905906
go.mondoo.com/cnspec/v11 v11.15.0 h1:LFmpsG8zvMAVWXdPdMvn2X4NB7QdcPZmBU/iu8OwE38=
906907
go.mondoo.com/cnspec/v11 v11.15.0/go.mod h1:MgCWdwB4eZJETxxE9ssjZpL2IqRWiPMh8rD/YkY197U=
907-
go.mondoo.com/mondoo-go v0.0.0-20240716062427-ec95d879cbe7 h1:nsTJvZNM+4VNgzsua3IZ2FeDqiQXT7MvaN5ifoy08Uw=
908-
go.mondoo.com/mondoo-go v0.0.0-20240716062427-ec95d879cbe7/go.mod h1:4032UBD0ph9LyhXq5OQmmxkJv37HdAGi34YLWbhnMDA=
908+
go.mondoo.com/mondoo-go v0.0.0-20250604000435-11732353461f h1:v7IXkZbMqUrDPrzfv4ZLmLL4Sb+UJSJ4+opPcHOYW6I=
909+
go.mondoo.com/mondoo-go v0.0.0-20250604000435-11732353461f/go.mod h1:Ih8FsSC1VhLk7F3hS7Ji6nleAi29VMqRb7f555jr6SE=
909910
go.mondoo.com/ranger-rpc v0.6.2 h1:HgPprXOblvF3dOWLTz5si+uKnUyJhuOGH9yr96RDDyc=
910911
go.mondoo.com/ranger-rpc v0.6.2/go.mod h1:4XpBMe2HeSAT1IzqeGZ/ueTfY92Eg3BAHijsls+6qSU=
911912
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -1066,8 +1067,8 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ
10661067
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10671068
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
10681069
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1069-
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
1070-
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
1070+
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
1071+
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
10711072
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
10721073
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
10731074
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎tests/framework/nexus/assets/assets.go‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,27 +60,25 @@ func ListAssetsWithScores(
6060
return nil, err
6161
}
6262

63-
var assetReportQ struct {
64-
AssetReport struct {
65-
AssetReport struct {
66-
ListPolicies struct {
67-
Edges []struct {
68-
Node struct {
69-
Mrn string
70-
Score struct {
71-
Grade string
72-
}
63+
var assetQ struct {
64+
Asset struct {
65+
ListPolicies struct {
66+
Edges []struct {
67+
Node struct {
68+
Mrn string
69+
Score struct {
70+
Grade string
7371
}
7472
}
75-
} `graphql:"listPolicies"`
76-
} `graphql:"... on AssetReport"`
77-
} `graphql:"assetReport(input: $input)"`
73+
}
74+
} `graphql:"listPolicies"`
75+
} `graphql:"asset(mrn: $mrn)"`
7876
}
7977

8078
assetScores := make([]AssetWithScore, len(q.AssetsConnection.Edges))
8179
for i := range q.AssetsConnection.Edges {
8280
a := q.AssetsConnection.Edges[i].Node
83-
err := gqlClient.Query(ctx, &assetReportQ, map[string]interface{}{"input": mondoogql.AssetReportInput{AssetMrn: a.Mrn}})
81+
err := gqlClient.Query(ctx, &assetQ, map[string]interface{}{"mrn": mondoogql.String(a.Mrn)})
8482
if err != nil {
8583
return nil, err
8684
}
@@ -97,7 +95,7 @@ func ListAssetsWithScores(
9795
assetScores[i].Labels[l.Key] = l.Value
9896
}
9997

100-
for _, p := range assetReportQ.AssetReport.AssetReport.ListPolicies.Edges {
98+
for _, p := range assetQ.Asset.ListPolicies.Edges {
10199
assetScores[i].PolicyScores = append(assetScores[i].PolicyScores, PolicyScore{
102100
Mrn: p.Node.Mrn,
103101
Grade: p.Node.Score.Grade,

‎tests/framework/nexus/k8s/integration.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func (p *CiCdProject) ListAssets(ctx context.Context) ([]CiCdJob, error) {
203203
} `graphql:"cicdProjectJobs(input: $input)"`
204204
}
205205
err := p.gqlClient.Query(ctx, &q, map[string]interface{}{
206-
"input": mondoogql.CicdProjectJobsInput{SpaceMrn: p.spaceMrn, ProjectID: p.id},
206+
"input": mondoogql.CicdProjectJobsInput{SpaceMrn: p.spaceMrn, ProjectId: p.id},
207207
"first": mondoogql.Int(100),
208208
})
209209
if err != nil {

‎tests/framework/utils/k8s_helper.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,15 @@ func (k8sh *K8sHelper) CheckForReconciledOperatorVersion(auditConfig *api.Mondoo
748748
func (k8sh *K8sHelper) GetWorkloadNames(ctx context.Context) ([]string, error) {
749749
var names []string
750750

751+
nss := &v1.NamespaceList{}
752+
if err := k8sh.Clientset.List(ctx, nss); err != nil {
753+
return nil, err
754+
}
755+
756+
for _, ns := range nss.Items {
757+
names = append(names, ns.Name)
758+
}
759+
751760
// pods
752761
pods := &v1.PodList{}
753762
if err := k8sh.Clientset.List(ctx, pods); err != nil {

0 commit comments

Comments
 (0)