Skip to content
This repository was archived by the owner on May 6, 2022. It is now read-only.

Commit a2db8ee

Browse files
MHBauerMHBauer
committed
Merge branch 'pr/862'
lgtm from: - jpeeler - kibbles-n-bytes - MHBauer
2 parents 52cb3c6 + 85196f5 commit a2db8ee

File tree

8 files changed

+178
-162
lines changed

8 files changed

+178
-162
lines changed

‎pkg/apis/servicecatalog/types.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,20 @@ type ServiceClass struct {
134134
// Immutable.
135135
ExternalID string
136136

137-
// OSB-specific
138-
AlphaTags []string
139-
Requires []string
140137
// Description is a short description of the service.
141138
Description string
142139
ExternalMetadata *runtime.RawExtension
140+
141+
AlphaTags []string
142+
143+
// Currently, this field is ALPHA: it may change or disappear at any time
144+
// and its data will not be migrated.
145+
//
146+
// AlphaRequires exposes a list of Cloud Foundry-specific 'permissions'
147+
// that must be granted to an instance of this service within Cloud
148+
// Foundry. These 'permissions' have no meaning within Kubernetes and an
149+
// Instance provisioned from this ServiceClass will not work correctly.
150+
AlphaRequires []string
143151
}
144152

145153
// ServicePlan represents a tier of a ServiceClass.

‎pkg/apis/servicecatalog/v1alpha1/types.generated.go

