Skip to content

Commit 3450245

Browse files
AndresNicoAndresNico
authored
Merge branch 'main' into feat/upgrade-test-batch-2-resources
2 parents e9b60f1 + fefedd3 commit 3450245

6 files changed

Lines changed: 30 additions & 29 deletions

File tree

‎cmd/exporter/cf/orgrole/orgrole.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (om orgRole) Export(ctx context.Context, cfClient *client.Client, evHandler
4141
evHandler.Warn(erratt.New("no orgrole found"))
4242
} else {
4343
for _, orgRole := range orgRoles.AllByGUIDs() {
44-
evHandler.Resource(convertOrgRoleResource(ctx, cfClient, orgRole.(*userrole.Role), evHandler, resolveReferences))
44+
evHandler.Resource(convertOrgRoleResource(ctx, cfClient, orgRole, evHandler, resolveReferences))
4545
}
4646
}
4747
return nil

‎cmd/exporter/cf/spacerole/spacerole.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (sr spaceRole) Export(ctx context.Context, cfClient *client.Client, evHandl
4242
evHandler.Warn(erratt.New("no spacerole found"))
4343
} else {
4444
for _, spaceRole := range spaceRoles.AllByGUIDs() {
45-
evHandler.Resource(convertSpaceRoleResource(ctx, cfClient, spaceRole.(*userrole.Role), evHandler, resolveReferences))
45+
evHandler.Resource(convertSpaceRoleResource(ctx, cfClient, spaceRole, evHandler, resolveReferences))
4646
}
4747
}
4848
return nil

‎cmd/exporter/cf/userrole/userrole.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
)
1818

1919
var (
20-
roleCache mkcontainer.Container
21-
userCache mkcontainer.Container
20+
roleCache mkcontainer.TypedContainer[*Role]
21+
userCache mkcontainer.TypedContainer[*user]
2222
)
2323

2424
const defaultUserName = "undefined username"
@@ -73,7 +73,7 @@ func (r *Role) GetName() string {
7373
return name
7474
}
7575

76-
func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Container, mkcontainer.Container, error) {
76+
func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.TypedContainer[*Role], mkcontainer.TypedContainer[*user], error) {
7777
if userCache != nil || roleCache != nil {
7878
return roleCache, userCache, nil
7979
}
@@ -89,14 +89,14 @@ func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Cont
8989
if err != nil {
9090
return nil, nil, erratt.Errorf("cannot get roles and users: %w", err)
9191
}
92-
roleCache = mkcontainer.New()
93-
userCache = mkcontainer.New()
92+
roleCache = mkcontainer.NewTyped[*Role]()
93+
userCache = mkcontainer.NewTyped[*user]()
9494
roleCache.Store(roles...)
9595
userCache.Store(users...)
9696
return roleCache, userCache, nil
9797
}
9898

99-
func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Container, mkcontainer.Container, error) {
99+
func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.TypedContainer[*Role], mkcontainer.TypedContainer[*user], error) {
100100
if userCache != nil || roleCache != nil {
101101
return roleCache, userCache, nil
102102
}
@@ -118,14 +118,14 @@ func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Co
118118
if err != nil {
119119
return nil, nil, erratt.Errorf("cannot get roles and users: %w", err)
120120
}
121-
roleCache = mkcontainer.New()
122-
userCache = mkcontainer.New()
121+
roleCache = mkcontainer.NewTyped[*Role]()
122+
userCache = mkcontainer.NewTyped[*user]()
123123
roleCache.Store(roles...)
124124
userCache.Store(users...)
125125
return roleCache, userCache, nil
126126
}
127127

128-
func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spaceGuids []string) ([]mkcontainer.Item, []mkcontainer.Item, error) {
128+
func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spaceGuids []string) ([]*Role, []*user, error) {
129129
listOptions := client.NewRoleListOptions()
130130
listOptions.OrganizationGUIDs.EqualTo(orgGuids...)
131131
listOptions.SpaceGUIDs.EqualTo(spaceGuids...)
@@ -134,8 +134,8 @@ func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spa
134134
return nil, nil, err
135135
}
136136

