Move the plugin imports into their own package so checkconfig doesn't…

… import hook.
yannizhang2019 · Sep 20, 2019 · a1f2768 · a1f2768
1 parent 2d918b6
commit a1f2768
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 50 deletions.
diff --git a/prow/cmd/checkconfig/BUILD.bazel b/prow/cmd/checkconfig/BUILD.bazel
@@ -15,7 +15,7 @@ go_library(
         "//prow/external-plugins/needs-rebase/plugin:go_default_library",
         "//prow/flagutil:go_default_library",
         "//prow/github:go_default_library",
-        "//prow/hook:go_default_library",
+        "//prow/hook/plugin-imports:go_default_library",
         "//prow/labels:go_default_library",
         "//prow/logrusutil:go_default_library",
         "//prow/plugins:go_default_library",

diff --git a/prow/cmd/checkconfig/main.go b/prow/cmd/checkconfig/main.go
@@ -40,7 +40,7 @@ import (
 	needsrebase "k8s.io/test-infra/prow/external-plugins/needs-rebase/plugin"
 	"k8s.io/test-infra/prow/flagutil"
 	"k8s.io/test-infra/prow/github"
-	_ "k8s.io/test-infra/prow/hook"
+	_ "k8s.io/test-infra/prow/hook/plugin-imports"
 	"k8s.io/test-infra/prow/labels"
 	"k8s.io/test-infra/prow/logrusutil"
 	"k8s.io/test-infra/prow/plugins"

diff --git a/prow/hook/BUILD.bazel b/prow/hook/BUILD.bazel
@@ -26,59 +26,14 @@ go_library(
     srcs = [
         "events.go",
         "metrics.go",
-        "plugins.go",
         "server.go",
     ],
     importpath = "k8s.io/test-infra/prow/hook",
     deps = [
         "//prow/config:go_default_library",
         "//prow/github:go_default_library",
+        "//prow/hook/plugin-imports:go_default_library",
         "//prow/plugins:go_default_library",
-        "//prow/plugins/approve:go_default_library",
-        "//prow/plugins/assign:go_default_library",
-        "//prow/plugins/blockade:go_default_library",
-        "//prow/plugins/blunderbuss:go_default_library",
-        "//prow/plugins/branchcleaner:go_default_library",
-        "//prow/plugins/bugzilla:go_default_library",
-        "//prow/plugins/buildifier:go_default_library",
-        "//prow/plugins/cat:go_default_library",
-        "//prow/plugins/cherrypickunapproved:go_default_library",
-        "//prow/plugins/cla:go_default_library",
-        "//prow/plugins/dco:go_default_library",
-        "//prow/plugins/docs-no-retest:go_default_library",
-        "//prow/plugins/dog:go_default_library",
-        "//prow/plugins/golint:go_default_library",
-        "//prow/plugins/heart:go_default_library",
-        "//prow/plugins/help:go_default_library",
-        "//prow/plugins/hold:go_default_library",
-        "//prow/plugins/invalidcommitmsg:go_default_library",
-        "//prow/plugins/label:go_default_library",
-        "//prow/plugins/lgtm:go_default_library",
-        "//prow/plugins/lifecycle:go_default_library",
-        "//prow/plugins/mergecommitblocker:go_default_library",
-        "//prow/plugins/milestone:go_default_library",
-        "//prow/plugins/milestoneapplier:go_default_library",
-        "//prow/plugins/milestonestatus:go_default_library",
-        "//prow/plugins/override:go_default_library",
-        "//prow/plugins/owners-label:go_default_library",
-        "//prow/plugins/pony:go_default_library",
-        "//prow/plugins/project:go_default_library",
-        "//prow/plugins/releasenote:go_default_library",
-        "//prow/plugins/require-matching-label:go_default_library",
-        "//prow/plugins/requiresig:go_default_library",
-        "//prow/plugins/retitle:go_default_library",
-        "//prow/plugins/shrug:go_default_library",
-        "//prow/plugins/sigmention:go_default_library",
-        "//prow/plugins/size:go_default_library",
-        "//prow/plugins/skip:go_default_library",
-        "//prow/plugins/slackevents:go_default_library",
-        "//prow/plugins/stage:go_default_library",
-        "//prow/plugins/trigger:go_default_library",
-        "//prow/plugins/updateconfig:go_default_library",
-        "//prow/plugins/verify-owners:go_default_library",
-        "//prow/plugins/welcome:go_default_library",
-        "//prow/plugins/wip:go_default_library",
-        "//prow/plugins/yuks:go_default_library",
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
     ],
@@ -93,6 +48,9 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [":package-srcs"],
+    srcs = [
+        ":package-srcs",
+        "//prow/hook/plugin-imports:all-srcs",
+    ],
     tags = ["automanaged"],
 )
diff --git a/prow/hook/plugin-imports/BUILD.bazel b/prow/hook/plugin-imports/BUILD.bazel
@@ -0,0 +1,69 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["plugin-imports.go"],
+    importpath = "k8s.io/test-infra/prow/hook/plugin-imports",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//prow/plugins/approve:go_default_library",
+        "//prow/plugins/assign:go_default_library",
+        "//prow/plugins/blockade:go_default_library",
+        "//prow/plugins/blunderbuss:go_default_library",
+        "//prow/plugins/branchcleaner:go_default_library",
+        "//prow/plugins/bugzilla:go_default_library",
+        "//prow/plugins/buildifier:go_default_library",
+        "//prow/plugins/cat:go_default_library",
+        "//prow/plugins/cherrypickunapproved:go_default_library",
+        "//prow/plugins/cla:go_default_library",
+        "//prow/plugins/dco:go_default_library",
+        "//prow/plugins/docs-no-retest:go_default_library",
+        "//prow/plugins/dog:go_default_library",
+        "//prow/plugins/golint:go_default_library",
+        "//prow/plugins/heart:go_default_library",
+        "//prow/plugins/help:go_default_library",
+        "//prow/plugins/hold:go_default_library",
+        "//prow/plugins/invalidcommitmsg:go_default_library",
+        "//prow/plugins/label:go_default_library",
+        "//prow/plugins/lgtm:go_default_library",
+        "//prow/plugins/lifecycle:go_default_library",
+        "//prow/plugins/mergecommitblocker:go_default_library",
+        "//prow/plugins/milestone:go_default_library",
+        "//prow/plugins/milestoneapplier:go_default_library",
+        "//prow/plugins/milestonestatus:go_default_library",
+        "//prow/plugins/override:go_default_library",
+        "//prow/plugins/owners-label:go_default_library",
+        "//prow/plugins/pony:go_default_library",
+        "//prow/plugins/project:go_default_library",
+        "//prow/plugins/releasenote:go_default_library",
+        "//prow/plugins/require-matching-label:go_default_library",
+        "//prow/plugins/requiresig:go_default_library",
+        "//prow/plugins/retitle:go_default_library",
+        "//prow/plugins/shrug:go_default_library",
+        "//prow/plugins/sigmention:go_default_library",
+        "//prow/plugins/size:go_default_library",
+        "//prow/plugins/skip:go_default_library",
+        "//prow/plugins/slackevents:go_default_library",
+        "//prow/plugins/stage:go_default_library",
+        "//prow/plugins/trigger:go_default_library",
+        "//prow/plugins/updateconfig:go_default_library",
+        "//prow/plugins/verify-owners:go_default_library",
+        "//prow/plugins/welcome:go_default_library",
+        "//prow/plugins/wip:go_default_library",
+        "//prow/plugins/yuks:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
diff --git a/prow/hook/plugins.go → prow/hook/plugin-imports/plugin-imports.go b/prow/hook/plugins.go → prow/hook/plugin-imports/plugin-imports.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package hook
+package pluginimports
 
 // We need to empty import all enabled plugins so that they will be linked into
 // any hook binary.

diff --git a/prow/hook/server.go b/prow/hook/server.go
@@ -31,6 +31,7 @@ import (
 
 	"k8s.io/test-infra/prow/config"
 	"k8s.io/test-infra/prow/github"
+	_ "k8s.io/test-infra/prow/hook/plugin-imports"
 	"k8s.io/test-infra/prow/plugins"
 )