github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 20:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103413 from mgutierrez98/refactor-whitelist-blacklist

Browse Source 
Refactored files containing whitelist/blacklist to allowlist/denylist…
This commit is contained in:
Kubernetes Prow Robot
2021-07-01 18:12:25 -07:00
committed by GitHub
parent 8fb67473ce 1cfbb0aa25
commit 62503f254e
7 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/apiserver/print_test.go
View File

@@ -46,7 +46,7 @@ import (
"k8s.io/kubernetes/test/integration/framework"
)
var kindWhiteList = sets.NewString(
var kindAllowList = sets.NewString(
// k8s.io/api/core
"APIGroup",
"APIVersions",
@@ -187,7 +187,7 @@ func TestServerSidePrint(t *testing.T) {
if gvk.Version == runtime.APIVersionInternal || strings.HasSuffix(apiType.Name(), "List") {
continue
}
if kindWhiteList.Has(gvk.Kind) || missingHanlders.Has(gvk.Kind) {
if kindAllowList.Has(gvk.Kind) || missingHanlders.Has(gvk.Kind) {
continue
}

6
test/integration/dryrun/dryrun_test.go
View File

@@ -41,7 +41,7 @@ import (
// Only add kinds to this list when this a virtual resource with get and create verbs that doesn't actually
// store into it's kind. We've used this downstream for mappings before.
var kindWhiteList = sets.NewString()
var kindAllowList = sets.NewString()
// namespace used for all tests, do not change this
const testNamespace = "dryrunnamespace"
@@ -264,8 +264,8 @@ func TestDryRun(t *testing.T) {
gvResource := resourceToTest.Mapping.Resource
kind := gvk.Kind
if kindWhiteList.Has(kind) {
t.Skip("whitelisted")
if kindAllowList.Has(kind) {
t.Skip("allowlisted")
}
testData, hasTest := dryrunData[gvResource]

10
test/integration/etcd/etcd_storage_path_test.go
View File

@@ -41,7 +41,7 @@ import (
// Only add kinds to this list when this a virtual resource with get and create verbs that doesn't actually
// store into it's kind. We've used this downstream for mappings before.
var kindWhiteList = sets.NewString()
var kindAllowList = sets.NewString()
// namespace used for all tests, do not change this
const testNamespace = "etcdstoragepathtestnamespace"
@@ -95,9 +95,9 @@ func TestEtcdStoragePath(t *testing.T) {
gvResource := resourceToPersist.Mapping.Resource
kind := gvk.Kind
if kindWhiteList.Has(kind) {
if kindAllowList.Has(kind) {
kindSeen.Insert(kind)
t.Skip("whitelisted")
t.Skip("allowlisted")
}
etcdSeen[gvResource] = empty{}
@@ -210,8 +210,8 @@ func TestEtcdStoragePath(t *testing.T) {
if inEtcdData, inEtcdSeen := diffMaps(etcdStorageData, etcdSeen); len(inEtcdData) != 0 || len(inEtcdSeen) != 0 {
t.Errorf("etcd data does not match the types we saw:\nin etcd data but not seen:\n%s\nseen but not in etcd data:\n%s", inEtcdData, inEtcdSeen)
}
if inKindData, inKindSeen := diffMaps(kindWhiteList, kindSeen); len(inKindData) != 0 || len(inKindSeen) != 0 {
t.Errorf("kind whitelist data does not match the types we saw:\nin kind whitelist but not seen:\n%s\nseen but not in kind whitelist:\n%s", inKindData, inKindSeen)
if inKindData, inKindSeen := diffMaps(kindAllowList, kindSeen); len(inKindData) != 0 || len(inKindSeen) != 0 {
t.Errorf("kind allowlist data does not match the types we saw:\nin kind allowlist but not seen:\n%s\nseen but not in kind allowlist:\n%s", inKindData, inKindSeen)
}
for bucket, gvks := range cohabitatingResources {