From 11644389f4af4edbc485ca440b84f8b9ed90c8c0 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 10 Mar 2018 16:14:15 -0500 Subject: [PATCH] ListKeypairs: don't print 'keyset.yaml' as the key id Fix #4553 --- upup/pkg/fi/vfs_castore.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/upup/pkg/fi/vfs_castore.go b/upup/pkg/fi/vfs_castore.go index a55e5ffe52..0fee50fddf 100644 --- a/upup/pkg/fi/vfs_castore.go +++ b/upup/pkg/fi/vfs_castore.go @@ -573,9 +573,13 @@ func (c *VFSCAStore) ListKeysets() ([]*kops.Keyset, error) { keysets[name] = keyset } - keyset.Spec.Keys = append(keyset.Spec.Keys, kops.KeysetItem{ - Id: strings.TrimSuffix(tokens[1], ".crt"), - }) + if tokens[1] == "keyset.yaml" { + // TODO: Should we load the keyset to get the actual ids? + } else { + keyset.Spec.Keys = append(keyset.Spec.Keys, kops.KeysetItem{ + Id: strings.TrimSuffix(tokens[1], ".crt"), + }) + } } }