Skip to content

Commit 6e6ce81

Browse files
alexgeorgousisalexgeorgousis
committed
Update conversion webhooks
1 parent 6fa2003 commit 6e6ce81

File tree

6 files changed

+72
-10
lines changed

6 files changed

+72
-10
lines changed

‎apis/pipelines/v1alpha5/run_conversion.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ func (src *Run) ConvertTo(dstRaw conversion.Hub) error {
2929
remainder.ProviderStatusNamespace,
3030
)
3131

32+
dst.Spec.Parameters = convertRuntimeParametersTo(src.Spec.RuntimeParameters)
33+
3234
removeProviderAnnotation(dst)
3335

3436
dst.TypeMeta.APIVersion = dstApiVersion
@@ -52,6 +54,7 @@ func (dst *Run) ConvertFrom(srcRaw conversion.Hub) error {
5254
dst.Status.ProviderId = convertProviderAndIdFrom(src.Status.Provider)
5355
dst.Status.ObservedPipelineVersion = src.Status.Dependencies.Pipeline.Version
5456
dst.TypeMeta.APIVersion = dstApiVersion
57+
dst.Spec.RuntimeParameters = convertRuntimeParametersFrom(src.Spec.Parameters)
5558

5659
return pipelines.SetConversionAnnotations(dst, &remainder)
5760
}

‎apis/pipelines/v1alpha5/runconfiguration_conversion.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (src *RunConfiguration) ConvertTo(dstRaw conversion.Hub) error {
2727
}
2828

