Skip to content

Commit

Permalink
bump model to version 0.0.256
Browse files Browse the repository at this point in the history
  • Loading branch information
ciaranRoche committed Feb 9, 2023
1 parent 914e3a9 commit eba8370
Show file tree
Hide file tree
Showing 12 changed files with 411 additions and 202 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
export CGO_ENABLED=0

# Details of the model to use:
model_version:=v0.0.255
model_version:=v0.0.256
model_url:=https://github.com/openshift-online/ocm-api-model.git

# Details of the metamodel to use:
Expand Down
12 changes: 6 additions & 6 deletions addonsmgmt/v1/addon_status_condition_type_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ type AddonStatusConditionType string

const (
//
AddonStatusConditionTypeAvailable AddonStatusConditionType = "available"
AddonStatusConditionTypeAvailable AddonStatusConditionType = "Available"
//
AddonStatusConditionTypeDegraded AddonStatusConditionType = "degraded"
AddonStatusConditionTypeDegraded AddonStatusConditionType = "Degraded"
//
AddonStatusConditionTypeHealthy AddonStatusConditionType = "healthy"
AddonStatusConditionTypeHealthy AddonStatusConditionType = "Healthy"
//
AddonStatusConditionTypeInstalled AddonStatusConditionType = "installed"
AddonStatusConditionTypeInstalled AddonStatusConditionType = "Installed"
//
AddonStatusConditionTypePaused AddonStatusConditionType = "paused"
AddonStatusConditionTypePaused AddonStatusConditionType = "Paused"
//
AddonStatusConditionTypeUpgrading AddonStatusConditionType = "upgrading"
AddonStatusConditionTypeUpgrading AddonStatusConditionType = "Upgrading"
)
6 changes: 3 additions & 3 deletions addonsmgmt/v1/addon_status_condition_value_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ type AddonStatusConditionValue string

