ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugin/discovery provider installer: download providers from the registry 

Terraform will query the public registry at
https://registry.terraform.io for providers, instead of
https://releases.hashicorp.com.
This commit is contained in:
Kristin Laemmert 2018-08-02 08:45:55 -07:00 committed by Martin Atkins
parent b88410984b
commit ce5e66e178
7 changed files with 198 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
command/init.go
View File

@ -81,6 +81,7 @@ func (c *InitCommand) Run(args []string) int {
PluginProtocolVersion: plugin.Handshake.ProtocolVersion,
SkipVerify: !flagVerifyPlugins,
Ui: c.Ui,
Services: c.Services,
}
}

5
plugin/discovery/error.go
View File

@ -25,6 +25,11 @@ const ErrorNoVersionCompatible = Error("no available version is compatible with
// ErrorNoSuchProvider indicates that no provider exists with a name given
const ErrorNoSuchProvider = Error("no provider exists with the given name")
// ErrorNoVersionCompatibleWithPlatform indicates that all of the available
// versions that otherwise met constraints are not compatible with the
// requested platform
const ErrorNoVersionCompatibleWithPlatform = Error("no available version is compatible for the requested platform")
func (err Error) Error() string {
return string(err)
}

195
plugin/discovery/get.go
View File

@ -10,6 +10,7 @@ import (
"os"
"path/filepath"
"runtime"
"sort"
"strconv"
"strings"
@ -17,7 +18,12 @@ import (
getter "github.com/hashicorp/go-getter"
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/response"
"github.com/hashicorp/terraform/svchost/disco"
"github.com/mitchellh/cli"
)
@ -31,10 +37,13 @@ import (
const protocolVersionHeader = "x-terraform-protocol-version"
var releaseHost = "https://releases.hashicorp.com"
//var releaseHost = "https://releases.hashicorp.com"
var releaseHost = "https://tf-registry-staging.herokuapp.com"
var httpClient *http.Client
var errVersionNotFound = errors.New("version not found")
func init() {
httpClient = httpclient.New()
@ -79,6 +88,13 @@ type ProviderInstaller struct {
SkipVerify bool
Ui cli.Ui // Ui for output
// Services is a required *disco.Disco, which may have services and
// credentials pre-loaded.
Services *disco.Disco
// registry client
registry *registry.Client
}
// Get is part of an implementation of type Installer, and attempts to download
@ -101,23 +117,40 @@ type ProviderInstaller struct {
// be presented alongside context about what is being installed, and thus the
// error messages do not redundantly include such information.
func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, error) {
versions, err := i.listProviderVersions(provider)
// a little bit of initialization
if i.OS == "" {
i.OS = runtime.GOOS
}
if i.Arch == "" {
i.Arch = runtime.GOARCH
}
if i.registry == nil {
i.registry = registry.NewClient(i.Services, nil, nil)
}
allVersions, err := i.listProviderVersions(provider)
// TODO: return multiple errors
if err != nil {
return PluginMeta{}, err
}
if len(versions) == 0 {
if len(allVersions.Versions) == 0 {
return PluginMeta{}, ErrorNoSuitableVersion
}
versions = allowedVersions(versions, req)
// Filter the list of plugin versions to those which meet the version constraints
versions := allowedVersions(allVersions, req)
if len(versions) == 0 {
return PluginMeta{}, ErrorNoSuitableVersion
}
// sort them newest to oldest
Versions(versions).Sort()
sort.Sort(response.Collection(versions))
// the winning version is the newest
versionMeta := versions[0]
// get a Version from the version string
// we already know this will not error from the preceding functions
v, _ := VersionStr(versionMeta.Version).Parse()
// Ensure that our installation directory exists
err = os.MkdirAll(i.Dir, os.ModePerm)
@ -125,27 +158,70 @@ func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, e
return PluginMeta{}, fmt.Errorf("failed to create plugin dir %s: %s", i.Dir, err)
}
// take the first matching plugin we find
for _, v := range versions {
url := i.providerURL(provider, v.String())
// check plugin protocol compatibility
// We only validate the most recent version that meets the version constraints.
// see RFC TF-055: Provider Protocol Versioning for more information
protoString := strconv.Itoa(int(i.PluginProtocolVersion))
protocolVersion, err := VersionStr(protoString).Parse()
if err != nil {
return PluginMeta{}, fmt.Errorf("invalid plugin protocol version: %q", i.PluginProtocolVersion)
}
protocolConstraint, err := protocolVersion.MinorUpgradeConstraintStr().Parse()
if err != nil {
// This should not fail if the preceding function succeeded.
return PluginMeta{}, fmt.Errorf("invalid plugin protocol version: %q", protocolVersion.String())
}
for _, p := range versionMeta.Protocols {
proPro, err := VersionStr(p).Parse()
if err != nil {
// invalid protocol reported by the registry. Move along.
log.Printf("[WARN] invalid provider protocol version %q found in the registry", provider, versionMeta.Version)
continue
}
if !protocolConstraint.Allows(proPro) {
// TODO: get most recent compatible plugin and return a handy-dandy string for the user
// latest, err := getNewestCompatiblePlugin
// i.Ui.output|info): "the latest version of plugin BLAH which supports protocol BLAH is BLAH"
// Add this to your provider block:
// version = ~BLAH
// and if none is found, return ErrorNoVersionCompatible
return PluginMeta{}, fmt.Errorf("The latest version of plugin %q does not support plugin protocol version %q", provider, protocolVersion)
}
}
var downloadURLs *response.TerraformProviderPlatformLocation
// check plugin platform compatibility
for _, p := range versionMeta.Platforms {
if p.Arch == i.Arch && p.OS == i.OS {
downloadURLs, err = i.listProviderDownloadURLs(provider, versionMeta.Version)
if err != nil {
return PluginMeta{}, fmt.Errorf("Problem getting ")
}
break
}
// TODO: return the most recent compatible versions
// return PluginMeta{}, ErrorNoVersionCompatibleWithPlatform
return PluginMeta{}, fmt.Errorf("The latest version of plugin %q does not support the requested platform %s %s", provider, i.OS, i.Arch)
}
providerURL := downloadURLs.DownloadURL
if !i.SkipVerify {
sha256, err := i.getProviderChecksum(provider, v.String())
sha256, err := i.getProviderChecksum(provider, downloadURLs)
if err != nil {
return PluginMeta{}, err
}
// add the checksum parameter for go-getter to verify the download for us.
if sha256 != "" {
url = url + "?checksum=sha256:" + sha256
providerURL = providerURL + "?checksum=sha256:" + sha256
}
}
log.Printf("[DEBUG] fetching provider info for %s version %s", provider, v)
if checkPlugin(url, i.PluginProtocolVersion) {
i.Ui.Info(fmt.Sprintf("- Downloading plugin for provider %q (%s)...", provider, v.String()))
log.Printf("[DEBUG] getting provider %q version %q", provider, v)
err := i.install(provider, v, url)
i.Ui.Info(fmt.Sprintf("- Downloading plugin for provider %q (%s)...", provider, versionMeta.Version))
log.Printf("[DEBUG] getting provider %q version %q", provider, versionMeta.Version)
err = i.install(provider, v, providerURL)
if err != nil {
return PluginMeta{}, err
}
@ -154,7 +230,7 @@ func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, e
// (This is weird, because go-getter doesn't directly return
// information about what was extracted, and we just extracted
// the archive directly into a shared dir here.)
log.Printf("[DEBUG] looking for the %s %s plugin we just installed", provider, v)
log.Printf("[DEBUG] looking for the %s %s plugin we just installed", provider, versionMeta.Version)
metas := FindPlugins("provider", []string{i.Dir})
log.Printf("[DEBUG] all plugins found %#v", metas)
metas, _ = metas.ValidateVersions()
@ -166,7 +242,7 @@ func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, e
// expected convention.
return PluginMeta{}, fmt.Errorf(
"failed to find installed plugin version %s; this is a bug in Terraform and should be reported",
v,
versionMeta.Version,
)
}
@ -177,19 +253,14 @@ func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, e
// this is an error.
return PluginMeta{}, fmt.Errorf(
"multiple plugins installed for version %s; this is a bug in Terraform and should be reported",
v,
versionMeta.Version,
)
}
// By now we know we have exactly one meta, and so "Newest" will
// return that one.
return metas.Newest(), nil
}
log.Printf("[INFO] incompatible ProtocolVersion for %s version %s", provider, v)
}
return PluginMeta{}, ErrorNoVersionCompatible
}
func (i *ProviderInstaller) install(provider string, version Version, url string) error {
@ -353,67 +424,34 @@ func (i *ProviderInstaller) providerChecksumURL(name, version string) string {
return u
}
func (i *ProviderInstaller) getProviderChecksum(name, version string) (string, error) {
checksums, err := getPluginSHA256SUMs(i.providerChecksumURL(name, version))
func (i *ProviderInstaller) getProviderChecksum(name string, urls *response.TerraformProviderPlatformLocation) (string, error) {
checksums, err := getPluginSHA256SUMs(urls.ShasumsURL, urls.ShasumsSignatureURL)
if err != nil {
return "", err
}
return checksumForFile(checksums, i.providerFileName(name, version)), nil
return checksumForFile(checksums, urls.Filename), nil
}
// Return the plugin version by making a HEAD request to the provided url.
// If the header is not present, we assume the latest version will be
// compatible, and leave the check for discovery or execution.
func checkPlugin(url string, pluginProtocolVersion uint) bool {
resp, err := httpClient.Head(url)
if err != nil {
log.Printf("[ERROR] error fetching plugin headers: %s", err)
return false
}
if resp.StatusCode != http.StatusOK {
log.Println("[ERROR] non-200 status fetching plugin headers:", resp.Status)
return false
}
proto := resp.Header.Get(protocolVersionHeader)
if proto == "" {
// The header isn't present, but we don't make this error fatal since
// the latest version will probably work.
log.Printf("[WARN] missing %s from: %s", protocolVersionHeader, url)
return true
}
protoVersion, err := strconv.Atoi(proto)
if err != nil {
log.Printf("[ERROR] invalid ProtocolVersion: %s", proto)
return false
}
return protoVersion == int(pluginProtocolVersion)
// list all versions available for the named provider
func (i *ProviderInstaller) listProviderVersions(name string) (*response.TerraformProviderVersions, error) {
provider := regsrc.NewTerraformProvider(name, i.OS, i.Arch)
versions, err := i.registry.TerraformProviderVersions(provider)
return versions, err
}
// list the version available for the named plugin
func (i *ProviderInstaller) listProviderVersions(name string) ([]Version, error) {
versions, err := listPluginVersions(i.providerVersionsURL(name))
if err != nil {
// listPluginVersions returns a verbose error message indicating
// what was being accessed and what failed
return nil, err
}
return versions, nil
}
var errVersionNotFound = errors.New("version not found")
// take the list of available versions for a plugin, and filter out those that
// don't fit the constraints.
func allowedVersions(available []Version, required Constraints) []Version {
var allowed []Version
func allowedVersions(available *response.TerraformProviderVersions, required Constraints) []*response.TerraformProviderVersion {
var allowed []*response.TerraformProviderVersion
for _, v := range available {
if required.Allows(v) {
for _, v := range available.Versions {
version, err := VersionStr(v.Version).Parse()
if err != nil {
log.Printf("[WARN] invalid version found for %q: %s", available.ID, err)
continue
}
if required.Allows(version) {
allowed = append(allowed, v)
}
}
@ -505,9 +543,7 @@ func checksumForFile(sums []byte, name string) string {
}
// fetch the SHA256SUMS file provided, and verify its signature.
func getPluginSHA256SUMs(sumsURL string) ([]byte, error) {
sigURL := sumsURL + ".sig"
func getPluginSHA256SUMs(sumsURL, sigURL string) ([]byte, error) {
sums, err := getFile(sumsURL)
if err != nil {
return nil, fmt.Errorf("error fetching checksums: %s", err)
@ -546,3 +582,8 @@ func getFile(url string) ([]byte, error) {
func GetReleaseHost() string {
return releaseHost
}
func (i *ProviderInstaller) listProviderDownloadURLs(name, version string) (*response.TerraformProviderPlatformLocation, error) {
urls, err := i.registry.TerraformProviderLocation(regsrc.NewTerraformProvider(name, i.OS, i.Arch), version)
return urls, err
}

11
registry/client.go
View File

@ -290,11 +290,10 @@ func (c *Client) TerraformProviderLocation(provider *regsrc.TerraformProvider, v
service := c.Discover(host, providersServiceID)
if service == nil {
return nil, fmt.Errorf("host %s does not provide Terraform providers", host.ForDisplay())
return nil, fmt.Errorf("host %s does not provide Terraform providers", host)
}
var p *url.URL
p, err = url.Parse(path.Join(
p, err := url.Parse(path.Join(
provider.TerraformProvider(),
version,
"download",
@ -305,11 +304,11 @@ func (c *Client) TerraformProviderLocation(provider *regsrc.TerraformProvider, v
return nil, err
}
download := service.ResolveReference(p)
service = service.ResolveReference(p)
log.Printf("[DEBUG] looking up provider location from %q", download)
log.Printf("[DEBUG] fetching provider location from %q", service)
req, err := http.NewRequest("GET", download.String(), nil)
req, err := http.NewRequest("GET", service.String(), nil)
if err != nil {
return nil, err
}

2
registry/regsrc/regsrc.go
View File

@ -4,5 +4,5 @@ package regsrc
var (
// PublicRegistryHost is a FriendlyHost that represents the public registry.
PublicRegistryHost = NewFriendlyHost("registry.terraform.io")
PublicRegistryHost = NewFriendlyHost("tf-registry-staging.herokuapp.com")
)

4
registry/regsrc/terraform_provider.go
View File

@ -27,7 +27,7 @@ type TerraformProvider struct {
}
// NewTerraformProvider constructs a new provider source.
func NewTerraformProvider(name, os, arch string) (*TerraformProvider, error) {
func NewTerraformProvider(name, os, arch string) *TerraformProvider {
if os == "" {
os = runtime.GOOS
}
@ -43,7 +43,7 @@ func NewTerraformProvider(name, os, arch string) (*TerraformProvider, error) {
Arch: arch,
}
return p, nil
return p
}
// Provider returns just the registry ID of the provider

21
registry/response/terraform_provider.go
View File

@ -1,5 +1,7 @@
package response
import version "github.com/hashicorp/go-version"
// TerraformProvider is the response structure for all required information for
// Terraform to choose a download URL. It must include all versions and all
// platforms for Terraform to perform version and os/arch constraint matching
@ -45,3 +47,22 @@ type TerraformProviderPlatformLocation struct {
ShasumsURL string `json:"shasums_url"`
ShasumsSignatureURL string `json:"shasums_signature_url"`
}
// Collection type implements the sort.Sort interface so that
// an array of TerraformProviderVersion can be sorted.
type Collection []*TerraformProviderVersion
func (v Collection) Len() int {
return len(v)
}
func (v Collection) Less(i, j int) bool {
versionA, _ := version.NewVersion(v[i].Version)
versionB, _ := version.NewVersion(v[j].Version)
return versionA.LessThan(versionB)
}
func (v Collection) Swap(i, j int) {
v[i], v[j] = v[j], v[i]
}