Skip to content

Disallow empty updates for MongoDB Flex and Postgres Flex instances #140

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
joaopalet merged 2 commits into from
Mar 11, 2024
Merged

Disallow empty updates for MongoDB Flex and Postgres Flex instances #140

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
dba16ef
Disallow empty updates for MongoDB Flex and Postgres Flex instances
Mar 11, 2024
4b0a3a2
Remove duplicated test case
Mar 11, 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
26 changes: 19 additions & 7 deletions internal/cmd/mongodbflex/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,21 @@ func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
return nil, &cliErr.ProjectIdError{}
}

instanceName := flags.FlagToStringPointer(cmd, instanceNameFlag)
flavorId := flags.FlagToStringPointer(cmd, flavorIdFlag)
cpu := flags.FlagToInt64Pointer(cmd, cpuFlag)
ram := flags.FlagToInt64Pointer(cmd, ramFlag)
acl := flags.FlagToStringSlicePointer(cmd, aclFlag)
backupSchedule := flags.FlagToStringPointer(cmd, backupScheduleFlag)
storageClass := flags.FlagToStringPointer(cmd, storageClassFlag)
storageSize := flags.FlagToInt64Pointer(cmd, storageSizeFlag)
version := flags.FlagToStringPointer(cmd, versionFlag)
instanceType := flags.FlagToStringPointer(cmd, typeFlag)

if instanceName == nil && flavorId == nil && cpu == nil && ram == nil && acl == nil &&
backupSchedule == nil && storageClass == nil && storageSize == nil && version == nil && instanceType == nil {
return nil, &cliErr.EmptyUpdateError{}
}

if flavorId != nil && (cpu != nil || ram != nil) {
return nil, &cliErr.DatabaseInputFlavorError{
Expand All @@ -164,16 +176,16 @@ func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
return &inputModel{
GlobalFlagModel: globalFlags,
InstanceId: instanceId,
InstanceName: flags.FlagToStringPointer(cmd, instanceNameFlag),
ACL: flags.FlagToStringSlicePointer(cmd, aclFlag),
BackupSchedule: flags.FlagToStringPointer(cmd, backupScheduleFlag),
InstanceName: instanceName,
ACL: acl,
BackupSchedule: backupSchedule,
FlavorId: flavorId,
CPU: cpu,
RAM: ram,
StorageClass: flags.FlagToStringPointer(cmd, storageClassFlag),
StorageSize: flags.FlagToInt64Pointer(cmd, storageSizeFlag),
Version: flags.FlagToStringPointer(cmd, versionFlag),
Type: flags.FlagToStringPointer(cmd, typeFlag),
StorageClass: storageClass,
StorageSize: storageSize,
Version: version,
Type: instanceType,
}, nil
}

Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/mongodbflex/instance/update/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@ func TestParseInput(t *testing.T) {
isValid bool
expectedModel *inputModel
}{
{
description: "base",
argValues: fixtureArgValues(),
flagValues: fixtureRequiredFlagValues(),
isValid: true,
expectedModel: fixtureRequiredInputModel(),
},
{
description: "no values",
Comment thread
joaopalet marked this conversation as resolved.
Outdated
argValues: []string{},
Expand All @@ -174,6 +167,13 @@ func TestParseInput(t *testing.T) {
flagValues: map[string]string{},
isValid: false,
},
{
description: "only instance and project ids",
argValues: fixtureArgValues(),
flagValues: fixtureRequiredFlagValues(),

isValid: false,
},
{
description: "all values with flavor id",
argValues: fixtureArgValues(),
Expand Down
26 changes: 19 additions & 7 deletions internal/cmd/postgresflex/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,21 @@ func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
return nil, &cliErr.ProjectIdError{}
}

instanceName := flags.FlagToStringPointer(cmd, instanceNameFlag)
flavorId := flags.FlagToStringPointer(cmd, flavorIdFlag)
cpu := flags.FlagToInt64Pointer(cmd, cpuFlag)
ram := flags.FlagToInt64Pointer(cmd, ramFlag)
acl := flags.FlagToStringSlicePointer(cmd, aclFlag)
backupSchedule := flags.FlagToStringPointer(cmd, backupScheduleFlag)
storageClass := flags.FlagToStringPointer(cmd, storageClassFlag)
storageSize := flags.FlagToInt64Pointer(cmd, storageSizeFlag)
version := flags.FlagToStringPointer(cmd, versionFlag)
instanceType := flags.FlagToStringPointer(cmd, typeFlag)

if instanceName == nil && flavorId == nil && cpu == nil && ram == nil && acl == nil &&
backupSchedule == nil && storageClass == nil && storageSize == nil && version == nil && instanceType == nil {
return nil, &cliErr.EmptyUpdateError{}
}

if flavorId != nil && (cpu != nil || ram != nil) {
return nil, &cliErr.DatabaseInputFlavorError{
Expand All @@ -164,16 +176,16 @@ func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
return &inputModel{
GlobalFlagModel: globalFlags,
InstanceId: instanceId,
InstanceName: flags.FlagToStringPointer(cmd, instanceNameFlag),
ACL: flags.FlagToStringSlicePointer(cmd, aclFlag),
BackupSchedule: flags.FlagToStringPointer(cmd, backupScheduleFlag),
InstanceName: instanceName,
ACL: acl,
BackupSchedule: backupSchedule,
FlavorId: flavorId,
CPU: cpu,
RAM: ram,
StorageClass: flags.FlagToStringPointer(cmd, storageClassFlag),
StorageSize: flags.FlagToInt64Pointer(cmd, storageSizeFlag),
Version: flags.FlagToStringPointer(cmd, versionFlag),
Type: flags.FlagToStringPointer(cmd, typeFlag),
StorageClass: storageClass,
StorageSize: storageSize,
Version: version,
Type: instanceType,
}, nil
}

Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/postgresflex/instance/update/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@ func TestParseInput(t *testing.T) {
isValid bool
expectedModel *inputModel
}{
{
description: "base",
argValues: fixtureArgValues(),
flagValues: fixtureRequiredFlagValues(),
isValid: true,
expectedModel: fixtureRequiredInputModel(),
},
{
description: "no values",
Comment thread
joaopalet marked this conversation as resolved.
Outdated
argValues: []string{},
Expand All @@ -174,6 +167,13 @@ func TestParseInput(t *testing.T) {
flagValues: map[string]string{},
isValid: false,
},
{
description: "only instance and project ids",
argValues: fixtureArgValues(),
flagValues: fixtureRequiredFlagValues(),

isValid: false,
},
{
description: "all values with flavor id",
argValues: fixtureArgValues(),
Expand Down