Skip to content

Commit f5e549b

Browse files
s-vitaliys-vitaliy
authored
Make fromUnstructured public (#232)
* Make fromUnstructured public * Fix unit tests * Fix unit tests
1 parent 00c1dd7 commit f5e549b

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎services/controllers/stream/stream_definition.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type Definition interface {
7575
GetReferenceForSecret(name string) (*corev1.LocalObjectReference, error)
7676
}
7777

78-
func fromUnstructured(obj *unstructured.Unstructured) (Definition, error) {
78+
func FromUnstructured(obj *unstructured.Unstructured) (Definition, error) {
7979
v := unstructuredWrapper{
8080
underlying: obj,
8181
}
@@ -96,5 +96,5 @@ func GetStreamForClass(ctx context.Context, client client.Client, sc *v1.StreamC
9696
if err != nil {
9797
return nil, err
9898
}
99-
return fromUnstructured(&maybeSd)
99+
return FromUnstructured(&maybeSd)
100100
}

‎services/controllers/stream/stream_metadata_service_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func Test_StreamMetadataService_JobConfigurator_NoSecretRefs(t *testing.T) {
3333
unstructuredObj, err := getUnstructured(t, fakeClient)
3434
require.NoError(t, err)
3535

36-
streamDefinition, err := fromUnstructured(&unstructuredObj)
36+
streamDefinition, err := FromUnstructured(&unstructuredObj)
3737
require.NoError(t, err)
3838

3939
service := NewStreamMetadataService(streamClass, streamDefinition)
@@ -87,7 +87,7 @@ func Test_StreamMetadataService_JobConfigurator_SingleSecretRef(t *testing.T) {
8787
unstructuredObj, err := getUnstructured(t, fakeClient)
8888
require.NoError(t, err)
8989

90-
streamDefinition, err := fromUnstructured(&unstructuredObj)
90+
streamDefinition, err := FromUnstructured(&unstructuredObj)
9191
require.NoError(t, err)
9292

9393
service := NewStreamMetadataService(streamClass, streamDefinition)
@@ -143,7 +143,7 @@ func Test_StreamMetadataService_JobConfigurator_NilSecretRefs(t *testing.T) {
143143
unstructuredObj, err := getUnstructured(t, fakeClient)
144144
require.NoError(t, err)
145145

146-
streamDefinition, err := fromUnstructured(&unstructuredObj)
146+
streamDefinition, err := FromUnstructured(&unstructuredObj)
147147
require.NoError(t, err)
148148

149149
service := NewStreamMetadataService(streamClass, streamDefinition)
@@ -197,7 +197,7 @@ func Test_StreamMetadataService_JobConfigurator_MultipleContainers(t *testing.T)
197197
unstructuredObj, err := getUnstructured(t, fakeClient)
198198
require.NoError(t, err)
199199

200-
streamDefinition, err := fromUnstructured(&unstructuredObj)
200+
streamDefinition, err := FromUnstructured(&unstructuredObj)
201201
require.NoError(t, err)
202202

203203
service := NewStreamMetadataService(streamClass, streamDefinition)
@@ -261,7 +261,7 @@ func Test_StreamMetadataService_JobConfigurator_PreservesExistingEnvFrom(t *test
261261
unstructuredObj, err := getUnstructured(t, fakeClient)
262262
require.NoError(t, err)
263263

264-
streamDefinition, err := fromUnstructured(&unstructuredObj)
264+
streamDefinition, err := FromUnstructured(&unstructuredObj)
265265
require.NoError(t, err)
266266

267267
service := NewStreamMetadataService(streamClass, streamDefinition)

‎services/controllers/stream/unstructured_wrapper_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func Test_GetPhase(t *testing.T) {
2222
require.NoError(t, err)
2323

2424
// Act
25-
wrapper, err := fromUnstructured(&unstructuredObj)
25+
wrapper, err := FromUnstructured(&unstructuredObj)
2626

2727
// Assert
2828
require.NoError(t, err)
@@ -39,7 +39,7 @@ func Test_Suspended(t *testing.T) {
3939
require.NoError(t, err)
4040

4141
// Act
42-
wrapper, err := fromUnstructured(&unstructuredObj)
42+
wrapper, err := FromUnstructured(&unstructuredObj)
4343

4444
// Assert
4545
require.NoError(t, err)
@@ -58,7 +58,7 @@ func Test_CurrentConfiguration(t *testing.T) {
5858
require.NoError(t, err)
5959

6060
// Act
61-
wrapper, err := fromUnstructured(&unstructuredObj)
61+
wrapper, err := FromUnstructured(&unstructuredObj)
6262
require.NotNil(t, wrapper)
6363
require.NoError(t, err)
6464
currentConfig, err := wrapper.CurrentConfiguration(nil)
@@ -71,7 +71,7 @@ func Test_CurrentConfiguration(t *testing.T) {
7171
unstructuredObj, err = getUnstructured(t, fakeClient)
7272
require.NoError(t, err)
7373

74-
wrapper, err = fromUnstructured(&unstructuredObj)
74+
wrapper, err = FromUnstructured(&unstructuredObj)
7575
require.NoError(t, err)
7676
require.NotNil(t, wrapper)
7777

@@ -91,7 +91,7 @@ func Test_LastAppliedConfiguration(t *testing.T) {
9191
require.NoError(t, err)
9292

9393
// Act
94-
wrapper, err := fromUnstructured(&unstructuredObj)
94+
wrapper, err := FromUnstructured(&unstructuredObj)
9595
require.NotNil(t, wrapper)
9696
require.NoError(t, err)
9797

@@ -126,7 +126,7 @@ func Test_NamespacedName(t *testing.T) {
126126
require.NoError(t, err)
127127

128128
// Act
129-
wrapper, err := fromUnstructured(&unstructuredObj)
129+
wrapper, err := FromUnstructured(&unstructuredObj)
130130
require.NoError(t, err)
131131
require.NotNil(t, wrapper)
132132

@@ -141,7 +141,7 @@ func Test_SetPhase(t *testing.T) {
141141
unstructuredObj, err := getUnstructured(t, fakeClient)
142142
require.NoError(t, err)
143143

144-
wrapper, err := fromUnstructured(&unstructuredObj)
144+
wrapper, err := FromUnstructured(&unstructuredObj)
145145
require.NotNil(t, wrapper)
146146
require.NoError(t, err)
147147

@@ -156,7 +156,7 @@ func Test_SetPhase(t *testing.T) {
156156
unstructuredObj, err = getUnstructured(t, fakeClient)
157157
require.NoError(t, err)
158158

159-
wrapper, err = fromUnstructured(&unstructuredObj)
159+
wrapper, err = FromUnstructured(&unstructuredObj)
160160
require.NotNil(t, wrapper)
161161
require.NoError(t, err)
162162

@@ -172,7 +172,7 @@ func Test_GetStreamingJobName(t *testing.T) {
172172
require.NoError(t, err)
173173

174174
// Act
175-
wrapper, err := fromUnstructured(&unstructuredObj)
175+
wrapper, err := FromUnstructured(&unstructuredObj)
176176
require.NotNil(t, wrapper)
177177
require.NoError(t, err)
178178

@@ -189,7 +189,7 @@ func Test_GetBackfillJobName(t *testing.T) {
189189
require.NoError(t, err)
190190

191191
// Act
192-
wrapper, err := fromUnstructured(&unstructuredObj)
192+
wrapper, err := FromUnstructured(&unstructuredObj)
193193
require.NotNil(t, wrapper)
194194
require.NoError(t, err)
195195

@@ -206,7 +206,7 @@ func Test_ToOwnerReference(t *testing.T) {
206206
require.NoError(t, err)
207207

208208
// Act
209-
wrapper, err := fromUnstructured(&unstructuredObj)
209+
wrapper, err := FromUnstructured(&unstructuredObj)
210210
require.NotNil(t, wrapper)
211211
require.NoError(t, err)
212212

@@ -227,7 +227,7 @@ func Test_StateString(t *testing.T) {
227227
require.NoError(t, err)
228228

229229
// Act
230-
wrapper, err := fromUnstructured(&unstructuredObj)
230+
wrapper, err := FromUnstructured(&unstructuredObj)
231231
require.NotNil(t, wrapper)
232232
require.NoError(t, err)
233233

@@ -246,7 +246,7 @@ func Test_SetSuspended(t *testing.T) {
246246
require.NoError(t, err)
247247

248248
// Act
249-
wrapper, err := fromUnstructured(&unstructuredObj)
249+
wrapper, err := FromUnstructured(&unstructuredObj)
250250
require.NotNil(t, wrapper)
251251
require.NoError(t, err)
252252
err = wrapper.SetSuspended(true)

0 commit comments

Comments
 (0)