Skip to content

Commit 32b3ba5

Browse files
authored
Update reconciler.io/dies to 0.13.0 (#432)
* Update reconciler.io/dies to 0.13.0 Signed-off-by: Scott Andrews <scott@andrews.me> * Gernerate die mutation methods where possible Signed-off-by: Scott Andrews <scott@andrews.me> --------- Signed-off-by: Scott Andrews <scott@andrews.me>
1 parent 820f1b9 commit 32b3ba5

File tree

7 files changed

+691
-101
lines changed

7 files changed

+691
-101
lines changed

dies/v1/clusterworkloadresourcemapping.go

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,17 @@ import (
2424
type _ = servicebindingv1.ClusterWorkloadResourceMapping
2525

2626
// +die
27+
// +die:field:name=Versions,die=ClusterWorkloadResourceMappingTemplateDie,listMapKey=Version
2728
type _ = servicebindingv1.ClusterWorkloadResourceMappingSpec
2829

30+
// deprecated use VersionDie
2931
func (d *ClusterWorkloadResourceMappingSpecDie) VersionsDie(version string, fn func(d *ClusterWorkloadResourceMappingTemplateDie)) *ClusterWorkloadResourceMappingSpecDie {
30-
return d.DieStamp(func(r *servicebindingv1.ClusterWorkloadResourceMappingSpec) {
31-
for i := range r.Versions {
32-
if version == r.Versions[i].Version {
33-
d := ClusterWorkloadResourceMappingTemplateBlank.DieImmutable(false).DieFeed(r.Versions[i])
34-
fn(d)
35-
r.Versions[i] = d.DieRelease()
36-
return
37-
}
38-
}
39-
40-
d := ClusterWorkloadResourceMappingTemplateBlank.DieImmutable(false).DieFeed(servicebindingv1.ClusterWorkloadResourceMappingTemplate{Version: version})
41-
fn(d)
42-
r.Versions = append(r.Versions, d.DieRelease())
43-
})
32+
return d.VersionDie(version, fn)
4433
}
4534

4635
// +die
36+
// +die:field:name=Containers,die=ClusterWorkloadResourceMappingContainerDie,listType=atomic
4737
type _ = servicebindingv1.ClusterWorkloadResourceMappingTemplate
4838

49-
func (d *ClusterWorkloadResourceMappingTemplateDie) ContainersDie(containers ...*ClusterWorkloadResourceMappingContainerDie) *ClusterWorkloadResourceMappingTemplateDie {
50-
return d.DieStamp(func(r *servicebindingv1.ClusterWorkloadResourceMappingTemplate) {
51-
r.Containers = make([]servicebindingv1.ClusterWorkloadResourceMappingContainer, len(containers))
52-
for i := range containers {
53-
r.Containers[i] = containers[i].DieRelease()
54-
}
55-
})
56-
}
57-
5839
// +die
5940
type _ = servicebindingv1.ClusterWorkloadResourceMappingContainer

dies/v1/servicebinding.go

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package v1
1818

1919
import (
20-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2120
diemetav1 "reconciler.io/dies/apis/meta/v1"
2221

2322
servicebindingv1 "github.com/servicebinding/runtime/apis/v1"
@@ -27,81 +26,29 @@ import (
2726
type _ = servicebindingv1.ServiceBinding
2827

2928
// +die
29+
// +die:field:name=Workload,die=ServiceBindingWorkloadReferenceDie
30+
// +die:field:name=Service,die=ServiceBindingServiceReferenceDie
31+
// +die:field:name=Env,die=EnvMappingDie,listType=map
3032
type _ = servicebindingv1.ServiceBindingSpec
3133

32-
func (d *ServiceBindingSpecDie) WorkloadDie(fn func(d *ServiceBindingWorkloadReferenceDie)) *ServiceBindingSpecDie {
33-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingSpec) {
34-
d := ServiceBindingWorkloadReferenceBlank.DieImmutable(false).DieFeed(r.Workload)
35-
fn(d)
36-
r.Workload = d.DieRelease()
37-
})
38-
}
39-
40-
func (d *ServiceBindingSpecDie) ServiceDie(fn func(d *ServiceBindingServiceReferenceDie)) *ServiceBindingSpecDie {
41-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingSpec) {
42-
d := ServiceBindingServiceReferenceBlank.DieImmutable(false).DieFeed(r.Service)
43-
fn(d)
44-
r.Service = d.DieRelease()
45-
})
46-
}
47-
48-
func (d *ServiceBindingSpecDie) EnvDie(name string, fn func(d *EnvMappingDie)) *ServiceBindingSpecDie {
49-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingSpec) {
50-
for i := range r.Env {
51-
if name == r.Env[i].Name {
52-
d := EnvMappingBlank.DieImmutable(false).DieFeed(r.Env[i])
53-
fn(d)
54-
r.Env[i] = d.DieRelease()
55-
return
56-
}
57-
}
58-
59-
d := EnvMappingBlank.DieImmutable(false).DieFeed(servicebindingv1.EnvMapping{Name: name})
60-
fn(d)
61-
r.Env = append(r.Env, d.DieRelease())
62-
})
63-
}
64-
6534
// +die
35+
// +die:field:name=Selector,package=_/meta/v1,die=LabelSelectorDie,pointer=true
6636
type _ = servicebindingv1.ServiceBindingWorkloadReference
6737

