Skip to content

Commit 03ea353

Browse files
author
Noa Leshem
committed
Release 0.1.262
1 parent 7cdd780 commit 03ea353

17 files changed

+13413
-12163
lines changed

Diff for: CHANGES.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
This document describes the relevant changes between releases of the OCM API
44
SDK.
55

6+
## 0.1.263 Apr 19 2022
7+
8+
- Update to model 0.0.195:
9+
- Added Import method to the HTPasswd IDP user collection.
10+
- Added credential request type and updated the addon type to include it
11+
612
## 0.1.262 Apr 14 2022
713

814
- Update to model 0.0.194:

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
export CGO_ENABLED=0
1919

2020
# Details of the model to use:
21-
model_version:=v0.0.194
21+
model_version:=v0.0.195
2222
model_url:=https://github.com/openshift-online/ocm-api-model.git
2323

2424
# Details of the metamodel to use:

Diff for: clustersmgmt/v1/add_on_builder.go

+29-46
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type AddOnBuilder struct {
2727
id string
2828
href string
2929
config *AddOnConfigBuilder
30-
credentialsSecret string
30+
credentialsRequests []*CredentialRequestBuilder
3131
description string
3232
docsLink string
3333
icon string
@@ -36,11 +36,9 @@ type AddOnBuilder struct {
3636
name string
3737
operatorName string
3838
parameters *AddOnParameterListBuilder
39-
policyPermissions []string
4039
requirements []*AddOnRequirementBuilder
4140
resourceCost float64
4241
resourceName string
43-
serviceAccount string
4442
subOperators []*AddOnSubOperatorBuilder
4543
targetNamespace string
4644
version *AddOnVersionBuilder
@@ -94,11 +92,12 @@ func (b *AddOnBuilder) Config(value *AddOnConfigBuilder) *AddOnBuilder {
9492
return b
9593
}
9694

97-
// CredentialsSecret sets the value of the 'credentials_secret' attribute to the given value.
95+
// CredentialsRequests sets the value of the 'credentials_requests' attribute to the given values.
9896
//
9997
//
100-
func (b *AddOnBuilder) CredentialsSecret(value string) *AddOnBuilder {
101-
b.credentialsSecret = value
98+
func (b *AddOnBuilder) CredentialsRequests(values ...*CredentialRequestBuilder) *AddOnBuilder {
99+
b.credentialsRequests = make([]*CredentialRequestBuilder, len(values))
100+
copy(b.credentialsRequests, values)
102101
b.bitmap_ |= 16
103102
return b
104103
}
@@ -211,23 +210,13 @@ func (b *AddOnBuilder) Parameters(value *AddOnParameterListBuilder) *AddOnBuilde
211210
return b
212211
}
213212

214-
// PolicyPermissions sets the value of the 'policy_permissions' attribute to the given values.
215-
//
216-
//
217-
func (b *AddOnBuilder) PolicyPermissions(values ...string) *AddOnBuilder {
218-
b.policyPermissions = make([]string, len(values))
219-
copy(b.policyPermissions, values)
220-
b.bitmap_ |= 131072
221-
return b
222-
}
223-
224213
// Requirements sets the value of the 'requirements' attribute to the given values.
225214
//
226215
//
227216
func (b *AddOnBuilder) Requirements(values ...*AddOnRequirementBuilder) *AddOnBuilder {
228217
b.requirements = make([]*AddOnRequirementBuilder, len(values))
229218
copy(b.requirements, values)
230-
b.bitmap_ |= 262144
219+
b.bitmap_ |= 131072
231220
return b
232221
}
233222

@@ -236,7 +225,7 @@ func (b *AddOnBuilder) Requirements(values ...*AddOnRequirementBuilder) *AddOnBu
236225
//
237226
func (b *AddOnBuilder) ResourceCost(value float64) *AddOnBuilder {
238227
b.resourceCost = value
239-
b.bitmap_ |= 524288
228+
b.bitmap_ |= 262144
240229
return b
241230
}
242231

@@ -245,16 +234,7 @@ func (b *AddOnBuilder) ResourceCost(value float64) *AddOnBuilder {
245234
//
246235
func (b *AddOnBuilder) ResourceName(value string) *AddOnBuilder {
247236
b.resourceName = value
248-
b.bitmap_ |= 1048576
249-
return b
250-
}
251-
252-
// ServiceAccount sets the value of the 'service_account' attribute to the given value.
253-
//
254-
//
255-
func (b *AddOnBuilder) ServiceAccount(value string) *AddOnBuilder {
256-
b.serviceAccount = value
257-
b.bitmap_ |= 2097152
237+
b.bitmap_ |= 524288
258238
return b
259239
}
260240

@@ -264,7 +244,7 @@ func (b *AddOnBuilder) ServiceAccount(value string) *AddOnBuilder {
264244
func (b *AddOnBuilder) SubOperators(values ...*AddOnSubOperatorBuilder) *AddOnBuilder {
265245
b.subOperators = make([]*AddOnSubOperatorBuilder, len(values))
266246
copy(b.subOperators, values)
267-
b.bitmap_ |= 4194304
247+
b.bitmap_ |= 1048576
268248
return b
269249
}
270250

@@ -273,7 +253,7 @@ func (b *AddOnBuilder) SubOperators(values ...*AddOnSubOperatorBuilder) *AddOnBu
273253
//
274254
func (b *AddOnBuilder) TargetNamespace(value string) *AddOnBuilder {
275255
b.targetNamespace = value
276-
b.bitmap_ |= 8388608
256+
b.bitmap_ |= 2097152
277257
return b
278258
}
279259

@@ -283,9 +263,9 @@ func (b *AddOnBuilder) TargetNamespace(value string) *AddOnBuilder {
283263
func (b *AddOnBuilder) Version(value *AddOnVersionBuilder) *AddOnBuilder {
284264
b.version = value
285265
if value != nil {
286-
b.bitmap_ |= 16777216
266+
b.bitmap_ |= 4194304
287267
} else {
288-
b.bitmap_ &^= 16777216
268+
b.bitmap_ &^= 4194304
289269
}
290270
return b
291271
}
@@ -303,7 +283,14 @@ func (b *AddOnBuilder) Copy(object *AddOn) *AddOnBuilder {
303283
} else {
304284
b.config = nil
305285
}
306-
b.credentialsSecret = object.credentialsSecret
286+
if object.credentialsRequests != nil {
287+
b.credentialsRequests = make([]*CredentialRequestBuilder, len(object.credentialsRequests))
288+
for i, v := range object.credentialsRequests {
289+
b.credentialsRequests[i] = NewCredentialRequest().Copy(v)
290+
}
291+
} else {
292+
b.credentialsRequests = nil
293+
}
307294
b.description = object.description
308295
b.docsLink = object.docsLink
309296
b.enabled = object.enabled
@@ -320,12 +307,6 @@ func (b *AddOnBuilder) Copy(object *AddOn) *AddOnBuilder {
320307
} else {
321308
b.parameters = nil
322309
}
323-
if object.policyPermissions != nil {
324-
b.policyPermissions = make([]string, len(object.policyPermissions))
325-
copy(b.policyPermissions, object.policyPermissions)
326-
} else {
327-
b.policyPermissions = nil
328-
}
329310
if object.requirements != nil {
330311
b.requirements = make([]*AddOnRequirementBuilder, len(object.requirements))
331312
for i, v := range object.requirements {
@@ -336,7 +317,6 @@ func (b *AddOnBuilder) Copy(object *AddOn) *AddOnBuilder {
336317
}
337318
b.resourceCost = object.resourceCost
338319
b.resourceName = object.resourceName
339-
b.serviceAccount = object.serviceAccount
340320
if object.subOperators != nil {
341321
b.subOperators = make([]*AddOnSubOperatorBuilder, len(object.subOperators))
342322
for i, v := range object.subOperators {
@@ -366,7 +346,15 @@ func (b *AddOnBuilder) Build() (object *AddOn, err error) {
366346
return
367347
}
368348
}
369-
object.credentialsSecret = b.credentialsSecret
349+
if b.credentialsRequests != nil {
350+
object.credentialsRequests = make([]*CredentialRequest, len(b.credentialsRequests))
351+
for i, v := range b.credentialsRequests {
352+
object.credentialsRequests[i], err = v.Build()
353+
if err != nil {
354+
return
355+
}
356+
}
357+
}
370358
object.description = b.description
371359
object.docsLink = b.docsLink
372360
object.enabled = b.enabled
@@ -384,10 +372,6 @@ func (b *AddOnBuilder) Build() (object *AddOn, err error) {
384372
return
385373
}
386374
}
387-
if b.policyPermissions != nil {
388-
object.policyPermissions = make([]string, len(b.policyPermissions))
389-
copy(object.policyPermissions, b.policyPermissions)
390-
}
391375
if b.requirements != nil {
392376
object.requirements = make([]*AddOnRequirement, len(b.requirements))
393377
for i, v := range b.requirements {
@@ -399,7 +383,6 @@ func (b *AddOnBuilder) Build() (object *AddOn, err error) {
399383
}
400384
object.resourceCost = b.resourceCost
401385
object.resourceName = b.resourceName
402-
object.serviceAccount = b.serviceAccount
403386
if b.subOperators != nil {
404387
object.subOperators = make([]*AddOnSubOperator, len(b.subOperators))
405388
for i, v := range b.subOperators {

0 commit comments

Comments
 (0)