Skip to content

Commit a4d12eb

Browse files
authored
Generate correct initial state for delegate handlers (#2873)
1 parent 3a2a9d4 commit a4d12eb

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

tools/scaffolder/internal/generate/controller.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,17 @@ func generateDelegatingStateHandlers(f *jen.File, controllerName, resourceName,
267267
"HandleDeletionRequested",
268268
"HandleDeleting",
269269
}
270+
startStateMap := map[string]string{
271+
"HandleInitial": "StateInitial",
272+
"HandleImportRequested": "StateImportRequested",
273+
"HandleImported": "StateImported",
274+
"HandleCreating": "StateCreating",
275+
"HandleCreated": "StateCreated",
276+
"HandleUpdating": "StateUpdating",
277+
"HandleUpdated": "StateUpdated",
278+
"HandleDeletionRequested": "StateDeletionRequested",
279+
"HandleDeleting": "StateDeleting",
280+
}
270281

271282
for _, handlerName := range handlers {
272283
f.Comment(fmt.Sprintf("%s delegates to the version-specific handler", handlerName))
@@ -280,7 +291,7 @@ func generateDelegatingStateHandlers(f *jen.File, controllerName, resourceName,
280291
jen.List(jen.Id("handler"), jen.Id("err")).Op(":=").Id("h").Dot("getHandlerForResource").Call(jen.Id(strings.ToLower(resourceName))),
281292
jen.If(jen.Id("err").Op("!=").Nil()).Block(
282293
jen.Return(jen.Qual("github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/result", "Error").Call(
283-
jen.Qual("github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state", "StateInitial"),
294+
jen.Qual("github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state", startStateMap[handlerName]),
284295
jen.Id("err"),
285296
)),
286297
),
@@ -299,7 +310,7 @@ func generateDelegatingStateHandlers(f *jen.File, controllerName, resourceName,
299310
)
300311

301312
generateMapperFunctions(f, controllerName, resourceName, apiPkg, refsByKind)
302-
313+
303314
generateSetupWithManager(f, controllerName, resourceName, refsByKind)
304315
}
305316

0 commit comments

Comments
 (0)