controller: rename secretclient to api since it contains more than se…

…cret utils now Signed-off-by: Muvaffak Onus <me@muvaf.com>
crossplane · Oct 22, 2021 · bc01a67 · bc01a67
1 parent b249ad8
commit bc01a67
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/pkg/controller/secretclient.go → pkg/controller/api.go b/pkg/controller/secretclient.go → pkg/controller/api.go
@@ -81,7 +81,7 @@ func (ac *APICallbacks) Apply(name string) terraform.CallbackFn {
 		if kErr := ac.kube.Get(ctx, nn, tr); kErr != nil {
 			return errors.Wrap(kErr, "cannot get Terraformed resource")
 		}
-		tr.SetConditions(resource.LastOperationCondition(err))
+		tr.SetConditions(resource.AsyncOperationCondition(err))
 		return errors.Wrap(ac.kube.Status().Update(ctx, tr), errStatusUpdate)
 	}
 }
@@ -95,7 +95,7 @@ func (ac *APICallbacks) Destroy(name string) terraform.CallbackFn {
 		if kErr := ac.kube.Get(ctx, nn, tr); kErr != nil {
 			return errors.Wrap(kErr, "cannot get Terraformed resource")
 		}
-		tr.SetConditions(resource.LastOperationCondition(err))
+		tr.SetConditions(resource.AsyncOperationCondition(err))
 		return errors.Wrap(ac.kube.Status().Update(ctx, tr), errStatusUpdate)
 	}
 }
diff --git a/pkg/controller/external.go b/pkg/controller/external.go
@@ -111,7 +111,7 @@ type external struct {
 	callback  CallbackProvider
 }
 
-func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed.ExternalObservation, error) {
+func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed.ExternalObservation, error) { //nolint:gocyclo
 	// We skip the gocyclo check because most of the operations are straight-forward
 	// and serial.
 	// TODO(muvaf): Look for ways to reduce the cyclomatic complexity without
@@ -188,7 +188,7 @@ func (e *external) Observe(ctx context.Context, mg xpresource.Managed) (managed.
 }
 
 func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) {
-	if e.callback != nil {
+	if e.config.UseAsync {
 		return managed.ExternalCreation{}, errors.Wrap(e.workspace.ApplyAsync(e.callback.Apply(mg.GetName())), errStartAsyncApply)
 	}
 	tr, ok := mg.(resource.Terraformed)
@@ -215,7 +215,7 @@ func (e *external) Create(ctx context.Context, mg xpresource.Managed) (managed.E
 }
 
 func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) {
-	if e.callback != nil {
+	if e.config.UseAsync {
 		return managed.ExternalUpdate{}, errors.Wrap(e.workspace.ApplyAsync(e.callback.Apply(mg.GetName())), errStartAsyncApply)
 	}
 	tr, ok := mg.(resource.Terraformed)
@@ -234,7 +234,7 @@ func (e *external) Update(ctx context.Context, mg xpresource.Managed) (managed.E
 }
 
 func (e *external) Delete(ctx context.Context, mg xpresource.Managed) error {
-	if e.callback != nil {
+	if e.config.UseAsync {
 		return errors.Wrap(e.workspace.DestroyAsync(e.callback.Destroy(mg.GetName())), errStartAsyncDestroy)
 	}
 	return errors.Wrap(e.workspace.Destroy(ctx), errDestroy)

diff --git a/pkg/controller/external_test.go b/pkg/controller/external_test.go
@@ -183,9 +183,8 @@ func TestConnect(t *testing.T) {
 
 func TestObserve(t *testing.T) {
 	type args struct {
-		w     Workspace
-		async bool
-		obj   xpresource.Managed
+		w   Workspace
+		obj xpresource.Managed
 	}
 	type want struct {
 		obs managed.ExternalObservation

diff --git a/pkg/resource/conditions.go b/pkg/resource/conditions.go
@@ -33,9 +33,9 @@ const (
 	ReasonSuccess        xpv1.ConditionReason = "Success"
 )
 
-// LastOperationCondition returns the condition depending on the content
+// AsyncOperationCondition returns the condition depending on the content
 // of the error.
-func LastOperationCondition(err error) xpv1.Condition {
+func AsyncOperationCondition(err error) xpv1.Condition {
 	switch {
 	case err == nil:
 		return xpv1.Condition{