Skip to content

Commit 4a9d5a5

Browse files
author
Shawn Hurley
authored
pkg/ansible: Adding unit tests for the ansible operator reconcile loop (#711)
**Description of the change:** Adding unit tests and fakes to test the reconciliation loop of the ansible operator.
1 parent 1ea16af commit 4a9d5a5

File tree

6 files changed

+594
-12
lines changed

6 files changed

+594
-12
lines changed

Gopkg.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/ansible/controller/reconcile.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
9999
}
100100
if !contains(pendingFinalizers, finalizer) && deleted {
101101
logger.Info("Resource is terminated, skipping reconcilation")
102-
return reconcileResult, nil
102+
return reconcile.Result{}, nil
103103
}
104104

105105
spec := u.Object["spec"]
@@ -132,7 +132,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
132132
ansiblestatus.RunningMessage,
133133
)
134134
ansiblestatus.SetCondition(&crStatus, *c)
135-
u.Object["status"] = crStatus
135+
u.Object["status"] = crStatus.GetJSONMap()
136136
err = r.Client.Update(context.TODO(), u)
137137
if err != nil {
138138
return reconcileResult, err
@@ -159,7 +159,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
159159
// iterate events from ansible, looking for the final one
160160
statusEvent := eventapi.StatusJobEvent{}
161161
failureMessages := eventapi.FailureMessages{}
162-
for event := range result.Events {
162+
for event := range result.Events() {
163163
for _, eHandler := range r.EventHandlers {
164164
go eHandler.Handle(ident, u, event)
165165
}
@@ -232,7 +232,7 @@ func (r *AnsibleOperatorReconciler) Reconcile(request reconcile.Request) (reconc
232232
ansiblestatus.SetCondition(&crStatus, *c)
233233
}
234234
// This needs the status subresource to be enabled by default.
235-
u.Object["status"] = crStatus
235+
u.Object["status"] = crStatus.GetJSONMap()
236236
err = r.Client.Update(context.TODO(), u)
237237
return reconcileResult, err
238238

0 commit comments

Comments
 (0)