Skip to content

Fix ChargedBack field marshaling issue #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2024
+64 −81
Merged

Fix ChargedBack field marshaling issue #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06932c0
Fix ChargedBack field marshaling issue
Oct 1, 2024
542cf4f
Update ChargedBack values in tests
Oct 1, 2024
241a865
Add missing import
Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/swaggo/echo-swagger v1.4.1
github.com/swaggo/swag v1.16.3
github.com/testcontainers/testcontainers-go v0.33.0
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/net v0.29.0
gopkg.in/go-playground/validator.v9 v9.31.0
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -52,12 +52,10 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.11.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
Expand Down Expand Up @@ -116,6 +114,7 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -135,23 +134,24 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.25.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.2 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
Expand Down
77 changes: 26 additions & 51 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/api/registry/v1/cluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type ClusterSpec struct {
ChargebackBusinessUnit string `json:"chargebackBusinessUnit,omitempty"`

// Whether the cluster is charged back to the chargebackBusinessUnit
ChargedBack bool `json:"chargedBack,omitempty"`
ChargedBack *bool `json:"chargedBack,omitempty"`

// The Org that is responsible for the cluster operations
// +kubebuilder:validation:Required
Expand Down
5 changes: 5 additions & 0 deletions pkg/api/registry/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/client/controllers/cluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ package controllers

import (
"context"
"k8s.io/utils/ptr"
"time"

registryv1 "github.com/adobe/cluster-registry/pkg/api/registry/v1"
Expand Down Expand Up @@ -75,7 +76,7 @@ var _ = Describe("Cluster Controller", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{},
AccountID: "",
Tiers: []registryv1.Tier{},
Expand Down
3 changes: 2 additions & 1 deletion pkg/client/webhook/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
"net/http"
"net/http/httptest"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -190,7 +191,7 @@ var _ = Describe("Webhook Server", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{},
AccountID: "",
Tiers: []registryv1.Tier{},
Expand Down
31 changes: 16 additions & 15 deletions pkg/database/database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package database
import (
"fmt"
"github.com/adobe/cluster-registry/pkg/apiserver/models"
"k8s.io/utils/ptr"
"sort"

registryv1 "github.com/adobe/cluster-registry/pkg/api/registry/v1"
Expand Down Expand Up @@ -101,7 +102,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -439,7 +440,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -533,7 +534,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU2",
ChargebackBusinessUnit: "BU2",
ChargedBack: false,
ChargedBack: ptr.To(false),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-55555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -604,7 +605,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"paas"},
AccountID: "12345678",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -701,7 +702,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -811,7 +812,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU2",
ChargebackBusinessUnit: "BU2",
ChargedBack: false,
ChargedBack: ptr.To(false),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-55555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -946,7 +947,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1040,7 +1041,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU2",
ChargebackBusinessUnit: "BU2",
ChargedBack: false,
ChargedBack: ptr.To(false),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-55555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1111,7 +1112,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"paas"},
AccountID: "12345678",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1188,7 +1189,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1282,7 +1283,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU2",
ChargebackBusinessUnit: "BU2",
ChargedBack: false,
ChargedBack: ptr.To(false),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-55555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1364,7 +1365,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1458,7 +1459,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"paas"},
AccountID: "12345678",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1538,7 +1539,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU1",
ChargebackBusinessUnit: "BU1",
ChargedBack: true,
ChargedBack: ptr.To(true),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-555555555",
Tiers: []registryv1.Tier{
Expand Down Expand Up @@ -1632,7 +1633,7 @@ var _ = Describe("Database Suite", func() {
Environment: "Prod",
BusinessUnit: "BU2",
ChargebackBusinessUnit: "BU2",
ChargedBack: false,
ChargedBack: ptr.To(false),
Offering: []registryv1.Offering{"caas", "paas"},
AccountID: "11111-2222-3333-4444-55555555",
Tiers: []registryv1.Tier{
Expand Down