Pass provider credentials as environment variables

- Fixes #99 Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
crossplane · Oct 13, 2021 · 57f7df5 · 57f7df5
1 parent 734cd94
commit 57f7df5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/pkg/terraform/store.go b/pkg/terraform/store.go
@@ -52,6 +52,7 @@ type Setup struct {
 	Version       string
 	Requirement   ProviderRequirement
 	Configuration ProviderConfiguration
+	Env           []string
 }
 
 // WorkspaceStoreOption lets you configure the workspace store.
@@ -127,6 +128,7 @@ func (ws *WorkspaceStore) Workspace(ctx context.Context, c resource.SecretClient
 	if xpresource.Ignore(os.IsNotExist, err) != nil {
 		return nil, errors.Wrap(err, "cannot stat init lock file")
 	}
+	w.env = ts.Env
 	// We need to initialize only if the workspace hasn't been initialized yet.
 	if !os.IsNotExist(err) {
 		return w, nil

diff --git a/pkg/terraform/workspace.go b/pkg/terraform/workspace.go
@@ -72,6 +72,7 @@ type Workspace struct {
 	LastOperation *Operation
 
 	dir    string
+	env    []string
 	logger logging.Logger
 }
 
@@ -86,7 +87,7 @@ func (w *Workspace) ApplyAsync(callback CallbackFn) error {
 	go func() {
 		defer cancel()
 		cmd := exec.CommandContext(ctx, "terraform", "apply", "-auto-approve", "-input=false", "-lock=false", "-json")
-		cmd.Dir = w.dir
+		w.configureCmd(cmd)
 		out, err := cmd.CombinedOutput()
 		w.LastOperation.MarkEnd()
 		w.logger.Debug("apply async ended", "out", string(out))
@@ -131,7 +132,7 @@ func (w *Workspace) Apply(ctx context.Context) (ApplyResult, error) {
 		return ApplyResult{}, errors.Errorf("%s operation that started at %s is still running", w.LastOperation.Type, w.LastOperation.StartTime().String())
 	}
 	cmd := exec.CommandContext(ctx, "terraform", "apply", "-auto-approve", "-input=false", "-lock=false", "-json")
-	cmd.Dir = w.dir
+	w.configureCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	w.logger.Debug("apply ended", "out", string(out))
 	if err != nil {
@@ -167,7 +168,7 @@ func (w *Workspace) DestroyAsync() error {
 	go func() {
 		defer cancel()
 		cmd := exec.CommandContext(ctx, "terraform", "destroy", "-auto-approve", "-input=false", "-lock=false", "-json")
-		cmd.Dir = w.dir
+		w.configureCmd(cmd)
 		out, err := cmd.CombinedOutput()
 		w.LastOperation.MarkEnd()
 		w.logger.Debug("destroy async ended", "out", string(out))
@@ -188,7 +189,7 @@ func (w *Workspace) Destroy(ctx context.Context) error {
 		return errors.Errorf("%s operation that started at %s is still running", w.LastOperation.Type, w.LastOperation.StartTime().String())
 	}
 	cmd := exec.CommandContext(ctx, "terraform", "destroy", "-auto-approve", "-input=false", "-lock=false", "-json")
-	cmd.Dir = w.dir
+	w.configureCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	w.logger.Debug("destroy ended", "out", string(out))
 	return errors.Wrapf(err, "cannot destroy: %s", string(out))
@@ -221,7 +222,7 @@ func (w *Workspace) Refresh(ctx context.Context) (RefreshResult, error) {
 		}
 	}
 	cmd := exec.CommandContext(ctx, "terraform", "apply", "-refresh-only", "-auto-approve", "-input=false", "-lock=false", "-json")
-	cmd.Dir = w.dir
+	w.configureCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	w.logger.Debug("refresh ended", "out", string(out))
 	if err != nil {
@@ -256,7 +257,7 @@ func (w *Workspace) Plan(ctx context.Context) (PlanResult, error) {
 		return PlanResult{}, errors.Errorf("%s operation that started at %s is still running", w.LastOperation.Type, w.LastOperation.StartTime().String())
 	}
 	cmd := exec.CommandContext(ctx, "terraform", "plan", "-refresh=false", "-input=false", "-lock=false", "-json")
-	cmd.Dir = w.dir
+	w.configureCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	w.logger.Debug("plan ended", "out", string(out))
 	if err != nil {
@@ -287,3 +288,11 @@ func (w *Workspace) Plan(ctx context.Context) (PlanResult, error) {
 		UpToDate: p.Changes.Change == 0,
 	}, nil
 }
+
+func (w *Workspace) configureCmd(cmd *exec.Cmd) {
+	if cmd.Env == nil {
+		cmd.Env = os.Environ()
+	}
+	cmd.Env = append(cmd.Env, w.env...)
+	cmd.Dir = w.dir
+}