const (
//
AddonStatusConditionValueFalse AddonStatusConditionValue = "false"
AddonStatusConditionValueFalse AddonStatusConditionValue = "False"
//
AddonStatusConditionValueTrue AddonStatusConditionValue = "true"
AddonStatusConditionValueTrue AddonStatusConditionValue = "True"
//
AddonStatusConditionValueUnknown AddonStatusConditionValue = "unknown"
AddonStatusConditionValueUnknown AddonStatusConditionValue = "Unknown"
)
18 changes: 9 additions & 9 deletions addonsmgmt/v1/openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -2867,14 +2867,14 @@ var OpenAPI = []byte{
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74,
0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22,
0x65, 0x6e, 0x75, 0x6d, 0x22, 0x3a, 0x20, 0x5b, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x22, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x2c, 0xa,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x64, 0x65, 0x67, 0x72, 0x61,
0x20, 0x20, 0x20, 0x22, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x2c, 0xa,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x44, 0x65, 0x67, 0x72, 0x61,
0x64, 0x65, 0x64, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x22, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x22,
0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x70, 0x61, 0x75,
0x22, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x22,
0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x50, 0x61, 0x75,
0x73, 0x65, 0x64, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x22, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20,
0x22, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x5d, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0xa, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x41, 0x64, 0x64, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75,
0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22,
Expand All @@ -2886,10 +2886,10 @@ var OpenAPI = []byte{
0x65, 0x6c, 0x64, 0x2e, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22,
0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c,
0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x65, 0x6e, 0x75, 0x6d, 0x22, 0x3a,
0x20, 0x5b, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x66, 0x61,
0x20, 0x5b, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x46, 0x61,
0x6c, 0x73, 0x65, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x22, 0x74, 0x72, 0x75, 0x65, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x22, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20,
0x22, 0x54, 0x72, 0x75, 0x65, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x22, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x5d, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0xa, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x41, 0x64, 0x64, 0x6f, 0x6e, 0x53, 0x75, 0x62, 0x4f, 0x70,
0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3a, 0x20, 0x7b, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20,
Expand Down
18 changes: 9 additions & 9 deletions openapi/addons_mgmt/v1/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1440,21 +1440,21 @@
"description": "Representation of an addon status condition type field.",
"type": "string",
"enum": [
"available",
"degraded",
"healthy",
"installed",
"paused",
"upgrading"
"Available",
"Degraded",
"Healthy",
"Installed",
"Paused",
"Upgrading"
]
},
"AddonStatusConditionValue": {
"description": "Representation of an addon status condition value field.",
"type": "string",
"enum": [
"false",
"true",
"unknown"
"False",
"True",
"Unknown"
]
},
"AddonSubOperator": {
Expand Down
15 changes: 15 additions & 0 deletions openapi/service_logs/v1/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,10 @@
"description": "A flag that indicates whether the log entry should be internal/private only.",
"type": "boolean"
},
"log_type": {
"description": "Type of the service log entry.",
"$ref": "#/components/schemas/LogType"
},
"service_name": {
"description": "The name of the service who created the log.",
"type": "string"
Expand All @@ -403,6 +407,17 @@
}
}
},
"LogType": {
"description": "Representation of the log type field used in cluster log type model.",
"type": "string",
"enum": [
"clustercreate-details",
"clustercreate-high-level",
"clusterremove-details",
"clusterremove-high-level",
"cluster-state-updates"
]
},
"Severity": {
"type": "string",
"enum": [
Expand Down
24 changes: 18 additions & 6 deletions servicelogs/v1/log_entry_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type LogEntryBuilder struct {
clusterUUID string
description string
eventStreamID string
logType LogType
serviceName string
severity Severity
subscriptionID string
Expand Down Expand Up @@ -106,45 +107,54 @@ func (b *LogEntryBuilder) InternalOnly(value bool) *LogEntryBuilder {
return b
}

// LogType sets the value of the 'log_type' attribute to the given value.
//
// Representation of the log type field used in cluster log type model.
func (b *LogEntryBuilder) LogType(value LogType) *LogEntryBuilder {
b.logType = value
b.bitmap_ |= 256
return b
}

// ServiceName sets the value of the 'service_name' attribute to the given value.
func (b *LogEntryBuilder) ServiceName(value string) *LogEntryBuilder {
b.serviceName = value
b.bitmap_ |= 256
b.bitmap_ |= 512
return b
}

// Severity sets the value of the 'severity' attribute to the given value.
func (b *LogEntryBuilder) Severity(value Severity) *LogEntryBuilder {
b.severity = value
b.bitmap_ |= 512
b.bitmap_ |= 1024
return b
}

// SubscriptionID sets the value of the 'subscription_ID' attribute to the given value.
func (b *LogEntryBuilder) SubscriptionID(value string) *LogEntryBuilder {
b.subscriptionID = value
b.bitmap_ |= 1024
b.bitmap_ |= 2048
return b
}

// Summary sets the value of the 'summary' attribute to the given value.
func (b *LogEntryBuilder) Summary(value string) *LogEntryBuilder {
b.summary = value
b.bitmap_ |= 2048
b.bitmap_ |= 4096
return b
}

// Timestamp sets the value of the 'timestamp' attribute to the given value.
func (b *LogEntryBuilder) Timestamp(value time.Time) *LogEntryBuilder {
b.timestamp = value
b.bitmap_ |= 4096
b.bitmap_ |= 8192
return b
}

// Username sets the value of the 'username' attribute to the given value.
func (b *LogEntryBuilder) Username(value string) *LogEntryBuilder {
b.username = value
b.bitmap_ |= 8192
b.bitmap_ |= 16384
return b
}

Expand All @@ -161,6 +171,7 @@ func (b *LogEntryBuilder) Copy(object *LogEntry) *LogEntryBuilder {
b.description = object.description
b.eventStreamID = object.eventStreamID
b.internalOnly = object.internalOnly
b.logType = object.logType
b.serviceName = object.serviceName
b.severity = object.severity
b.subscriptionID = object.subscriptionID
Expand All @@ -181,6 +192,7 @@ func (b *LogEntryBuilder) Build() (object *LogEntry, err error) {
object.description = b.description
object.eventStreamID = b.eventStreamID
object.internalOnly = b.internalOnly
object.logType = b.logType
object.serviceName = b.serviceName
object.severity = b.severity
object.subscriptionID = b.subscriptionID
Expand Down
48 changes: 36 additions & 12 deletions servicelogs/v1/log_entry_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type LogEntry struct {
clusterUUID string
description string
eventStreamID string
logType LogType
serviceName string
severity Severity
subscriptionID string
Expand Down Expand Up @@ -225,12 +226,35 @@ func (o *LogEntry) GetInternalOnly() (value bool, ok bool) {
return
}

// LogType returns the value of the 'log_type' attribute, or
// the zero value of the type if the attribute doesn't have a value.
//
// Type of the service log entry.
func (o *LogEntry) LogType() LogType {
if o != nil && o.bitmap_&256 != 0 {
return o.logType
}
return LogType("")
}

// GetLogType returns the value of the 'log_type' attribute and
// a flag indicating if the attribute has a value.
//
// Type of the service log entry.
func (o *LogEntry) GetLogType() (value LogType, ok bool) {
ok = o != nil && o.bitmap_&256 != 0
if ok {
value = o.logType
}
return
}

// ServiceName returns the value of the 'service_name' attribute, or
// the zero value of the type if the attribute doesn't have a value.
//
// The name of the service who created the log.
func (o *LogEntry) ServiceName() string {
if o != nil && o.bitmap_&256 != 0 {
if o != nil && o.bitmap_&512 != 0 {
return o.serviceName
}
return ""
Expand All @@ -241,7 +265,7 @@ func (o *LogEntry) ServiceName() string {
//
// The name of the service who created the log.
func (o *LogEntry) GetServiceName() (value string, ok bool) {
ok = o != nil && o.bitmap_&256 != 0
ok = o != nil && o.bitmap_&512 != 0
if ok {
value = o.serviceName
}
Expand All @@ -253,7 +277,7 @@ func (o *LogEntry) GetServiceName() (value string, ok bool) {
//
// Log severity for the specific log entry.
func (o *LogEntry) Severity() Severity {
if o != nil && o.bitmap_&512 != 0 {
if o != nil && o.bitmap_&1024 != 0 {
return o.severity
}
return Severity("")
Expand All @@ -264,7 +288,7 @@ func (o *LogEntry) Severity() Severity {
//
// Log severity for the specific log entry.
func (o *LogEntry) GetSeverity() (value Severity, ok bool) {
ok = o != nil && o.bitmap_&512 != 0
ok = o != nil && o.bitmap_&1024 != 0
if ok {
value = o.severity
}
Expand All @@ -276,7 +300,7 @@ func (o *LogEntry) GetSeverity() (value Severity, ok bool) {
//
// The related subscription id of the cluster.
func (o *LogEntry) SubscriptionID() string {
if o != nil && o.bitmap_&1024 != 0 {
if o != nil && o.bitmap_&2048 != 0 {
return o.subscriptionID
}
return ""
Expand All @@ -287,7 +311,7 @@ func (o *LogEntry) SubscriptionID() string {
//
// The related subscription id of the cluster.
func (o *LogEntry) GetSubscriptionID() (value string, ok bool) {
ok = o != nil && o.bitmap_&1024 != 0
ok = o != nil && o.bitmap_&2048 != 0
if ok {
value = o.subscriptionID
}
Expand All @@ -299,7 +323,7 @@ func (o *LogEntry) GetSubscriptionID() (value string, ok bool) {
//
// Title of the log entry.
func (o *LogEntry) Summary() string {
if o != nil && o.bitmap_&2048 != 0 {
if o != nil && o.bitmap_&4096 != 0 {
return o.summary
}
return ""
Expand All @@ -310,7 +334,7 @@ func (o *LogEntry) Summary() string {
//
// Title of the log entry.
func (o *LogEntry) GetSummary() (value string, ok bool) {
ok = o != nil && o.bitmap_&2048 != 0
ok = o != nil && o.bitmap_&4096 != 0
if ok {
value = o.summary
}
Expand All @@ -320,7 +344,7 @@ func (o *LogEntry) GetSummary() (value string, ok bool) {
// Timestamp returns the value of the 'timestamp' attribute, or
// the zero value of the type if the attribute doesn't have a value.
func (o *LogEntry) Timestamp() time.Time {
if o != nil && o.bitmap_&4096 != 0 {
if o != nil && o.bitmap_&8192 != 0 {
return o.timestamp
}
return time.Time{}
Expand All @@ -329,7 +353,7 @@ func (o *LogEntry) Timestamp() time.Time {
// GetTimestamp returns the value of the 'timestamp' attribute and
// a flag indicating if the attribute has a value.
func (o *LogEntry) GetTimestamp() (value time.Time, ok bool) {
ok = o != nil && o.bitmap_&4096 != 0
ok = o != nil && o.bitmap_&8192 != 0
if ok {
value = o.timestamp
}
Expand All @@ -341,7 +365,7 @@ func (o *LogEntry) GetTimestamp() (value time.Time, ok bool) {
//
// The username that triggered the event (if available).
func (o *LogEntry) Username() string {
if o != nil && o.bitmap_&8192 != 0 {
if o != nil && o.bitmap_&16384 != 0 {
return o.username
}
return ""
Expand All @@ -352,7 +376,7 @@ func (o *LogEntry) Username() string {
//
// The username that triggered the event (if available).
func (o *LogEntry) GetUsername() (value string, ok bool) {
ok = o != nil && o.bitmap_&8192 != 0
ok = o != nil && o.bitmap_&16384 != 0
if ok {
value = o.username
}
Expand Down
Loading

0 comments on commit eba8370

Please sign in to comment.