feat(providers_mirror.go): providers mirror command should honor depe…

…ndency lock file
hashicorp · Jul 25, 2022 · 5a9c05f · 5a9c05f
1 parent 5da30c2
commit 5a9c05f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/internal/command/command_test.go b/internal/command/command_test.go
@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/google/go-cmp/cmp"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -20,6 +19,8 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+
 	svchost "github.com/hashicorp/terraform-svchost"
 	"github.com/hashicorp/terraform-svchost/disco"
 	"github.com/hashicorp/terraform/internal/addrs"

diff --git a/internal/command/providers_mirror.go b/internal/command/providers_mirror.go
@@ -76,6 +76,10 @@ func (c *ProvidersMirrorCommand) Run(args []string) int {
 	reqs, moreDiags := config.ProviderRequirements()
 	diags = diags.Append(moreDiags)
 
+	// Read dependency lock info
+	providersLock, lockDiags := c.lockedDependencies()
+	diags = diags.Append(lockDiags)
+
 	// If we have any error diagnostics already then we won't proceed further.
 	if diags.HasErrors() {
 		c.showDiagnostics(diags)
@@ -121,6 +125,7 @@ func (c *ProvidersMirrorCommand) Run(args []string) int {
 			c.Ui.Output(fmt.Sprintf("- Skipping %s because it is built in to Terraform CLI", provider.ForDisplay()))
 			continue
 		}
+		providerLock := providersLock.Provider(provider)
 		constraintsStr := getproviders.VersionConstraintsString(constraints)
 		c.Ui.Output(fmt.Sprintf("- Mirroring %s...", provider.ForDisplay()))
 		// First we'll look for the latest version that matches the given
@@ -140,7 +145,10 @@ func (c *ProvidersMirrorCommand) Run(args []string) int {
 			continue
 		}
 		selected := candidates.Newest()
-		if len(constraintsStr) > 0 {
+		if providerLock != nil {
+			selected = providerLock.Version()
+			c.Ui.Output(fmt.Sprintf("  - Selected v%s to meet dependency lock record", selected.String()))
+		} else if len(constraintsStr) > 0 {
 			c.Ui.Output(fmt.Sprintf("  - Selected v%s to meet constraints %s", selected.String(), constraintsStr))
 		} else {
 			c.Ui.Output(fmt.Sprintf("  - Selected v%s with no constraints", selected.String()))

diff --git a/internal/command/views/show.go b/internal/command/views/show.go
@@ -2,6 +2,7 @@ package views
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform/internal/command/arguments"
 	"github.com/hashicorp/terraform/internal/command/format"
 	"github.com/hashicorp/terraform/internal/command/jsonplan"