Skip to content

Commit d1895e0

Browse files
committed
admission_test.go(createSCCLister): extract function.
1 parent 072358b commit d1895e0

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

pkg/security/admission/admission_test.go

+18-26
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,7 @@ func TestAdmitCaps(t *testing.T) {
158158

159159
func testSCCAdmit(testCaseName string, sccs []*securityapi.SecurityContextConstraints, pod *kapi.Pod, shouldPass bool, t *testing.T) {
160160
tc := setupClientSet()
161-
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
162-
cache := securitylisters.NewSecurityContextConstraintsLister(indexer)
163-
for _, scc := range sccs {
164-
indexer.Add(scc)
165-
}
166-
161+
cache := createSCCLister(t, sccs)
167162
plugin := NewTestAdmission(cache, tc)
168163

169164
attrs := kadmission.NewAttributesRecord(pod, nil, kapi.Kind("Pod").WithVersion("version"), pod.Namespace, pod.Name, kapi.Resource("pods").WithVersion("version"), "", kadmission.Create, &user.DefaultInfo{})
@@ -236,11 +231,10 @@ func TestAdmitSuccess(t *testing.T) {
236231
Groups: []string{"system:serviceaccounts"},
237232
}
238233

239-
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
240-
cache := securitylisters.NewSecurityContextConstraintsLister(indexer)
241-
242-
indexer.Add(saExactSCC)
243-
indexer.Add(saSCC)
234+
cache := createSCCLister(t, []*securityapi.SecurityContextConstraints{
235+
saExactSCC,
236+
saSCC,
237+
})
244238

245239
// create the admission plugin
246240
p := NewTestAdmission(cache, tc)
@@ -810,11 +804,7 @@ func TestMatchingSecurityContextConstraints(t *testing.T) {
810804
},
811805
}
812806

813-
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
814-
cache := securitylisters.NewSecurityContextConstraintsLister(indexer)
815-
for _, scc := range sccs {
816-
indexer.Add(scc)
817-
}
807+
cache := createSCCLister(t, sccs)
818808

819809
// single match cases
820810
testCases := map[string]struct {
@@ -945,16 +935,7 @@ func TestAdmitWithPrioritizedSCC(t *testing.T) {
945935
// is using the sort strategy we expect.
946936

947937
tc := setupClientSet()
948-
949-
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
950-
cache := securitylisters.NewSecurityContextConstraintsLister(indexer)
951-
952-
for _, scc := range sccsToSort {
953-
err := indexer.Add(scc)
954-
if err != nil {
955-
t.Fatalf("error adding sccs to store: %v", err)
956-
}
957-
}
938+
cache := createSCCLister(t, sccsToSort)
958939

959940
// create the admission plugin
960941
plugin := NewTestAdmission(cache, tc)
@@ -1187,3 +1168,14 @@ func setupClientSet() *clientsetfake.Clientset {
11871168

11881169
return clientsetfake.NewSimpleClientset(namespace, serviceAccount)
11891170
}
1171+
1172+
func createSCCLister(t *testing.T, sccs []*securityapi.SecurityContextConstraints) securitylisters.SecurityContextConstraintsLister {
1173+
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
1174+
lister := securitylisters.NewSecurityContextConstraintsLister(indexer)
1175+
for _, scc := range sccs {
1176+
if err := indexer.Add(scc); err != nil {
1177+
t.Fatalf("error adding SCC to store: %v", err)
1178+
}
1179+
}
1180+
return lister
1181+
}

0 commit comments

Comments
 (0)