From 1469a78029fd79176517cb7c0f68bb237b6bb89f Mon Sep 17 00:00:00 2001 From: Seb Ospina Date: Sat, 27 Jul 2019 16:19:16 +0200 Subject: [PATCH] Added List mode for Role, ClusterRole and Bindings Signed-off-by: Seb Ospina --- pkg/releaseutil/kind_sorter.go | 8 ++++++++ pkg/releaseutil/kind_sorter_test.go | 20 ++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkg/releaseutil/kind_sorter.go b/pkg/releaseutil/kind_sorter.go index 9aab36f91..b1b2c58db 100644 --- a/pkg/releaseutil/kind_sorter.go +++ b/pkg/releaseutil/kind_sorter.go @@ -36,9 +36,13 @@ var InstallOrder KindSortOrder = []string{ "ServiceAccount", "CustomResourceDefinition", "ClusterRole", + "ClusterRoleList", "ClusterRoleBinding", + "ClusterRoleBindingList", "Role", + "RoleList", "RoleBinding", + "RoleBindingList", "Service", "DaemonSet", "Pod", @@ -69,9 +73,13 @@ var UninstallOrder KindSortOrder = []string{ "ReplicationController", "Pod", "DaemonSet", + "RoleBindingList", "RoleBinding", + "RoleList", "Role", + "ClusterRoleBindingList", "ClusterRoleBinding", + "ClusterRoleList", "ClusterRole", "CustomResourceDefinition", "ServiceAccount", diff --git a/pkg/releaseutil/kind_sorter_test.go b/pkg/releaseutil/kind_sorter_test.go index 8eea56a4f..cfaa3a771 100644 --- a/pkg/releaseutil/kind_sorter_test.go +++ b/pkg/releaseutil/kind_sorter_test.go @@ -27,10 +27,18 @@ func TestKindSorter(t *testing.T) { Name: "i", Head: &SimpleHead{Kind: "ClusterRole"}, }, + { + Name: "I", + Head: &SimpleHead{Kind: "ClusterRoleList"}, + }, { Name: "j", Head: &SimpleHead{Kind: "ClusterRoleBinding"}, }, + { + Name: "J", + Head: &SimpleHead{Kind: "ClusterRoleBindingList"}, + }, { Name: "e", Head: &SimpleHead{Kind: "ConfigMap"}, @@ -99,10 +107,18 @@ func TestKindSorter(t *testing.T) { Name: "k", Head: &SimpleHead{Kind: "Role"}, }, + { + Name: "K", + Head: &SimpleHead{Kind: "RoleList"}, + }, { Name: "l", Head: &SimpleHead{Kind: "RoleBinding"}, }, + { + Name: "L", + Head: &SimpleHead{Kind: "RoleBindingList"}, + }, { Name: "d", Head: &SimpleHead{Kind: "Secret"}, @@ -138,8 +154,8 @@ func TestKindSorter(t *testing.T) { order KindSortOrder expected string }{ - {"install", InstallOrder, "abcde1fgh2ijklmnopqrxstuvw!"}, - {"uninstall", UninstallOrder, "wvmutsxrqponlkji2hgf1edcba!"}, + {"install", InstallOrder, "abcde1fgh2iIjJkKlLmnopqrxstuvw!"}, + {"uninstall", UninstallOrder, "wvmutsxrqponLlKkJjIi2hgf1edcba!"}, } { var buf bytes.Buffer t.Run(test.description, func(t *testing.T) {