Merge pull request #130 from lbergnehr/main

fix(build): add env var to point to provider config
getporter · Jan 24, 2025 · 7234a37 · 7234a37
2 parents f8eefb8 + 531ebae
commit 7234a37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/terraform/build.go b/pkg/terraform/build.go
@@ -18,9 +18,10 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
  unzip terraform_{{.ClientVersion}}_linux_amd64.zip -d /usr/bin && \
  rm terraform_{{.ClientVersion}}_linux_amd64.zip
 COPY {{.WorkingDir}}/{{.InitFile}} $BUNDLE_DIR/{{.WorkingDir}}/
-RUN cd $BUNDLE_DIR/{{.WorkingDir}} && \
+RUN cd $BUNDLE_DIR/{{.WorkingDir}} && mkdir -p /usr/local/share/terraform/plugins/
 {{if .ProviderHost }}
- tee <<EOF > provider_mirror.tfrc && terraform init -backend=false && mkdir -p /usr/local/share/terraform/plugins/ && cp --recursive .terraform/providers /usr/local/share/terraform/plugins/
+ENV TF_CLI_CONFIG_FILE=$BUNDLE_DIR/{{.WorkingDir}}/provider_mirror.tfrc
+RUN tee <<EOF > provider_mirror.tfrc && terraform init -backend=false && cp --recursive .terraform/providers /usr/local/share/terraform/plugins/
   provider_installation {
       direct {
           exclude = ["registry.terraform.io/*/*"]
@@ -31,7 +32,7 @@ RUN cd $BUNDLE_DIR/{{.WorkingDir}} && \
   }
 EOF
 {{ else }}
-  terraform init -backend=false && \
+RUN terraform init -backend=false && \
   rm -fr .terraform/providers && \
   terraform providers mirror /usr/local/share/terraform/plugins
 {{ end }}

diff --git a/pkg/terraform/build_test.go b/pkg/terraform/build_test.go
@@ -62,8 +62,10 @@ func TestMixin_Build(t *testing.T) {
 
 			if tc.expectedProviderHost != "" {
 				assert.Contains(t, gotOutput, tc.expectedProviderHost)
+				assert.Contains(t, gotOutput, "ENV TF_CLI_CONFIG_FILE=")
 			} else {
 				assert.NotContains(t, gotOutput, "network_mirror")
+				assert.NotContains(t, gotOutput, "TF_CLI_CONFIG_FILE")
 			}
 
 			assert.NotContains(t, "{{.", gotOutput, "Not all of the template values were consumed")