From c209fe84397579672bb48a40a7082a7e256fabe2 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Wed, 22 Apr 2020 15:41:00 -0700
Subject: [PATCH] fix .import-restrictions to work with import-boss
 --include-test-files

this is mainly to ensure integration tests (which all end in _test)
are properly bossed around for their imports

I had to adjust some of the _test files to adhere to existing
reverse_rules specified elsewhere
---
 test/e2e/framework/.import-restrictions        | 5 +++++
 test/integration/.import-restrictions          | 6 ++++--
 test/integration/master/BUILD                  | 1 -
 test/integration/master/kube_apiserver_test.go | 3 +--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions
index 980126be2c8..896c4f2c4a3 100644
--- a/test/e2e/framework/.import-restrictions
+++ b/test/e2e/framework/.import-restrictions
@@ -236,6 +236,11 @@ rules:
       - k8s.io/kubernetes/pkg/volume/util/subpath
       - k8s.io/kubernetes/pkg/volume/util/types
       - k8s.io/kubernetes/pkg/volume/util/volumepathhandler
+      # TODO: I have no idea why import-boss --include-test-files is yelling about these for k8s.io/kubernetes/test/e2e/framework/providers/kubemark
+      - k8s.io/kubernetes/pkg/apis/authentication
+      - k8s.io/kubernetes/pkg/apis/authentication/v1
+      - k8s.io/kubernetes/pkg/apis/certificates/v1beta1
+      - k8s.io/kubernetes/pkg/scheduler/internal/cache
   - selectorRegexp: k8s[.]io/kubernetes/test/
     allowedPrefixes:
       - k8s.io/kubernetes/test/e2e/framework
diff --git a/test/integration/.import-restrictions b/test/integration/.import-restrictions
index 1f01942b700..7cfc199c2f9 100644
--- a/test/integration/.import-restrictions
+++ b/test/integration/.import-restrictions
@@ -1,5 +1,7 @@
 rules:
-  # Prevent import of k8s.io/kubernetes/test/e2e
+  # Discourage import of k8s.io/kubernetes/test/e2e
   - selectorRegexp: k8s[.]io/kubernetes/test/e2e
+    # TODO: import-boss --include-test-files is catching these; drive to zero
     allowedPrefixes:
-      - ''
+      # test/integration/auth/bootstraptoken_test.go is using this
+      - k8s.io/kubernetes/test/e2e/lifecycle/bootstrap
diff --git a/test/integration/master/BUILD b/test/integration/master/BUILD
index a646170f36d..a5f03f644db 100644
--- a/test/integration/master/BUILD
+++ b/test/integration/master/BUILD
@@ -32,7 +32,6 @@ go_test(
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/api/networking/v1:go_default_library",
-        "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library",
         "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
         "//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/master/kube_apiserver_test.go
index 27f6be71e08..e294a272a71 100644
--- a/test/integration/master/kube_apiserver_test.go
+++ b/test/integration/master/kube_apiserver_test.go
@@ -31,7 +31,6 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,7 +156,7 @@ func TestOpenAPIDelegationChainPlumbing(t *testing.T) {
 	}
 
 	matchedExtension := false
-	extensionsPrefix := "/apis/" + apiextensions.GroupName
+	extensionsPrefix := "/apis/" + apiextensionsv1beta1.GroupName
 
 	matchedRegistration := false
 	registrationPrefix := "/apis/" + apiregistration.GroupName