From f2c180390599e66fee2f1a8c1a4ab52eea920c51 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 16 Jul 2018 16:56:55 -0400 Subject: Make plugin IDs case insensitive (#9117) --- model/manifest.go | 3 +++ model/manifest_test.go | 3 +++ 2 files changed, 6 insertions(+) (limited to 'model') diff --git a/model/manifest.go b/model/manifest.go index d6a064d4e..d494df466 100644 --- a/model/manifest.go +++ b/model/manifest.go @@ -9,6 +9,7 @@ import ( "io/ioutil" "os" "path/filepath" + "strings" "gopkg.in/yaml.v2" ) @@ -201,6 +202,7 @@ func FindManifest(dir string) (manifest *Manifest, path string, err error) { return } manifest = &parsed + manifest.Id = strings.ToLower(manifest.Id) return } @@ -220,5 +222,6 @@ func FindManifest(dir string) (manifest *Manifest, path string, err error) { return } manifest = &parsed + manifest.Id = strings.ToLower(manifest.Id) return } diff --git a/model/manifest_test.go b/model/manifest_test.go index b63e388bc..0c55b5b66 100644 --- a/model/manifest_test.go +++ b/model/manifest_test.go @@ -27,9 +27,11 @@ func TestFindManifest(t *testing.T) { {"foo", "bar", true, true}, {"plugin.json", "bar", true, false}, {"plugin.json", `{"id": "foo"}`, false, false}, + {"plugin.json", `{"id": "FOO"}`, false, false}, {"plugin.yaml", `id: foo`, false, false}, {"plugin.yaml", "bar", true, false}, {"plugin.yml", `id: foo`, false, false}, + {"plugin.yml", `id: FOO`, false, false}, {"plugin.yml", "bar", true, false}, } { dir, err := ioutil.TempDir("", "mm-plugin-test") @@ -54,6 +56,7 @@ func TestFindManifest(t *testing.T) { if !tc.ExpectError { require.NotNil(t, m, tc.Filename) assert.NotEmpty(t, m.Id, tc.Filename) + assert.Equal(t, strings.ToLower(m.Id), m.Id) } } } -- cgit v1.2.3-1-g7c22