From 13e42c195abb99c54172c27ae782a87b1fb86638 Mon Sep 17 00:00:00 2001 From: gergely-szabo-sap Date: Thu, 12 Mar 2026 12:52:14 +0100 Subject: [PATCH] chore(deps): update xp-clifford to v0.0.0-20260312105548-6c739d63b4f1 --- cmd/exporter/cf/orgrole/orgrole.go | 2 +- cmd/exporter/cf/spacerole/spacerole.go | 2 +- cmd/exporter/cf/userrole/userrole.go | 22 +++++++++++----------- config.nix | 3 ++- go.mod | 6 +++--- go.sum | 24 ++++++++++++------------ 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmd/exporter/cf/orgrole/orgrole.go b/cmd/exporter/cf/orgrole/orgrole.go index affa8f34..2295c09d 100644 --- a/cmd/exporter/cf/orgrole/orgrole.go +++ b/cmd/exporter/cf/orgrole/orgrole.go @@ -41,7 +41,7 @@ func (om orgRole) Export(ctx context.Context, cfClient *client.Client, evHandler evHandler.Warn(erratt.New("no orgrole found")) } else { for _, orgRole := range orgRoles.AllByGUIDs() { - evHandler.Resource(convertOrgRoleResource(ctx, cfClient, orgRole.(*userrole.Role), evHandler, resolveReferences)) + evHandler.Resource(convertOrgRoleResource(ctx, cfClient, orgRole, evHandler, resolveReferences)) } } return nil diff --git a/cmd/exporter/cf/spacerole/spacerole.go b/cmd/exporter/cf/spacerole/spacerole.go index d756772a..538c8e70 100644 --- a/cmd/exporter/cf/spacerole/spacerole.go +++ b/cmd/exporter/cf/spacerole/spacerole.go @@ -42,7 +42,7 @@ func (sr spaceRole) Export(ctx context.Context, cfClient *client.Client, evHandl evHandler.Warn(erratt.New("no spacerole found")) } else { for _, spaceRole := range spaceRoles.AllByGUIDs() { - evHandler.Resource(convertSpaceRoleResource(ctx, cfClient, spaceRole.(*userrole.Role), evHandler, resolveReferences)) + evHandler.Resource(convertSpaceRoleResource(ctx, cfClient, spaceRole, evHandler, resolveReferences)) } } return nil diff --git a/cmd/exporter/cf/userrole/userrole.go b/cmd/exporter/cf/userrole/userrole.go index eba3574b..11650c62 100644 --- a/cmd/exporter/cf/userrole/userrole.go +++ b/cmd/exporter/cf/userrole/userrole.go @@ -17,8 +17,8 @@ import ( ) var ( - roleCache mkcontainer.Container - userCache mkcontainer.Container + roleCache mkcontainer.TypedContainer[*Role] + userCache mkcontainer.TypedContainer[*user] ) const defaultUserName = "undefined username" @@ -73,7 +73,7 @@ func (r *Role) GetName() string { return name } -func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Container, mkcontainer.Container, error) { +func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.TypedContainer[*Role], mkcontainer.TypedContainer[*user], error) { if userCache != nil || roleCache != nil { return roleCache, userCache, nil } @@ -89,14 +89,14 @@ func GetOrgRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Cont if err != nil { return nil, nil, erratt.Errorf("cannot get roles and users: %w", err) } - roleCache = mkcontainer.New() - userCache = mkcontainer.New() + roleCache = mkcontainer.NewTyped[*Role]() + userCache = mkcontainer.NewTyped[*user]() roleCache.Store(roles...) userCache.Store(users...) return roleCache, userCache, nil } -func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Container, mkcontainer.Container, error) { +func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.TypedContainer[*Role], mkcontainer.TypedContainer[*user], error) { if userCache != nil || roleCache != nil { return roleCache, userCache, nil } @@ -118,14 +118,14 @@ func GetSpaceRoles(ctx context.Context, cfClient *client.Client) (mkcontainer.Co if err != nil { return nil, nil, erratt.Errorf("cannot get roles and users: %w", err) } - roleCache = mkcontainer.New() - userCache = mkcontainer.New() + roleCache = mkcontainer.NewTyped[*Role]() + userCache = mkcontainer.NewTyped[*user]() roleCache.Store(roles...) userCache.Store(users...) return roleCache, userCache, nil } -func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spaceGuids []string) ([]mkcontainer.Item, []mkcontainer.Item, error) { +func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spaceGuids []string) ([]*Role, []*user, error) { listOptions := client.NewRoleListOptions() listOptions.OrganizationGUIDs.EqualTo(orgGuids...) listOptions.SpaceGUIDs.EqualTo(spaceGuids...) @@ -134,8 +134,8 @@ func getAll(ctx context.Context, cfClient *client.Client, orgGuids []string, spa return nil, nil, err } - roleResults := make([]mkcontainer.Item, len(roles)) - userResults := make([]mkcontainer.Item, len(users)) + roleResults := make([]*Role, len(roles)) + userResults := make([]*user, len(users)) userGUIDMap := map[string]*resource.User{} for i, u := range users { diff --git a/config.nix b/config.nix index 022beeeb..269219a4 100644 --- a/config.nix +++ b/config.nix @@ -3,7 +3,8 @@ exporter-cli = { name = "xpcf"; version = "0.0.1-alpha1"; - vendorHash = "sha256-HiWXSvLwRzt1/wMl2LQfwrBPoRpsl5E3TsN/1N0PGWs="; + vendorHash = "sha256-9JX69YJXrDAXoaBxITvkBTMLr/nlLYGEG1DV4Vswu8Q="; + # vendorHash = lib.fakeHash; meta = { description = "xpcf is a CLI tool for exporting existing resources as Crossplane managed resources"; homepage = "https://github.com/SAP/crossplane-provider-cloudfoundry"; diff --git a/go.mod b/go.mod index 2ef0d7eb..6f89220c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/SAP/crossplane-provider-cloudfoundry go 1.24.10 require ( - github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e + github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1 github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.12 github.com/crossplane-contrib/xp-testing v1.9.0 github.com/crossplane/crossplane-runtime v1.20.0 @@ -156,13 +156,13 @@ require ( github.com/vbatts/tar-split v0.11.5 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/mod v0.32.0 // indirect + golang.org/x/mod v0.33.0 // indirect golang.org/x/net v0.49.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.19.0 // indirect golang.org/x/sys v0.40.0 // indirect golang.org/x/term v0.39.0 // indirect - golang.org/x/text v0.33.0 // indirect + golang.org/x/text v0.34.0 // indirect golang.org/x/time v0.9.0 // indirect golang.org/x/tools v0.41.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 46a312d6..fe3f8c1d 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e h1:RXvWGonwppAxSMUpVQYQegKM3UtuDGx6XJxxOa8SCgA= -github.com/SAP/xp-clifford v0.0.0-20260202115841-f2ef82b7144e/go.mod h1:Lqf+X8dX0Teg4Y9CJvsEpRYQn1B1KOfAA6HXU6dUOgg= +github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1 h1:sO2PQvMR971Aav3UYDh7dsGVUKW75H52Kue2CBtUeUM= +github.com/SAP/xp-clifford v0.0.0-20260312105548-6c739d63b4f1/go.mod h1:HP/zE+opVZtQIOm5sTG7cy916KDqlW9lW5wzaJFBE3w= github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE= github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= 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 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= +github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc h1:VBbFa1lDYWEeV5FZKUiYKYT0VxCp9twUmmaq9eb8sXw= +github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= @@ -260,10 +260,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE= -github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= -github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= -github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= +github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI= +github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= +github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q= +github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= 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 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= +golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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= golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= -golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= +golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=