Merge pull request #143 from ytsarev/keep-cmd-env

BUGFIX: keep environment when plugin cache enabled

examples/workspace-inline-aws.yaml

@@ -0,0 +1,33 @@
+apiVersion: tf.upbound.io/v1beta1
+kind: Workspace
+metadata:
+  name: sample-inline
+spec:
+  providerConfigRef:
+    name: aws-eu-west-1
+  forProvider:
+    source: Inline
+    module: |
+      resource "aws_vpc" "main" {
+        cidr_block       = "10.0.0.0/16"
+        tags = {
+          Name = var.vpcName
+        }
+      }
+      resource "aws_subnet" "main" {
+        vpc_id     = aws_vpc.main.id
+        cidr_block = "10.0.1.0/24"
+      }
+      output "vpc_id" {
+        value       = aws_vpc.main.id
+      }
+      output "subnet_id" {
+        value       = aws_subnet.main.id
+      }
+      variable "vpcName" {
+        description = "VPC name"
+        type        = string
+      }
+    vars:
+      - key: vpcName
+        value: sample-tf-inline

internal/terraform/terraform.go

@@ -163,13 +163,13 @@ func (h Harness) Init(ctx context.Context, cache bool, o ...InitOption) error {
 	args := append([]string{"init", "-input=false", "-no-color"}, io.args...)
 	cmd := exec.CommandContext(ctx, h.Path, args...) //nolint:gosec
 	cmd.Dir = h.Dir
-	if !cache {
-		for _, e := range os.Environ() {
-			if strings.Contains(e, "TF_PLUGIN_CACHE_DIR") {
+	for _, e := range os.Environ() {
+		if strings.Contains(e, "TF_PLUGIN_CACHE_DIR") {
+			if !cache {
 				continue
 			}
-			cmd.Env = append(cmd.Env, e)
 		}
+		cmd.Env = append(cmd.Env, e)
 	}
 	cmd.Env = append(cmd.Env, "TF_CLI_CONFIG_FILE=./.terraformrc")
 	err := sem.Acquire(ctx, 1)