From 7a98a074d07d0e1c1a1d5983753a7f6d26e4ecbc Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Tue, 19 Jul 2016 14:54:07 -0700 Subject: [PATCH] Remove imported role constant with new keystore Signed-off-by: Riyaz Faizullabhoy --- cmd/notary/main.go | 2 +- cmd/notary/main_test.go | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/notary/main.go b/cmd/notary/main.go index 85eeb781c..bdd7ebc6e 100644 --- a/cmd/notary/main.go +++ b/cmd/notary/main.go @@ -236,7 +236,7 @@ func getPassphraseRetriever() notary.PassRetriever { // Note that we don't check if the role name is for a delegation to allow for names like "user" // since delegation keys can be shared across repositories // This cannot be a base role or imported key, though. - if v := env["delegation"]; !data.IsBaseRole(alias) && !strings.Contains(alias, "imported ") && v != "" { + if v := env["delegation"]; !data.IsBaseRole(alias) && v != "" { return v, numAttempts > 1, nil } return baseRetriever(keyName, alias, createNew, numAttempts) diff --git a/cmd/notary/main_test.go b/cmd/notary/main_test.go index 436d68657..c07ca3680 100644 --- a/cmd/notary/main_test.go +++ b/cmd/notary/main_test.go @@ -605,14 +605,10 @@ func TestPassphraseRetrieverDelegationRoleCaching(t *testing.T) { require.Equal(t, passphrase, "delegation_passphrase") // Make sure base roles fail - passphrase, giveup, err = retriever("key", data.CanonicalRootRole, false, 0) + _, _, err = retriever("key", data.CanonicalRootRole, false, 0) require.Error(t, err) - passphrase, giveup, err = retriever("key", data.CanonicalTargetsRole, false, 0) + _, _, err = retriever("key", data.CanonicalTargetsRole, false, 0) require.Error(t, err) - passphrase, giveup, err = retriever("key", data.CanonicalSnapshotRole, false, 0) - require.Error(t, err) - - // make sure "imported" role fails - passphrase, giveup, err = retriever("key", "imported "+data.CanonicalRootRole, false, 0) + _, _, err = retriever("key", data.CanonicalSnapshotRole, false, 0) require.Error(t, err) }