Skip to content

CLOUDP-451851: Remove omitempty from planned flag #131

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
danielblanco96 merged 2 commits into from
Sep 29, 2026
Merged

CLOUDP-451851: Remove omitempty from planned flag #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa8cabb
CLOUDP-451851: Remove omitempty from planned flag
danielblanco96 Sep 29, 2026
482c149
Pull MinIO from public registry
danielblanco96 Sep 29, 2026
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
4 changes: 2 additions & 2 deletions internal/cli/opsmanager/standbyclusters/standby_clusters_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ const (
minioUser = "mcli-it"
minioPassword = "mcli-it-secret"
minioBucket = "mcli-standby-it"
// minio/minio was removed from Docker Hub in September 2026; pull from quay.io instead.
minioImage = "quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z"
minioImage = "bitnamilegacy/minio:2025.7.23"
awsTestRegion = "us-east-1"
testCluster = "it-cluster"
)
Expand Down Expand Up @@ -98,6 +97,7 @@ func startMinIO(t *testing.T) (endpoint string, client *s3.Client) {
ctr, err := minio.Run(context.Background(), minioImage,
minio.WithUsername(minioUser),
minio.WithPassword(minioPassword),
testcontainers.WithCmd("server", "/bitnami/minio/data"),
)
require.NoError(t, err)
t.Cleanup(func() { _ = testcontainers.TerminateContainer(ctr) })
Expand Down
15 changes: 7 additions & 8 deletions internal/standby/drstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ const (
)

type RemoteDRState struct {
State string `json:"state"`
PreviousState string `json:"previousState,omitempty"`
ClusterName string `json:"clusterName"`
Version string `json:"version"`
LastModified string `json:"lastModified"`
SchemaVersion string `json:"schemaVersion"`

Planned bool `json:"planned,omitempty"`
State string `json:"state"`
PreviousState string `json:"previousState,omitempty"`
ClusterName string `json:"clusterName,omitempty"`
Version string `json:"version"`
LastModified string `json:"lastModified"`
SchemaVersion string `json:"schemaVersion"`
Planned bool `json:"planned"`
SyncDestination string `json:"syncDestination,omitempty"`
PlannedFailoverTo string `json:"plannedFailoverTo,omitempty"`
CancelPlannedFailover string `json:"cancelPlannedFailover,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions internal/standby/drstate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func TestApplyFailover_ClearsPlanned(t *testing.T) {
require.NoError(t, s.ApplyFailover())
assert.False(t, s.Planned)
assert.Equal(t, "B", s.SyncDestination, "other planned fields must be preserved")

out, err := s.Marshal()
require.NoError(t, err)
assert.Contains(t, string(out), `"planned":false`)
}

func TestIncrementVersion(t *testing.T) {
Expand Down
Loading