From 5e7956f440ba1f0a22b21118eec0e9b3a30638fc Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Thu, 9 Aug 2018 10:05:17 -0700 Subject: [PATCH] registry/response: rename Collection to ProviderVersionCollection for clarity --- plugin/discovery/get.go | 2 +- plugin/discovery/get_test.go | 2 +- registry/regsrc/terraform_provider.go | 4 ---- registry/response/terraform_provider.go | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugin/discovery/get.go b/plugin/discovery/get.go index 3357e6bfc..ed96bfabd 100644 --- a/plugin/discovery/get.go +++ b/plugin/discovery/get.go @@ -137,7 +137,7 @@ func (i *ProviderInstaller) Get(provider string, req Constraints) (PluginMeta, e } // sort them newest to oldest. The newest version wins! - response.Collection(versions).Sort() + response.ProviderVersionCollection(versions).Sort() // if the chosen provider version does not support the requested platform, // filter the list of acceptable versions to those that support that platform diff --git a/plugin/discovery/get_test.go b/plugin/discovery/get_test.go index 61342d2e4..0bf18e8cd 100644 --- a/plugin/discovery/get_test.go +++ b/plugin/discovery/get_test.go @@ -160,7 +160,7 @@ func TestVersionListing(t *testing.T) { versions = append(versions, v) } - response.Collection(versions).Sort() + response.ProviderVersionCollection(versions).Sort() expected := []*response.TerraformProviderVersion{ {Version: "1.2.4"}, diff --git a/registry/regsrc/terraform_provider.go b/registry/regsrc/terraform_provider.go index c3a44260a..88acddfa2 100644 --- a/registry/regsrc/terraform_provider.go +++ b/registry/regsrc/terraform_provider.go @@ -10,10 +10,6 @@ import ( var ( // DefaultProviderNamespace represents the namespace for canonical // HashiCorp-controlled providers. - // REVIEWERS: Naming things is hard. - // * HashiCorpProviderNameSpace? - // * OfficialP...? - // * CanonicalP...? DefaultProviderNamespace = "terraform-providers" ) diff --git a/registry/response/terraform_provider.go b/registry/response/terraform_provider.go index 8833198be..b9d78e329 100644 --- a/registry/response/terraform_provider.go +++ b/registry/response/terraform_provider.go @@ -53,10 +53,10 @@ type TerraformProviderPlatformLocation struct { } // Collection type for TerraformProviderVersion -type Collection []*TerraformProviderVersion +type ProviderVersionCollection []*TerraformProviderVersion // Sort sorts versions from newest to oldest. -func (v Collection) Sort() { +func (v ProviderVersionCollection) Sort() { sort.Slice(v, func(i, j int) bool { versionA, _ := version.NewVersion(v[i].Version) versionB, _ := version.NewVersion(v[j].Version)