Update mocks & README

upbound · Feb 9, 2023 · fb24ab0 · fb24ab0
1 parent 7ae138a
commit fb24ab0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 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, 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
@@ -112,7 +112,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 {
@@ -204,7 +204,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 },
 					}
@@ -243,7 +243,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 },
 					}
@@ -282,7 +282,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 },
 					}
@@ -326,7 +326,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 },
 					}
@@ -369,7 +369,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 },
 					}
@@ -410,7 +410,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 },
 					}
@@ -451,7 +451,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 },
 					}
@@ -487,7 +487,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 },
 					}
@@ -517,7 +517,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 }}
 				},
 			},
@@ -541,7 +541,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 },
@@ -568,7 +568,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 nil },