Skip to content

Commit 2cef81c

Browse files
committed
Merge remote-tracking branch 'origin/APP-440-Create-application-descriptor' into APP-443-Update-specific-application
# Conflicts: # application/model/app_descriptor.go
2 parents 064c2ac + e7f7c58 commit 2cef81c

File tree

2 files changed

+32
-17
lines changed

2 files changed

+32
-17
lines changed

application/commands/application/create_app_cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ func (cac *createAppCommand) buildRequestPayload(ctx *components.Context) (*mode
5959
businessCriticality := ctx.GetStringFlagValue(commands.BusinessCriticalityFlag)
6060
if businessCriticality == "" {
6161
// Default to "unspecified" if not provided
62-
businessCriticality = model.BusinessCriticalityValues[0]
62+
businessCriticality = model.BusinessCriticalityUnspecified
6363
} else if !slices.Contains(model.BusinessCriticalityValues, businessCriticality) {
6464
return nil, errorutils.CheckErrorf("invalid value for --%s: '%s'. Allowed values: %s", commands.BusinessCriticalityFlag, businessCriticality, coreutils.ListToText(model.BusinessCriticalityValues))
6565
}
6666

6767
maturityLevel := ctx.GetStringFlagValue(commands.MaturityLevelFlag)
6868
if maturityLevel == "" {
6969
// Default to "unspecified" if not provided
70-
maturityLevel = model.MaturityLevelValues[0]
70+
maturityLevel = model.MaturityLevelUnspecified
7171
} else if !slices.Contains(model.MaturityLevelValues, maturityLevel) {
7272
return nil, errorutils.CheckErrorf("invalid value for --%s: '%s'. Allowed values: %s", commands.MaturityLevelFlag, maturityLevel, coreutils.ListToText(model.MaturityLevelValues))
7373
}

application/model/app_descriptor.go

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
package model
22

3+
const (
4+
BusinessCriticalityUnspecified = "unspecified"
5+
BusinessCriticalityLow = "low"
6+
BusinessCriticalityMedium = "medium"
7+
BusinessCriticalityHigh = "high"
8+
BusinessCriticalityCritical = "critical"
9+
10+
MaturityLevelUnspecified = "unspecified"
11+
MaturityLevelExperimental = "experimental"
12+
MaturityLevelProduction = "production"
13+
MaturityLevelEndOfLife = "end_of_life"
14+
)
15+
16+
var (
17+
BusinessCriticalityValues = []string{
18+
BusinessCriticalityUnspecified,
19+
BusinessCriticalityLow,
20+
BusinessCriticalityMedium,
21+
BusinessCriticalityHigh,
22+
BusinessCriticalityCritical,
23+
}
24+
25+
MaturityLevelValues = []string{
26+
MaturityLevelUnspecified,
27+
MaturityLevelExperimental,
28+
MaturityLevelProduction,
29+
MaturityLevelEndOfLife,
30+
}
31+
)
32+
333
type AppDescriptor struct {
434
ApplicationKey string `json:"application_key"`
535
ApplicationName string `json:"application_name,omitempty"`
@@ -11,18 +41,3 @@ type AppDescriptor struct {
1141
UserOwners []string `json:"user_owners,omitempty"`
1242
GroupOwners []string `json:"group_owners,omitempty"`
1343
}
14-
15-
var BusinessCriticalityValues = []string{
16-
"unspecified",
17-
"low",
18-
"medium",
19-
"high",
20-
"critical",
21-
}
22-
23-
var MaturityLevelValues = []string{
24-
"unspecified",
25-
"experimental",
26-
"production",
27-
"end_of_life",
28-
}

0 commit comments

Comments
 (0)