Skip to content

Commit 8e8b0c6

Browse files
chore: synchronise to ocm-api-model 0.0.400
1 parent 95e2d9b commit 8e8b0c6

10 files changed

+1676
-1633
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export PATH := $(LOCAL_BIN_PATH):$(PATH)
2727
export CGO_ENABLED=0
2828

2929
# Details of the model to use:
30-
model_version:=v0.0.399
30+
model_version:=v0.0.400
3131
model_url:=https://github.com/openshift-online/ocm-api-model.git
3232

3333
# Details of the metamodel to use:

addonsmgmt/v1/addon_builder.go

+5-11
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type AddonBuilder struct {
3838
name string
3939
namespaces []*AddonNamespaceBuilder
4040
operatorName string
41-
parameters *AddonParametersBuilder
41+
parameters *AddonParameterListBuilder
4242
requirements []*AddonRequirementBuilder
4343
resourceCost float64
4444
resourceName string
@@ -212,16 +212,10 @@ func (b *AddonBuilder) OperatorName(value string) *AddonBuilder {
212212
return b
213213
}
214214

215-
// Parameters sets the value of the 'parameters' attribute to the given value.
216-
//
217-
// Representation of AddonParameters
218-
func (b *AddonBuilder) Parameters(value *AddonParametersBuilder) *AddonBuilder {
215+
// Parameters sets the value of the 'parameters' attribute to the given values.
216+
func (b *AddonBuilder) Parameters(value *AddonParameterListBuilder) *AddonBuilder {
219217
b.parameters = value
220-
if value != nil {
221-
b.bitmap_ |= 524288
222-
} else {
223-
b.bitmap_ &^= 524288
224-
}
218+
b.bitmap_ |= 524288
225219
return b
226220
}
227221

@@ -332,7 +326,7 @@ func (b *AddonBuilder) Copy(object *Addon) *AddonBuilder {
332326
}
333327
b.operatorName = object.operatorName
334328
if object.parameters != nil {
335-
b.parameters = NewAddonParameters().Copy(object.parameters)
329+
b.parameters = NewAddonParameterList().Copy(object.parameters)
336330
} else {
337331
b.parameters = nil
338332
}

addonsmgmt/v1/addon_installation_builder.go

+5-11
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type AddonInstallationBuilder struct {
3838
deletedTimestamp time.Time
3939
desiredVersion string
4040
operatorVersion string
41-
parameters *AddonInstallationParametersBuilder
41+
parameters *AddonInstallationParameterListBuilder
4242
state AddonInstallationState
4343
stateDescription string
4444
subscription *ObjectReferenceBuilder
@@ -149,16 +149,10 @@ func (b *AddonInstallationBuilder) OperatorVersion(value string) *AddonInstallat
149149
return b
150150
}
151151

152-
// Parameters sets the value of the 'parameters' attribute to the given value.
153-
//
154-
// representation of addon installation parameter
155-
func (b *AddonInstallationBuilder) Parameters(value *AddonInstallationParametersBuilder) *AddonInstallationBuilder {
152+
// Parameters sets the value of the 'parameters' attribute to the given values.
153+
func (b *AddonInstallationBuilder) Parameters(value *AddonInstallationParameterListBuilder) *AddonInstallationBuilder {
156154
b.parameters = value
157-
if value != nil {
158-
b.bitmap_ |= 2048
159-
} else {
160-
b.bitmap_ &^= 2048
161-
}
155+
b.bitmap_ |= 2048
162156
return b
163157
}
164158

@@ -227,7 +221,7 @@ func (b *AddonInstallationBuilder) Copy(object *AddonInstallation) *AddonInstall
227221
b.desiredVersion = object.desiredVersion
228222
b.operatorVersion = object.operatorVersion
229223
if object.parameters != nil {
230-
b.parameters = NewAddonInstallationParameters().Copy(object.parameters)
224+
b.parameters = NewAddonInstallationParameterList().Copy(object.parameters)
231225
} else {
232226
b.parameters = nil
233227
}

addonsmgmt/v1/addon_installation_type.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type AddonInstallation struct {
5050
deletedTimestamp time.Time
5151
desiredVersion string
5252
operatorVersion string
53-
parameters *AddonInstallationParameters
53+
parameters *AddonInstallationParameterList
5454
state AddonInstallationState
5555
stateDescription string
5656
subscription *ObjectReference
@@ -302,7 +302,7 @@ func (o *AddonInstallation) GetOperatorVersion() (value string, ok bool) {
302302
// the zero value of the type if the attribute doesn't have a value.
303303
//
304304
// Parameters in the installation
305-
func (o *AddonInstallation) Parameters() *AddonInstallationParameters {
305+
func (o *AddonInstallation) Parameters() *AddonInstallationParameterList {
306306
if o != nil && o.bitmap_&2048 != 0 {
307307
return o.parameters
308308
}
@@ -313,7 +313,7 @@ func (o *AddonInstallation) Parameters() *AddonInstallationParameters {
313313
// a flag indicating if the attribute has a value.
314314
//
315315
// Parameters in the installation
316-
func (o *AddonInstallation) GetParameters() (value *AddonInstallationParameters, ok bool) {
316+
func (o *AddonInstallation) GetParameters() (value *AddonInstallationParameterList, ok bool) {
317317
ok = o != nil && o.bitmap_&2048 != 0
318318
if ok {
319319
value = o.parameters

addonsmgmt/v1/addon_installation_type_json.go

+22-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ func writeAddonInstallation(object *AddonInstallation, stream *jsoniter.Stream)
144144
stream.WriteMore()
145145
}
146146
stream.WriteObjectField("parameters")
147-
writeAddonInstallationParameters(object.parameters, stream)
147+
stream.WriteObjectStart()
148+
stream.WriteObjectField("items")
149+
writeAddonInstallationParameterList(object.parameters.items, stream)
150+
stream.WriteObjectEnd()
148151
count++
149152
}
150153
present_ = object.bitmap_&4096 != 0
@@ -258,7 +261,24 @@ func readAddonInstallation(iterator *jsoniter.Iterator) *AddonInstallation {
258261
object.operatorVersion = value
259262
object.bitmap_ |= 1024
260263
case "parameters":
261-
value := readAddonInstallationParameters(iterator)
264+
value := &AddonInstallationParameterList{}
265+
for {
266+
field := iterator.ReadObject()
267+
if field == "" {
268+
break
269+
}
270+
switch field {
271+
case "kind":
272+
text := iterator.ReadString()
273+
value.link = text == AddonInstallationParameterListLinkKind
274+
case "href":
275+
value.href = iterator.ReadString()
276+
case "items":
277+
value.items = readAddonInstallationParameterList(iterator)
278+
default:
279+
iterator.ReadAny()
280+
}
281+
}
262282
object.parameters = value
263283
object.bitmap_ |= 2048
264284
case "state":

addonsmgmt/v1/addon_type.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Addon struct {
5050
name string
5151
namespaces []*AddonNamespace
5252
operatorName string
53-
parameters *AddonParameters
53+
parameters *AddonParameterList
5454
requirements []*AddonRequirement
5555
resourceCost float64
5656
resourceName string
@@ -492,7 +492,7 @@ func (o *Addon) GetOperatorName() (value string, ok bool) {
492492
// the zero value of the type if the attribute doesn't have a value.
493493
//
494494
// List of parameters for this addon.
495-
func (o *Addon) Parameters() *AddonParameters {
495+
func (o *Addon) Parameters() *AddonParameterList {
496496
if o != nil && o.bitmap_&524288 != 0 {
497497
return o.parameters
498498
}
@@ -503,7 +503,7 @@ func (o *Addon) Parameters() *AddonParameters {
503503
// a flag indicating if the attribute has a value.
504504
//
505505
// List of parameters for this addon.
506-
func (o *Addon) GetParameters() (value *AddonParameters, ok bool) {
506+
func (o *Addon) GetParameters() (value *AddonParameterList, ok bool) {
507507
ok = o != nil && o.bitmap_&524288 != 0
508508
if ok {
509509
value = o.parameters

addonsmgmt/v1/addon_type_json.go

+22-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,10 @@ func writeAddon(object *Addon, stream *jsoniter.Stream) {
256256
stream.WriteMore()
257257
}
258258
stream.WriteObjectField("parameters")
259-
writeAddonParameters(object.parameters, stream)
259+
stream.WriteObjectStart()
260+
stream.WriteObjectField("items")
261+
writeAddonParameterList(object.parameters.items, stream)
262+
stream.WriteObjectEnd()
260263
count++
261264
}
262265
present_ = object.bitmap_&1048576 != 0 && object.requirements != nil
@@ -429,7 +432,24 @@ func readAddon(iterator *jsoniter.Iterator) *Addon {
429432
object.operatorName = value
430433
object.bitmap_ |= 262144
431434
case "parameters":
432-
value := readAddonParameters(iterator)
435+
value := &AddonParameterList{}
436+
for {
437+
field := iterator.ReadObject()
438+
if field == "" {
439+
break
440+
}
441+
switch field {
442+
case "kind":
443+
text := iterator.ReadString()
444+
value.link = text == AddonParameterListLinkKind
445+
case "href":
446+
value.href = iterator.ReadString()
447+
case "items":
448+
value.items = readAddonParameterList(iterator)
449+
default:
450+
iterator.ReadAny()
451+
}
452+
}
433453
object.parameters = value
434454
object.bitmap_ |= 524288
435455
case "requirements":

0 commit comments

Comments
 (0)