From 8c6ae66494a3a760058e6989e717d7c83b94df70 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Thu, 12 Dec 2019 09:14:12 -0500 Subject: [PATCH 1/2] terraform-bundle: fix panic with addrs.Provider Fixes #23652 --- tools/terraform-bundle/package.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index c676b30da..9ad41c74e 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -182,7 +182,7 @@ func (c *PackageCommand) Run(args []string) int { } else { //attempt to get from the public registry if not found locally c.ui.Output(fmt.Sprintf("- Checking for provider plugin on %s...", releaseHost)) - _, _, err := installer.Get(addrs.Provider{Type: name}, constraint) + _, _, err := installer.Get(addrs.NewLegacyProvider(name), constraint) if err != nil { c.ui.Error(fmt.Sprintf("- Failed to resolve %s provider %s: %s", name, constraint, err)) return 1 From c72d2c6c44f5b5332a71c4ea3eedddf2373083f6 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Thu, 12 Dec 2019 09:26:26 -0500 Subject: [PATCH 2/2] build: add terraform-bundle e2etests --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7bae9ae35..143bc1ff7 100644 --- a/Makefile +++ b/Makefile @@ -39,10 +39,12 @@ testacc: fmtcheck generate TF_ACC=1 go test $(TEST) -v $(TESTARGS) -mod=vendor -timeout 120m # e2etest runs the end-to-end tests against a generated Terraform binary +# and a generated terraform-bundle binary. # The TF_ACC here allows network access, but does not require any special -# credentials since the e2etests use local-only providers such as "null". +# credentials. e2etest: generate TF_ACC=1 go test -mod=vendor -v ./command/e2etest + TF_ACC=1 go test -mod=vendor -v ./tools/terraform-bundle/e2etest test-compile: fmtcheck generate @if [ "$(TEST)" = "./..." ]; then \