Backport some OSS changes (#10267)

* Backport some OSS changes

* go mod vendor
This commit is contained in:
Brian Kassouf
2020-10-29 16:47:34 -07:00
committed by GitHub
parent ece971b648
commit 3bc7d15e6b
36 changed files with 5350 additions and 64 deletions

View File

@@ -362,6 +362,7 @@ func TestPredict_Plugins(t *testing.T) {
"influxdb-database-plugin",
"jwt",
"kerberos",
"keymgmt",
"kmip",
"kubernetes",
"kv",
@@ -409,6 +410,14 @@ func TestPredict_Plugins(t *testing.T) {
act := p.plugins()
if !strutil.StrListContains(act, "keymgmt") {
for i, v := range tc.exp {
if v == "keymgmt" {
tc.exp = append(tc.exp[:i], tc.exp[i+1:]...)
break
}
}
}
if !strutil.StrListContains(act, "kmip") {
for i, v := range tc.exp {
if v == "kmip" {