Skip to content

Commit e3adec7

Browse files
aalexandruaalexand
aalexandru
and
aalexand
authored
Fix ChargedBack field marshaling issue (#257)
* Fix ChargedBack field marshaling issue * Update ChargedBack values in tests * Add missing import --------- Co-authored-by: aalexand <[email protected]>
1 parent 90bcbf8 commit e3adec7

File tree

7 files changed

+64
-81
lines changed

7 files changed

+64
-81
lines changed

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/swaggo/echo-swagger v1.4.1
2828
github.com/swaggo/swag v1.16.3
2929
github.com/testcontainers/testcontainers-go v0.33.0
30-
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
30+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
3131
golang.org/x/net v0.29.0
3232
gopkg.in/go-playground/validator.v9 v9.31.0
3333
gopkg.in/yaml.v2 v2.4.0
@@ -52,12 +52,10 @@ require (
5252
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
5353
github.com/KyleBanks/depth v1.2.1 // indirect
5454
github.com/Microsoft/go-winio v0.6.2 // indirect
55-
github.com/Microsoft/hcsshim v0.11.5 // indirect
5655
github.com/beorn7/perks v1.0.1 // indirect
5756
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5857
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5958
github.com/containerd/containerd v1.7.18 // indirect
60-
github.com/containerd/errdefs v0.1.0 // indirect
6159
github.com/containerd/log v0.1.0 // indirect
6260
github.com/containerd/platforms v0.2.1 // indirect
6361
github.com/cpuguy83/dockercfg v0.3.1 // indirect
@@ -116,6 +114,7 @@ require (
116114
github.com/morikuni/aec v1.0.0 // indirect
117115
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
118116
github.com/nxadm/tail v1.4.8 // indirect
117+
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
119118
github.com/opencontainers/go-digest v1.0.0 // indirect
120119
github.com/opencontainers/image-spec v1.1.0 // indirect
121120
github.com/pkg/errors v0.9.1 // indirect
@@ -135,23 +134,24 @@ require (
135134
github.com/valyala/fasttemplate v1.2.2 // indirect
136135
github.com/x448/float16 v0.8.4 // indirect
137136
github.com/yusufpapurcu/wmi v1.2.3 // indirect
138-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
139-
go.opentelemetry.io/otel v1.28.0 // indirect
140-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
141-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
137+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
138+
go.opentelemetry.io/otel v1.29.0 // indirect
139+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
140+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
142141
go.uber.org/multierr v1.11.0 // indirect
143142
go.uber.org/zap v1.26.0 // indirect
144143
golang.org/x/crypto v0.27.0 // indirect
145-
golang.org/x/oauth2 v0.21.0 // indirect
144+
golang.org/x/oauth2 v0.23.0 // indirect
146145
golang.org/x/sync v0.8.0 // indirect
147146
golang.org/x/sys v0.25.0 // indirect
148147
golang.org/x/term v0.24.0 // indirect
149148
golang.org/x/text v0.18.0 // indirect
150-
golang.org/x/time v0.5.0 // indirect
151-
golang.org/x/tools v0.24.0 // indirect
149+
golang.org/x/time v0.6.0 // indirect
150+
golang.org/x/tools v0.25.0 // indirect
152151
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
153-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
154-
google.golang.org/grpc v1.65.0 // indirect
152+
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
153+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
154+
google.golang.org/grpc v1.66.2 // indirect
155155
google.golang.org/protobuf v1.34.2 // indirect
156156
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
157157
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect

‎go.sum‎

Lines changed: 26 additions & 51 deletions
Large diffs are not rendered by default.

‎pkg/api/registry/v1/cluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type ClusterSpec struct {
5959
ChargebackBusinessUnit string `json:"chargebackBusinessUnit,omitempty"`
6060

6161
// Whether the cluster is charged back to the chargebackBusinessUnit
62-
ChargedBack bool `json:"chargedBack,omitempty"`
62+
ChargedBack *bool `json:"chargedBack,omitempty"`
6363

6464
// The Org that is responsible for the cluster operations
6565
// +kubebuilder:validation:Required

‎pkg/api/registry/v1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/controllers/cluster_controller_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package controllers
1414

1515
import (
1616
"context"
17+
"k8s.io/utils/ptr"
1718
"time"
1819

1920
registryv1 "github.com/adobe/cluster-registry/pkg/api/registry/v1"
@@ -75,7 +76,7 @@ var _ = Describe("Cluster Controller", func() {
7576
Environment: "Prod",
7677
BusinessUnit: "BU1",
7778
ChargebackBusinessUnit: "BU1",
78-
ChargedBack: true,
79+
ChargedBack: ptr.To(true),
7980
Offering: []registryv1.Offering{},
8081
AccountID: "",
8182
Tiers: []registryv1.Tier{},

‎pkg/client/webhook/webhook_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
28+
"k8s.io/utils/ptr"
2829
"net/http"
2930
"net/http/httptest"
3031
ctrl "sigs.k8s.io/controller-runtime"
@@ -190,7 +191,7 @@ var _ = Describe("Webhook Server", func() {
190191
Environment: "Prod",
191192
BusinessUnit: "BU1",
192193
ChargebackBusinessUnit: "BU1",
193-
ChargedBack: true,
194+
ChargedBack: ptr.To(true),
194195
Offering: []registryv1.Offering{},
195196
AccountID: "",
196197
Tiers: []registryv1.Tier{},

‎pkg/database/database_test.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package database
1515
import (
1616
"fmt"
1717
"github.com/adobe/cluster-registry/pkg/apiserver/models"
18+
"k8s.io/utils/ptr"
1819
"sort"
1920

2021
registryv1 "github.com/adobe/cluster-registry/pkg/api/registry/v1"
@@ -101,7 +102,7 @@ var _ = Describe("Database Suite", func() {
101102
Environment: "Prod",
102103
BusinessUnit: "BU1",
103104
ChargebackBusinessUnit: "BU1",
104-
ChargedBack: true,
105+
ChargedBack: ptr.To(true),
105106
Offering: []registryv1.Offering{"caas", "paas"},
106107
AccountID: "11111-2222-3333-4444-555555555",
107108
Tiers: []registryv1.Tier{
@@ -439,7 +440,7 @@ var _ = Describe("Database Suite", func() {
439440
Environment: "Prod",
440441
BusinessUnit: "BU1",
441442
ChargebackBusinessUnit: "BU1",
442-
ChargedBack: true,
443+
ChargedBack: ptr.To(true),
443444
Offering: []registryv1.Offering{"caas", "paas"},
444445
AccountID: "11111-2222-3333-4444-555555555",
445446
Tiers: []registryv1.Tier{
@@ -533,7 +534,7 @@ var _ = Describe("Database Suite", func() {
533534
Environment: "Prod",
534535
BusinessUnit: "BU2",
535536
ChargebackBusinessUnit: "BU2",
536-
ChargedBack: false,
537+
ChargedBack: ptr.To(false),
537538
Offering: []registryv1.Offering{"caas", "paas"},
538539
AccountID: "11111-2222-3333-4444-55555555",
539540
Tiers: []registryv1.Tier{
@@ -604,7 +605,7 @@ var _ = Describe("Database Suite", func() {
604605
Environment: "Prod",
605606
BusinessUnit: "BU1",
606607
ChargebackBusinessUnit: "BU1",
607-
ChargedBack: true,
608+
ChargedBack: ptr.To(true),
608609
Offering: []registryv1.Offering{"paas"},
609610
AccountID: "12345678",
610611
Tiers: []registryv1.Tier{
@@ -701,7 +702,7 @@ var _ = Describe("Database Suite", func() {
701702
Environment: "Prod",
702703
BusinessUnit: "BU1",
703704
ChargebackBusinessUnit: "BU1",
704-
ChargedBack: true,
705+
ChargedBack: ptr.To(true),
705706
Offering: []registryv1.Offering{"caas", "paas"},
706707
AccountID: "11111-2222-3333-4444-555555555",
707708
Tiers: []registryv1.Tier{
@@ -811,7 +812,7 @@ var _ = Describe("Database Suite", func() {
811812
Environment: "Prod",
812813
BusinessUnit: "BU2",
813814
ChargebackBusinessUnit: "BU2",
814-
ChargedBack: false,
815+
ChargedBack: ptr.To(false),
815816
Offering: []registryv1.Offering{"caas", "paas"},
816817
AccountID: "11111-2222-3333-4444-55555555",
817818
Tiers: []registryv1.Tier{
@@ -946,7 +947,7 @@ var _ = Describe("Database Suite", func() {
946947
Environment: "Prod",
947948
BusinessUnit: "BU1",
948949
ChargebackBusinessUnit: "BU1",
949-
ChargedBack: true,
950+
ChargedBack: ptr.To(true),
950951
Offering: []registryv1.Offering{"caas", "paas"},
951952
AccountID: "11111-2222-3333-4444-555555555",
952953
Tiers: []registryv1.Tier{
@@ -1040,7 +1041,7 @@ var _ = Describe("Database Suite", func() {
10401041
Environment: "Prod",
10411042
BusinessUnit: "BU2",
10421043
ChargebackBusinessUnit: "BU2",
1043-
ChargedBack: false,
1044+
ChargedBack: ptr.To(false),
10441045
Offering: []registryv1.Offering{"caas", "paas"},
10451046
AccountID: "11111-2222-3333-4444-55555555",
10461047
Tiers: []registryv1.Tier{
@@ -1111,7 +1112,7 @@ var _ = Describe("Database Suite", func() {
11111112
Environment: "Prod",
11121113
BusinessUnit: "BU1",
11131114
ChargebackBusinessUnit: "BU1",
1114-
ChargedBack: true,
1115+
ChargedBack: ptr.To(true),
11151116
Offering: []registryv1.Offering{"paas"},
11161117
AccountID: "12345678",
11171118
Tiers: []registryv1.Tier{
@@ -1188,7 +1189,7 @@ var _ = Describe("Database Suite", func() {
11881189
Environment: "Prod",
11891190
BusinessUnit: "BU1",
11901191
ChargebackBusinessUnit: "BU1",
1191-
ChargedBack: true,
1192+
ChargedBack: ptr.To(true),
11921193
Offering: []registryv1.Offering{"caas", "paas"},
11931194
AccountID: "11111-2222-3333-4444-555555555",
11941195
Tiers: []registryv1.Tier{
@@ -1282,7 +1283,7 @@ var _ = Describe("Database Suite", func() {
12821283
Environment: "Prod",
12831284
BusinessUnit: "BU2",
12841285
ChargebackBusinessUnit: "BU2",
1285-
ChargedBack: false,
1286+
ChargedBack: ptr.To(false),
12861287
Offering: []registryv1.Offering{"caas", "paas"},
12871288
AccountID: "11111-2222-3333-4444-55555555",
12881289
Tiers: []registryv1.Tier{
@@ -1364,7 +1365,7 @@ var _ = Describe("Database Suite", func() {
13641365
Environment: "Prod",
13651366
BusinessUnit: "BU1",
13661367
ChargebackBusinessUnit: "BU1",
1367-
ChargedBack: true,
1368+
ChargedBack: ptr.To(true),
13681369
Offering: []registryv1.Offering{"caas", "paas"},
13691370
AccountID: "11111-2222-3333-4444-555555555",
13701371
Tiers: []registryv1.Tier{
@@ -1458,7 +1459,7 @@ var _ = Describe("Database Suite", func() {
14581459
Environment: "Prod",
14591460
BusinessUnit: "BU1",
14601461
ChargebackBusinessUnit: "BU1",
1461-
ChargedBack: true,
1462+
ChargedBack: ptr.To(true),
14621463
Offering: []registryv1.Offering{"paas"},
14631464
AccountID: "12345678",
14641465
Tiers: []registryv1.Tier{
@@ -1538,7 +1539,7 @@ var _ = Describe("Database Suite", func() {
15381539
Environment: "Prod",
15391540
BusinessUnit: "BU1",
15401541
ChargebackBusinessUnit: "BU1",
1541-
ChargedBack: true,
1542+
ChargedBack: ptr.To(true),
15421543
Offering: []registryv1.Offering{"caas", "paas"},
15431544
AccountID: "11111-2222-3333-4444-555555555",
15441545
Tiers: []registryv1.Tier{
@@ -1632,7 +1633,7 @@ var _ = Describe("Database Suite", func() {
16321633
Environment: "Prod",
16331634
BusinessUnit: "BU2",
16341635
ChargebackBusinessUnit: "BU2",
1635-
ChargedBack: false,
1636+
ChargedBack: ptr.To(false),
16361637
Offering: []registryv1.Offering{"caas", "paas"},
16371638
AccountID: "11111-2222-3333-4444-55555555",
16381639
Tiers: []registryv1.Tier{

0 commit comments

Comments
 (0)