2929
dst.Spec.Run.ExperimentName = src.Spec.Run.ExperimentName
30-
dst.Spec.Run.RuntimeParameters = convertRuntimeParametersTo(
30+
dst.Spec.Run.Parameters = convertRuntimeParametersTo(
3131
src.Spec.Run.RuntimeParameters,
3232
)
3333
dst.Spec.Run.Artifacts = convertArtifactsTo(src.Spec.Run.Artifacts)
@@ -59,7 +59,7 @@ func (dst *RunConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
5959
Version: src.Spec.Run.Pipeline.Version,
6060
}
6161
dst.Spec.Run.ExperimentName = src.Spec.Run.ExperimentName
62-
dst.Spec.Run.RuntimeParameters = convertRuntimeParametersFrom(src.Spec.Run.RuntimeParameters)
62+
dst.Spec.Run.RuntimeParameters = convertRuntimeParametersFrom(src.Spec.Run.Parameters)
6363
dst.Spec.Run.Artifacts = convertArtifactsFrom(src.Spec.Run.Artifacts)
6464
dst.Spec.Triggers = convertTriggersFrom(src.Spec.Triggers, &remainder)
6565
dst.Status.SynchronizationState = src.Status.Conditions.GetSyncStateFromReason()
@@ -196,21 +196,21 @@ func convertFromHubValueFrom(v *hub.ValueFrom) *ValueFrom {
196196
return nil
197197
}
198198

199-
func convertRuntimeParametersTo(rtp []RuntimeParameter) []hub.RuntimeParameter {
200-
var hubRtp []hub.RuntimeParameter
199+
func convertRuntimeParametersTo(rtp []RuntimeParameter) []hub.Parameter {
200+
var hubParams []hub.Parameter
201201
for _, namedValue := range rtp {
202-
hubRtp = append(hubRtp, hub.RuntimeParameter{
202+
hubParams = append(hubParams, hub.Parameter{
203203
Name: namedValue.Name,
204204
Value: namedValue.Value,
205205
ValueFrom: namedValue.ValueFrom.convertToHub(),
206206
})
207207
}
208-
return hubRtp
208+
return hubParams
209209
}
210210

211-
func convertRuntimeParametersFrom(hubRtp []hub.RuntimeParameter) []RuntimeParameter {
211+
func convertRuntimeParametersFrom(hubParams []hub.Parameter) []RuntimeParameter {
212212
var rtp []RuntimeParameter
213-
for _, namedValue := range hubRtp {
213+
for _, namedValue := range hubParams {
214214
rtp = append(rtp, RuntimeParameter{
215215
Name: namedValue.Name,
216216
Value: namedValue.Value,

‎apis/pipelines/v1alpha5/runschedule_conversion.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (src *RunSchedule) ConvertTo(dstRaw conversion.Hub) error {
2020
Version: src.Spec.Pipeline.Version,
2121
}
2222
dst.Spec.ExperimentName = src.Spec.ExperimentName
23-
dst.Spec.RuntimeParameters = src.Spec.RuntimeParameters
23+
dst.Spec.Parameters = src.Spec.RuntimeParameters
2424
dst.Spec.Artifacts = convertArtifactsTo(src.Spec.Artifacts)
2525
dst.Spec.Schedule = convertScheduleTo(
2626
src.Spec.Schedule,
@@ -52,7 +52,7 @@ func (dst *RunSchedule) ConvertFrom(srcRaw conversion.Hub) error {
5252
Version: src.Spec.Pipeline.Version,
5353
}
5454
dst.Spec.ExperimentName = src.Spec.ExperimentName
55-
dst.Spec.RuntimeParameters = src.Spec.RuntimeParameters
55+
dst.Spec.RuntimeParameters = src.Spec.Parameters
5656
dst.Spec.Artifacts = convertArtifactsFrom(src.Spec.Artifacts)
5757

5858
schedule, err := convertCronExpressionFrom(src.Spec.Schedule, &remainder)

‎apis/pipelines/v1alpha6/run_conversion.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ func (src *Run) ConvertTo(dstRaw conversion.Hub) error {
3030
)
3131
dst.TypeMeta.APIVersion = dstApiVersion
3232

33+
dst.Spec.Parameters = convertRuntimeParametersTo(src.Spec.RuntimeParameters)
34+
3335
return nil
3436
}
3537

@@ -49,6 +51,7 @@ func (dst *Run) ConvertFrom(srcRaw conversion.Hub) error {
4951
remainder.ProviderStatusNamespace = src.Status.Provider.Name.Namespace
5052
dst.Status.SynchronizationState = src.Status.Conditions.GetSyncStateFromReason()
5153
dst.TypeMeta.APIVersion = dstApiVersion
54+
dst.Spec.RuntimeParameters = convertRuntimeParametersFrom(src.Spec.Parameters)
5255

5356
return pipelines.SetConversionAnnotations(dst, &remainder)
5457
}

‎apis/pipelines/v1alpha6/runconfiguration_conversion.go‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ func (src *RunConfiguration) ConvertTo(dstRaw conversion.Hub) error {
3131
)
3232
dst.TypeMeta.APIVersion = dstApiVersion
3333

34+
dst.Spec.Run.Parameters = convertRuntimeParametersTo(
35+
src.Spec.Run.RuntimeParameters,
36+
)
37+
3438
return nil
3539
}
3640

@@ -50,9 +54,58 @@ func (dst *RunConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
5054
dst.Status.Provider = src.Status.Provider.Name
5155
remainder.ProviderNamespace = src.Spec.Run.Provider.Namespace
5256
remainder.ProviderStatusNamespace = src.Status.Provider.Namespace
57+
dst.Spec.Run.RuntimeParameters = convertRuntimeParametersFrom(src.Spec.Run.Parameters)
5358

5459
dst.TypeMeta.APIVersion = dstApiVersion
5560
dst.Status.SynchronizationState = src.Status.Conditions.GetSyncStateFromReason()
5661

5762
return pipelines.SetConversionAnnotations(dst, &remainder)
5863
}
64+
65+
func (v *ValueFrom) convertToHub() *hub.ValueFrom {
66+
if v != nil {
67+
return &hub.ValueFrom{
68+
RunConfigurationRef: hub.RunConfigurationRef{
69+
Name: v.RunConfigurationRef.Name,
70+
OutputArtifact: v.RunConfigurationRef.OutputArtifact,
71+
},
72+
}
73+
}
74+
return nil
75+
}
76+
77+
func convertFromHubValueFrom(v *hub.ValueFrom) *ValueFrom {
78+
if v != nil {
79+
return &ValueFrom{
80+
RunConfigurationRef: RunConfigurationRef{
81+
Name: v.RunConfigurationRef.Name,
82+
OutputArtifact: v.RunConfigurationRef.OutputArtifact,
83+
},
84+
}
85+
}
86+
return nil
87+
}
88+
89+
func convertRuntimeParametersTo(rtp []RuntimeParameter) []hub.Parameter {
90+
var hubParams []hub.Parameter
91+
for _, namedValue := range rtp {
92+
hubParams = append(hubParams, hub.Parameter{
93+
Name: namedValue.Name,
94+
Value: namedValue.Value,
95+
ValueFrom: namedValue.ValueFrom.convertToHub(),
96+
})
97+
}
98+
return hubParams
99+
}
100+
101+
func convertRuntimeParametersFrom(hubParams []hub.Parameter) []RuntimeParameter {
102+
var rtp []RuntimeParameter
103+
for _, namedValue := range hubParams {
104+
rtp = append(rtp, RuntimeParameter{
105+
Name: namedValue.Name,
106+
Value: namedValue.Value,
107+
ValueFrom: convertFromHubValueFrom(namedValue.ValueFrom),
108+
})
109+
}
110+
return rtp
111+
}

‎apis/pipelines/v1alpha6/runschedule_conversion.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ func (src *RunSchedule) ConvertTo(dstRaw conversion.Hub) error {
2929
)
3030
dst.TypeMeta.APIVersion = dstApiVersion
3131

32+
dst.Spec.Parameters = src.Spec.RuntimeParameters
33+
3234
return nil
3335
}
3436

@@ -42,6 +44,7 @@ func (dst *RunSchedule) ConvertFrom(srcRaw conversion.Hub) error {
4244
}
4345

4446
dst.Spec.Provider = src.Spec.Provider.Name
47+
dst.Spec.RuntimeParameters = src.Spec.Parameters
4548
dst.Status.Provider.Name = src.Status.Provider.Name.Name
4649
remainder.ProviderNamespace = src.Spec.Provider.Namespace
4750
remainder.ProviderStatusNamespace = src.Status.Provider.Name.Namespace

0 commit comments

Comments
 (0)