Update mocks & README

upbound · May 25, 2023 · 7778b57 · 7778b57
1 parent c743795
commit 7778b57
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -62,6 +62,15 @@ spec:
     # Use any module source supported by terraform init -from-module.
     source: Remote
     module: https://github.com/crossplane/tf
+    # Environment variables can be passed through
+    env:
+      - name: TFENV_TERRAFORM_VERSION
+        value: '1.3.5'
+      - name: ENV_FROM_CONFIGMAP
+        configMapKeyRef:
+          namespace: my-namespace
+          name: my-config-map
+          key: target-key
     # Variables can be specified inline as a list of key-value pairs or as an json object, or loaded from a ConfigMap or Secret.
     vars:
     - key: region

diff --git a/internal/controller/workspace/workspace_test.go b/internal/controller/workspace/workspace_test.go
@@ -123,7 +123,7 @@ func TestConnect(t *testing.T) {
 		kube      client.Client
 		usage     resource.Tracker
 		fs        afero.Afero
-		terraform func(dir string) tfclient
+		terraform func(dir string, envs ...string) tfclient
 	}
 
 	type args struct {
@@ -215,7 +215,7 @@ func TestConnect(t *testing.T) {
 				},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -254,7 +254,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join(tfDir, string(uid), tfCreds): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -293,7 +293,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join(tfDir, string(uid), "subdir", tfCreds): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -337,7 +337,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join("/tmp", tfDir, string(uid), ".git-credentials"): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -380,7 +380,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join("/tmp", tfDir, string(uid)): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -421,7 +421,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join(tfDir, string(uid), tfConfig): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -462,7 +462,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join(tfDir, string(uid), "subdir", tfConfig): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -498,7 +498,7 @@ func TestConnect(t *testing.T) {
 						errs: map[string]error{filepath.Join(tfDir, string(uid), tfMain): errBoom},
 					},
 				},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit: func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 					}
@@ -528,7 +528,7 @@ func TestConnect(t *testing.T) {
 				},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{MockInit: func(_ context.Context, cache bool, _ ...terraform.InitOption) error { return errBoom }}
 				},
 			},
@@ -552,7 +552,7 @@ func TestConnect(t *testing.T) {
 				},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit:      func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 						MockWorkspace: func(_ context.Context, _ string) error { return errBoom },
@@ -578,7 +578,7 @@ func TestConnect(t *testing.T) {
 			},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockGenerateChecksum: func(ctx context.Context) (string, error) { return "", errBoom },
 					}
@@ -612,7 +612,7 @@ func TestConnect(t *testing.T) {
 			},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockGenerateChecksum: func(ctx context.Context) (string, error) { return tfChecksum, nil },
 						MockWorkspace:        func(_ context.Context, _ string) error { return nil },
@@ -648,7 +648,7 @@ func TestConnect(t *testing.T) {
 				},
 				usage: resource.TrackerFn(func(_ context.Context, _ resource.Managed) error { return nil }),
 				fs:    afero.Afero{Fs: afero.NewMemMapFs()},
-				terraform: func(_ string) tfclient {
+				terraform: func(_ string, _ ...string) tfclient {
 					return &MockTf{
 						MockInit:             func(ctx context.Context, cache bool, o ...terraform.InitOption) error { return nil },
 						MockGenerateChecksum: func(ctx context.Context) (string, error) { return tfChecksum, nil },

diff --git a/internal/terraform/terraform.go b/internal/terraform/terraform.go
@@ -174,8 +174,7 @@ func (h Harness) Init(ctx context.Context, cache bool, o ...InitOption) error {
 		}
 		cmd.Env = append(cmd.Env, e)
 	}
-	cmd.Env = append(cmd.Env, "TF_CLI_CONFIG_FILE=./.terraformrc")
-	cmd.Env = append(cmd.Env, h.Envs...)
+	cmd.Env = append(cmd.Env, "TF_CLI_CONFIG_FILE=./.terraformrc", h.Envs...)
 	err := sem.Acquire(ctx, 1)
 	if err != nil {
 		return errors.Wrap(err, errSemAcquire)