68-
func (d *ServiceBindingWorkloadReferenceDie) SelectorDie(fn func(d *diemetav1.LabelSelectorDie)) *ServiceBindingWorkloadReferenceDie {
69-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingWorkloadReference) {
70-
d := diemetav1.LabelSelectorBlank.DieImmutable(false).DieFeedPtr(r.Selector)
71-
fn(d)
72-
r.Selector = d.DieReleasePtr()
73-
})
74-
}
75-
7638
// +die
7739
type _ = servicebindingv1.ServiceBindingServiceReference
7840

7941
// +die
8042
type _ = servicebindingv1.EnvMapping
8143

8244
// +die
45+
// +die:field:name=Conditions,package=_/meta/v1,die=ConditionDie,listType=atomic
46+
// +die:field:name=Binding,die=ServiceBindingSecretReferenceDie,pointer=true
8347
type _ = servicebindingv1.ServiceBindingStatus
8448

85-
func (d *ServiceBindingStatusDie) ConditionsDie(conditions ...*diemetav1.ConditionDie) *ServiceBindingStatusDie {
86-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingStatus) {
87-
r.Conditions = make([]metav1.Condition, len(conditions))
88-
for i := range conditions {
89-
r.Conditions[i] = conditions[i].DieRelease()
90-
}
91-
})
92-
}
93-
9449
var ServiceBindingConditionReady = diemetav1.ConditionBlank.Type(servicebindingv1.ServiceBindingConditionReady).Unknown().Reason("Initializing")
9550
var ServiceBindingConditionServiceAvailable = diemetav1.ConditionBlank.Type(servicebindingv1.ServiceBindingConditionServiceAvailable).Unknown().Reason("Initializing")
9651
var ServiceBindingConditionWorkloadProjected = diemetav1.ConditionBlank.Type(servicebindingv1.ServiceBindingConditionWorkloadProjected).Unknown().Reason("Initializing")
9752

98-
func (d *ServiceBindingStatusDie) BindingDie(fn func(d *ServiceBindingSecretReferenceDie)) *ServiceBindingStatusDie {
99-
return d.DieStamp(func(r *servicebindingv1.ServiceBindingStatus) {
100-
d := ServiceBindingSecretReferenceBlank.DieImmutable(false).DieFeedPtr(r.Binding)
101-
fn(d)
102-
r.Binding = d.DieReleasePtr()
103-
})
104-
}
105-
10653
// +die
10754
type _ = servicebindingv1.ServiceBindingSecretReference

0 commit comments

Comments
 (0)