Lines changed: 113 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,8 +2038,8 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
20382038
yyq2[0] = x.Kind != ""
20392039
yyq2[1] = x.APIVersion != ""
20402040
yyq2[2] = true
2041-
yyq2[8] = len(x.AlphaTags) != 0
2042-
yyq2[9] = len(x.Requires) != 0
2041+
yyq2[10] = len(x.AlphaTags) != 0
2042+
yyq2[11] = len(x.AlphaRequires) != 0
20432043
var yynn2 int
20442044
if yyr2 || yy2arr2 {
20452045
r.EncodeArrayStart(12)
@@ -2237,12 +2237,64 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
22372237
}
22382238
if yyr2 || yy2arr2 {
22392239
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2240-
if yyq2[8] {
2240+
yym30 := z.EncBinary()
2241+
_ = yym30
2242+
if false {
2243+
} else {
2244+
r.EncodeString(codecSelferC_UTF81234, string(x.Description))
2245+
}
2246+
} else {
2247+
z.EncSendContainerState(codecSelfer_containerMapKey1234)
2248+
r.EncodeString(codecSelferC_UTF81234, string("description"))
2249+
z.EncSendContainerState(codecSelfer_containerMapValue1234)
2250+
yym31 := z.EncBinary()
2251+
_ = yym31
2252+
if false {
2253+
} else {
2254+
r.EncodeString(codecSelferC_UTF81234, string(x.Description))
2255+
}
2256+
}
2257+
if yyr2 || yy2arr2 {
2258+
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2259+
if x.ExternalMetadata == nil {
2260+
r.EncodeNil()
2261+
} else {
2262+
yym33 := z.EncBinary()
2263+
_ = yym33
2264+
if false {
2265+
} else if z.HasExtensions() && z.EncExt(x.ExternalMetadata) {
2266+
} else if !yym33 && z.IsJSONHandle() {
2267+
z.EncJSONMarshal(x.ExternalMetadata)
2268+
} else {
2269+
z.EncFallback(x.ExternalMetadata)
2270+
}
2271+
}
2272+
} else {
2273+
z.EncSendContainerState(codecSelfer_containerMapKey1234)
2274+
r.EncodeString(codecSelferC_UTF81234, string("externalMetadata"))
2275+
z.EncSendContainerState(codecSelfer_containerMapValue1234)
2276+
if x.ExternalMetadata == nil {
2277+
r.EncodeNil()
2278+
} else {
2279+
yym34 := z.EncBinary()
2280+
_ = yym34
2281+
if false {
2282+
} else if z.HasExtensions() && z.EncExt(x.ExternalMetadata) {
2283+
} else if !yym34 && z.IsJSONHandle() {
2284+
z.EncJSONMarshal(x.ExternalMetadata)
2285+
} else {
2286+
z.EncFallback(x.ExternalMetadata)
2287+
}
2288+
}
2289+
}
2290+
if yyr2 || yy2arr2 {
2291+
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2292+
if yyq2[10] {
22412293
if x.AlphaTags == nil {
22422294
r.EncodeNil()
22432295
} else {
2244-
yym30 := z.EncBinary()
2245-
_ = yym30
2296+
yym36 := z.EncBinary()
2297+
_ = yym36
22462298
if false {
22472299
} else {
22482300
z.F.EncSliceStringV(x.AlphaTags, false, e)
@@ -2252,15 +2304,15 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
22522304
r.EncodeNil()
22532305
}
22542306
} else {
2255-
if yyq2[8] {
2307+
if yyq2[10] {
22562308
z.EncSendContainerState(codecSelfer_containerMapKey1234)
22572309
r.EncodeString(codecSelferC_UTF81234, string("alphaTags"))
22582310
z.EncSendContainerState(codecSelfer_containerMapValue1234)
22592311
if x.AlphaTags == nil {
22602312
r.EncodeNil()
22612313
} else {
2262-
yym31 := z.EncBinary()
2263-
_ = yym31
2314+
yym37 := z.EncBinary()
2315+
_ = yym37
22642316
if false {
22652317
} else {
22662318
z.F.EncSliceStringV(x.AlphaTags, false, e)
@@ -2270,89 +2322,37 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
22702322
}
22712323
if yyr2 || yy2arr2 {
22722324
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2273-
if yyq2[9] {
2274-
if x.Requires == nil {
2325+
if yyq2[11] {
2326+
if x.AlphaRequires == nil {
22752327
r.EncodeNil()
22762328
} else {
2277-
yym33 := z.EncBinary()
2278-
_ = yym33
2329+
yym39 := z.EncBinary()
2330+
_ = yym39
22792331
if false {
22802332
} else {
2281-
z.F.EncSliceStringV(x.Requires, false, e)
2333+
z.F.EncSliceStringV(x.AlphaRequires, false, e)
22822334
}
22832335
}
22842336
} else {
22852337
r.EncodeNil()
22862338
}
22872339
} else {
2288-
if yyq2[9] {
2340+
if yyq2[11] {
22892341
z.EncSendContainerState(codecSelfer_containerMapKey1234)
2290-
r.EncodeString(codecSelferC_UTF81234, string("requires"))
2342+
r.EncodeString(codecSelferC_UTF81234, string("alphaRequires"))
22912343
z.EncSendContainerState(codecSelfer_containerMapValue1234)
2292-
if x.Requires == nil {
2344+
if x.AlphaRequires == nil {
22932345
r.EncodeNil()
22942346
} else {
2295-
yym34 := z.EncBinary()
2296-
_ = yym34
2347+
yym40 := z.EncBinary()
2348+
_ = yym40
22972349
if false {
22982350
} else {
2299-
z.F.EncSliceStringV(x.Requires, false, e)
2351+
z.F.EncSliceStringV(x.AlphaRequires, false, e)
23002352
}
23012353
}
23022354
}
23032355
}
2304-
if yyr2 || yy2arr2 {
2305-
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2306-
yym36 := z.EncBinary()
2307-
_ = yym36
2308-
if false {
2309-
} else {
2310-
r.EncodeString(codecSelferC_UTF81234, string(x.Description))
2311-
}
2312-
} else {
2313-
z.EncSendContainerState(codecSelfer_containerMapKey1234)
2314-
r.EncodeString(codecSelferC_UTF81234, string("description"))
2315-
z.EncSendContainerState(codecSelfer_containerMapValue1234)
2316-
yym37 := z.EncBinary()
2317-
_ = yym37
2318-
if false {
2319-
} else {
2320-
r.EncodeString(codecSelferC_UTF81234, string(x.Description))
2321-
}
2322-
}
2323-
if yyr2 || yy2arr2 {
2324-
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
2325-
if x.ExternalMetadata == nil {
2326-
r.EncodeNil()
2327-
} else {
2328-
yym39 := z.EncBinary()
2329-
_ = yym39
2330-
if false {
2331-
} else if z.HasExtensions() && z.EncExt(x.ExternalMetadata) {
2332-
} else if !yym39 && z.IsJSONHandle() {
2333-
z.EncJSONMarshal(x.ExternalMetadata)
2334-
} else {
2335-
z.EncFallback(x.ExternalMetadata)
2336-
}
2337-
}
2338-
} else {
2339-
z.EncSendContainerState(codecSelfer_containerMapKey1234)
2340-
r.EncodeString(codecSelferC_UTF81234, string("externalMetadata"))
2341-
z.EncSendContainerState(codecSelfer_containerMapValue1234)
2342-
if x.ExternalMetadata == nil {
2343-
r.EncodeNil()
2344-
} else {
2345-
yym40 := z.EncBinary()
2346-
_ = yym40
2347-
if false {
2348-
} else if z.HasExtensions() && z.EncExt(x.ExternalMetadata) {
2349-
} else if !yym40 && z.IsJSONHandle() {
2350-
z.EncJSONMarshal(x.ExternalMetadata)
2351-
} else {
2352-
z.EncFallback(x.ExternalMetadata)
2353-
}
2354-
}
2355-
}
23562356
if yyr2 || yy2arr2 {
23572357
z.EncSendContainerState(codecSelfer_containerArrayEnd1234)
23582358
} else {
@@ -2511,59 +2511,59 @@ func (x *ServiceClass) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
25112511
*((*string)(yyv18)) = r.DecodeString()
25122512
}
25132513
}
2514-
case "alphaTags":
2514+
case "description":
25152515
if r.TryDecodeAsNil() {
2516-
x.AlphaTags = nil
2516+
x.Description = ""
25172517
} else {
2518-
yyv20 := &x.AlphaTags
2518+
yyv20 := &x.Description
25192519
yym21 := z.DecBinary()
25202520
_ = yym21
25212521
if false {
25222522
} else {
2523-
z.F.DecSliceStringX(yyv20, false, d)
2523+
*((*string)(yyv20)) = r.DecodeString()
25242524
}
25252525
}
2526-
case "requires":
2526+
case "externalMetadata":
25272527
if r.TryDecodeAsNil() {
2528-
x.Requires = nil
2528+
if x.ExternalMetadata != nil {
2529+
x.ExternalMetadata = nil
2530+
}
25292531
} else {
2530-
yyv22 := &x.Requires
2532+
if x.ExternalMetadata == nil {
2533+
x.ExternalMetadata = new(pkg4_runtime.RawExtension)
2534+
}
25312535
yym23 := z.DecBinary()
25322536
_ = yym23
25332537
if false {
2538+
} else if z.HasExtensions() && z.DecExt(x.ExternalMetadata) {
2539+
} else if !yym23 && z.IsJSONHandle() {
2540+
z.DecJSONUnmarshal(x.ExternalMetadata)
25342541
} else {
2535-
z.F.DecSliceStringX(yyv22, false, d)
2542+
z.DecFallback(x.ExternalMetadata, false)
25362543
}
25372544
}
2538-
case "description":
2545+
case "alphaTags":
25392546
if r.TryDecodeAsNil() {
2540-
x.Description = ""
2547+
x.AlphaTags = nil
25412548
} else {
2542-
yyv24 := &x.Description
2549+
yyv24 := &x.AlphaTags
25432550
yym25 := z.DecBinary()
25442551
_ = yym25
25452552
if false {
25462553
} else {
2547-
*((*string)(yyv24)) = r.DecodeString()
2554+
z.F.DecSliceStringX(yyv24, false, d)
25482555
}
25492556
}
2550-
case "externalMetadata":
2557+
case "alphaRequires":
25512558
if r.TryDecodeAsNil() {
2552-
if x.ExternalMetadata != nil {
2553-
x.ExternalMetadata = nil
2554-
}
2559+
x.AlphaRequires = nil
25552560
} else {
2556-
if x.ExternalMetadata == nil {
2557-
x.ExternalMetadata = new(pkg4_runtime.RawExtension)
2558-
}
2561+
yyv26 := &x.AlphaRequires
25592562
yym27 := z.DecBinary()
25602563
_ = yym27
25612564
if false {
2562-
} else if z.HasExtensions() && z.DecExt(x.ExternalMetadata) {
2563-
} else if !yym27 && z.IsJSONHandle() {
2564-
z.DecJSONUnmarshal(x.ExternalMetadata)
25652565
} else {
2566-
z.DecFallback(x.ExternalMetadata, false)
2566+
z.F.DecSliceStringX(yyv26, false, d)
25672567
}
25682568
}
25692569
default:
@@ -2769,14 +2769,14 @@ func (x *ServiceClass) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
27692769
}
27702770
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
27712771
if r.TryDecodeAsNil() {
2772-
x.AlphaTags = nil
2772+
x.Description = ""
27732773
} else {
2774-
yyv45 := &x.AlphaTags
2774+
yyv45 := &x.Description
27752775
yym46 := z.DecBinary()
27762776
_ = yym46
27772777
if false {
27782778
} else {
2779-
z.F.DecSliceStringX(yyv45, false, d)
2779+
*((*string)(yyv45)) = r.DecodeString()
27802780
}
27812781
}
27822782
yyj28++
@@ -2791,14 +2791,21 @@ func (x *ServiceClass) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
27912791
}
27922792
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
27932793
if r.TryDecodeAsNil() {
2794-
x.Requires = nil
2794+
if x.ExternalMetadata != nil {
2795+
x.ExternalMetadata = nil
2796+
}
27952797
} else {
2796-
yyv47 := &x.Requires
2798+
if x.ExternalMetadata == nil {
2799+
x.ExternalMetadata = new(pkg4_runtime.RawExtension)
2800+
}
27972801
yym48 := z.DecBinary()
27982802
_ = yym48
27992803
if false {
2804+
} else if z.HasExtensions() && z.DecExt(x.ExternalMetadata) {
2805+
} else if !yym48 && z.IsJSONHandle() {
2806+
z.DecJSONUnmarshal(x.ExternalMetadata)
28002807
} else {
2801-
z.F.DecSliceStringX(yyv47, false, d)
2808+
z.DecFallback(x.ExternalMetadata, false)
28022809
}
28032810
}
28042811
yyj28++
@@ -2813,14 +2820,14 @@ func (x *ServiceClass) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
28132820
}
28142821
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
28152822
if r.TryDecodeAsNil() {
2816-
x.Description = ""
2823+
x.AlphaTags = nil
28172824
} else {
2818-
yyv49 := &x.Description
2825+
yyv49 := &x.AlphaTags
28192826
yym50 := z.DecBinary()
28202827
_ = yym50
28212828
if false {
28222829
} else {
2823-
*((*string)(yyv49)) = r.DecodeString()
2830+
z.F.DecSliceStringX(yyv49, false, d)
28242831
}
28252832
}
28262833
yyj28++
@@ -2835,21 +2842,14 @@ func (x *ServiceClass) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
28352842
}
28362843
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
28372844
if r.TryDecodeAsNil() {
2838-
if x.ExternalMetadata != nil {
2839-
x.ExternalMetadata = nil
2840-
}
2845+
x.AlphaRequires = nil
28412846
} else {
2842-
if x.ExternalMetadata == nil {
2843-
x.ExternalMetadata = new(pkg4_runtime.RawExtension)
2844-
}
2847+
yyv51 := &x.AlphaRequires
28452848
yym52 := z.DecBinary()
28462849
_ = yym52
28472850
if false {
2848-
} else if z.HasExtensions() && z.DecExt(x.ExternalMetadata) {
2849-
} else if !yym52 && z.IsJSONHandle() {
2850-
z.DecJSONUnmarshal(x.ExternalMetadata)
28512851
} else {
2852-
z.DecFallback(x.ExternalMetadata, false)
2852+
z.F.DecSliceStringX(yyv51, false, d)
28532853
}
28542854
}
28552855
for {

0 commit comments

Comments
 (0)