137-
roleResults := make([]mkcontainer.Item, len(roles))
138-
userResults := make([]mkcontainer.Item, len(users))
137+
roleResults := make([]*Role, len(roles))
138+
userResults := make([]*user, len(users))
139139
userGUIDMap := map[string]*resource.User{}
140140

141141
for i, u := range users {

‎config.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
exporter-cli = {
44
name = "xpcf";
55
version = "0.0.1-alpha1";
6-
vendorHash = "sha256-HiWXSvLwRzt1/wMl2LQfwrBPoRpsl5E3TsN/1N0PGWs=";
6+
vendorHash = "sha256-9JX69YJXrDAXoaBxITvkBTMLr/nlLYGEG1DV4Vswu8Q=";
7+
# vendorHash = lib.fakeHash;
78
meta = {
89
description = "xpcf is a CLI tool for exporting existing resources as Crossplane managed resources";
910
homepage = "https://github.com/SAP/crossplane-provider-cloudfoundry";

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/SAP/crossplane-provider-cloudfoundry
33
go 1.24.10
44

55
require (
6-
github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e
6+
github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1
77
github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.12
88
github.com/crossplane-contrib/xp-testing v1.9.0
99
github.com/crossplane/crossplane-runtime v1.20.0
@@ -156,13 +156,13 @@ require (
156156
github.com/vbatts/tar-split v0.11.5 // indirect
157157
go.uber.org/multierr v1.11.0 // indirect
158158
go.uber.org/zap v1.27.0 // indirect
159-
golang.org/x/mod v0.32.0 // indirect
159+
golang.org/x/mod v0.33.0 // indirect
160160
golang.org/x/net v0.49.0 // indirect
161161
golang.org/x/oauth2 v0.30.0 // indirect
162162
golang.org/x/sync v0.19.0 // indirect
163163
golang.org/x/sys v0.40.0 // indirect
164164
golang.org/x/term v0.39.0 // indirect
165-
golang.org/x/text v0.33.0 // indirect
165+
golang.org/x/text v0.34.0 // indirect
166166
golang.org/x/time v0.9.0 // indirect
167167
golang.org/x/tools v0.41.0 // indirect
168168
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
88
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
99
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
1010
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
11-
github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e h1:RXvWGonwppAxSMUpVQYQegKM3UtuDGx6XJxxOa8SCgA=
12-
github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e/go.mod h1:Lqf+X8dX0Teg4Y9CJvsEpRYQn1B1KOfAA6HXU6dUOgg=
11+
github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1 h1:sO2PQvMR971Aav3UYDh7dsGVUKW75H52Kue2CBtUeUM=
12+
github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1/go.mod h1:HP/zE+opVZtQIOm5sTG7cy916KDqlW9lW5wzaJFBE3w=
1313
github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
1414
github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
1515
github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
@@ -177,8 +177,8 @@ github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEva
177177
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
178178
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
179179
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
180-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
181-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
180+
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc h1:VBbFa1lDYWEeV5FZKUiYKYT0VxCp9twUmmaq9eb8sXw=
181+
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
182182
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
183183
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
184184
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
@@ -260,10 +260,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
260260
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
261261
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
262262
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
263-
github.com/onsi/ginkgo/v2 v2.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE=
264-
github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
265-
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
266-
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
263+
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
264+
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
265+
github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
266+
github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
267267
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
268268
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
269269
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
@@ -380,8 +380,8 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
380380
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
381381
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
382382
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
383-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
384-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
383+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
384+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
385385
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
386386
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
387387
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -408,8 +408,8 @@ golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
408408
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
409409
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
410410
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
411-
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
412-
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
411+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
412+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
413413
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
414414
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
415415
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)