fix: terraform version loading should use GetAny (#165)

runatlantis · Jan 12, 2022 · c23b9cc · c23b9cc
1 parent f03d8f5
commit c23b9cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/server/core/terraform/terraform_client.go b/server/core/terraform/terraform_client.go
@@ -316,7 +316,7 @@ func (l *VersionLoader) loadVersion(v *version.Version, destPath string) (runtim
 	binURL := fmt.Sprintf("%s_%s_%s.zip", urlPrefix, runtime.GOOS, runtime.GOARCH)
 	checksumURL := fmt.Sprintf("%s_SHA256SUMS", urlPrefix)
 	fullSrcURL := fmt.Sprintf("%s?checksum=file:%s", binURL, checksumURL)
-	if err := l.downloader.GetFile(destPath, fullSrcURL); err != nil {
+	if err := l.downloader.GetAny(destPath, fullSrcURL); err != nil {
 		return runtime_models.LocalFilePath(""), errors.Wrapf(err, "downloading terraform version %s at %q", v.String(), fullSrcURL)
 	}
 

diff --git a/server/core/terraform/terraform_client_internal_test.go b/server/core/terraform/terraform_client_internal_test.go
@@ -58,7 +58,7 @@ func TestDefaultClient_Synchronous_RunCommandWithVersion(t *testing.T) {
 	Equals(t, "hello\n", out)
 }
 
-func TestVersionLoader(t *testing.T) {
+func TestVersionLoader_buildsURL(t *testing.T) {
 	v, _ := version.NewVersion("0.15.0")
 
 	destPath := "some/path"
@@ -74,10 +74,10 @@ func TestVersionLoader(t *testing.T) {
 	}
 
 	t.Run("success", func(t *testing.T) {
-		When(mockDownloader.GetFile(EqString(destPath), EqString(fullURL))).ThenReturn(nil)
+		When(mockDownloader.GetAny(EqString(destPath), EqString(fullURL))).ThenReturn(nil)
 		binPath, err := subject.loadVersion(v, destPath)
 
-		mockDownloader.VerifyWasCalledOnce().GetFile(EqString(destPath), EqString(fullURL))
+		mockDownloader.VerifyWasCalledOnce().GetAny(EqString(destPath), EqString(fullURL))
 
 		Ok(t, err)
 
@@ -86,7 +86,7 @@ func TestVersionLoader(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 
-		When(mockDownloader.GetFile(EqString(destPath), EqString(fullURL))).ThenReturn(fmt.Errorf("err"))
+		When(mockDownloader.GetAny(EqString(destPath), EqString(fullURL))).ThenReturn(fmt.Errorf("err"))
 		_, err := subject.loadVersion(v, destPath)
 
 		Assert(t, err != nil, "err is expected")