Uncomment tfcli Builder code

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
crossplane · Aug 23, 2021 · d316670 · d316670
1 parent 15b5d98
commit d316670
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/pkg/process/fork.go b/pkg/process/fork.go
@@ -204,7 +204,7 @@ func (pi *Info) GetCmd() *exec.Cmd {
 }
 
 func (pi *Info) Kill() error {
-	if pi.cmd == nil || pi.cmd.Process == nil {
+	if pi.cmd == nil || pi.cmd.Process == nil || (pi.cmd.ProcessState != nil && pi.cmd.ProcessState.Exited()) {
 		return nil
 	}
 	return errors.Wrap(pi.cmd.Process.Kill(), errKill)

diff --git a/pkg/terraform/controller.go b/pkg/terraform/controller.go
@@ -22,6 +22,7 @@ import (
 	"github.com/crossplane-contrib/terrajet/pkg/conversion"
 	"github.com/crossplane-contrib/terrajet/pkg/meta"
 	"github.com/crossplane-contrib/terrajet/pkg/terraform/resource"
+	"github.com/crossplane-contrib/terrajet/pkg/tfcli"
 )
 
 const (
@@ -67,30 +68,25 @@ func (c *connector) Connect(ctx context.Context, mg xpresource.Managed) (managed
 		return nil, errors.New(errUnexpectedObject)
 	}
 
-	// TODO(hasan): create and pass the implementation of tfcli builder once available
-	/*
-		pc, err := c.providerConfig(ctx, c.kube, mg)
-		if err != nil {
-			return nil, errors.Wrap(err, "cannot get provider config")
-		}
-		tfcb := tfcli.NewClientBuilder().
-			WithLogger(c.logger).
-			WithResourceName(tr.GetName()).
-			WithHandle(string(tr.GetUID())).
-			WithProviderConfiguration(pc).
-			WithResourceType(tr.GetTerraformResourceType())
-
-		tfcli, err := conversion.BuildClientForResource(tfcb, tr)
-	*/
-
-	tfcli, err := conversion.BuildClientForResource(ctx, nil, tr)
+	pc, err := c.providerConfig(ctx, c.kube, mg)
+	if err != nil {
+		return nil, errors.Wrap(err, "cannot get provider config")
+	}
+	tfcb := tfcli.NewClientBuilder().
+		WithLogger(c.logger).
+		WithResourceName(tr.GetName()).
+		WithHandle(string(tr.GetUID())).
+		WithProviderConfiguration(pc).
+		WithResourceType(tr.GetTerraformResourceType())
+
+	tfCli, err := conversion.BuildClientForResource(ctx, tfcb, tr)
 	if err != nil {
 		return nil, errors.Wrap(err, "cannot build tf client for resource")
 	}
 
 	return &external{
 		kube:   c.kube,
-		tf:     conversion.NewCli(tfcli),
+		tf:     conversion.NewCli(tfCli),
 		log:    c.logger,
 		record: event.NewNopRecorder(),
 	}, nil

diff --git a/pkg/tfcli/init.go b/pkg/tfcli/init.go
@@ -51,7 +51,10 @@ func (c *client) init(ctx context.Context) error {
 	err := c.closeOnError(ctx, func() error {
 		var err error
 		initLockExists, err = c.initConfiguration(types.OperationInit, true)
-		if errors.Is(err, cliErrors.OperationInProgressError{}) && initLockExists {
+		if (err == nil || errors.Is(err, cliErrors.OperationInProgressError{})) && initLockExists {
+			if err == nil || cliErrors.IsOperationInProgress(err, types.OperationInit) {
+				return c.removeStateStore()
+			}
 			return nil
 		}
 		return err