boskos: move main packages into cmd/

kubernetes · Feb 6, 2020 · 61838e1 · 61838e1
1 parent 93acd94
commit 61838e1
Show file tree

Hide file tree

Showing 23 changed files with 89 additions and 75 deletions.
diff --git a/boskos/BUILD.bazel b/boskos/BUILD.bazel
@@ -1,73 +1,23 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//def:image.bzl", "tags")
-load("//prow:def.bzl", "prow_image", "prow_push")
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
-
-go_binary(
-    name = "boskos",
-    embed = [":go_default_library"],
-    pure = "on",
-)
-
-prow_image(
-    name = "image",
-    visibility = ["//visibility:public"],
-)
+load("//prow:def.bzl", "prow_push")
 
 prow_push(
     name = "push",
     images = tags(targets = {
         "{STABLE_PROW_REPO}/boskos/aws-janitor": "//boskos/aws-janitor:image",
         "{STABLE_PROW_REPO}/boskos/aws-janitor-boskos": "//boskos/aws-janitor/cmd/aws-janitor-boskos:image",
-        "{STABLE_PROW_REPO}/boskos/boskos": "//boskos:image",
-        "{STABLE_PROW_REPO}/boskos/fake-mason": "//boskos/mason/fake-mason:image",
-        "{STABLE_PROW_REPO}/boskos/cleaner": "//boskos/cleaner/cmd:image",
-        "{STABLE_PROW_REPO}/boskos/janitor": "//boskos/janitor:image",
-        "{STABLE_PROW_REPO}/boskos/metrics": "//boskos/metrics:image",
-        "{STABLE_PROW_REPO}/boskos/reaper": "//boskos/reaper:image",
+        "{STABLE_PROW_REPO}/boskos/boskos": "//boskos/cmd/boskos:image",
+        "{STABLE_PROW_REPO}/boskos/fake-mason": "//boskos/cmd/fake-mason:image",
+        "{STABLE_PROW_REPO}/boskos/cleaner": "//boskos/cmd/cleaner:image",
+        "{STABLE_PROW_REPO}/boskos/janitor": "//boskos/cmd/janitor:image",
+        "{STABLE_PROW_REPO}/boskos/metrics": "//boskos/cmd/metrics:image",
+        "{STABLE_PROW_REPO}/boskos/reaper": "//boskos/cmd/reaper:image",
         "{STABLE_PROW_REPO}/boskos/cli": "//boskos/cmd/cli:image",
     }),
 )
 
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "boskos_test.go",
-        "server_client_test.go",
-        "storage_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//boskos/client:go_default_library",
-        "//boskos/common:go_default_library",
-        "//boskos/crds:go_default_library",
-        "//boskos/ranch:go_default_library",
-        "//boskos/storage:go_default_library",
-    ],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["boskos.go"],
-    importpath = "k8s.io/test-infra/boskos",
-    deps = [
-        "//boskos/common:go_default_library",
-        "//boskos/crds:go_default_library",
-        "//boskos/ranch:go_default_library",
-        "//prow/config:go_default_library",
-        "//prow/interrupts:go_default_library",
-        "//prow/logrusutil:go_default_library",
-        "//prow/metrics:go_default_library",
-        "//prow/pjutil:go_default_library",
-        "//prow/simplifypath:go_default_library",
-        "@com_github_fsnotify_fsnotify//:go_default_library",
-        "@com_github_prometheus_client_golang//prometheus:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
-        "@com_github_spf13_viper//:go_default_library",
-    ],
-)
-
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),
@@ -82,14 +32,17 @@ filegroup(
         "//boskos/aws-janitor:all-srcs",
         "//boskos/cleaner:all-srcs",
         "//boskos/client:all-srcs",
+        "//boskos/cmd/boskos:all-srcs",
+        "//boskos/cmd/cleaner:all-srcs",
         "//boskos/cmd/cli:all-srcs",
+        "//boskos/cmd/fake-mason:all-srcs",
+        "//boskos/cmd/janitor:all-srcs",
+        "//boskos/cmd/metrics:all-srcs",
+        "//boskos/cmd/reaper:all-srcs",
         "//boskos/common:all-srcs",
         "//boskos/crds:all-srcs",
-        "//boskos/janitor:all-srcs",
         "//boskos/mason:all-srcs",
-        "//boskos/metrics:all-srcs",
         "//boskos/ranch:all-srcs",
-        "//boskos/reaper:all-srcs",
         "//boskos/storage:all-srcs",
     ],
     tags = ["automanaged"],

diff --git a/boskos/cleaner/BUILD.bazel b/boskos/cleaner/BUILD.bazel
@@ -21,10 +21,7 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//boskos/cleaner/cmd:all-srcs",
-    ],
+    srcs = [":package-srcs"],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )

diff --git a/boskos/cmd/boskos/BUILD.bazel b/boskos/cmd/boskos/BUILD.bazel
@@ -0,0 +1,67 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
+load("//prow:def.bzl", "prow_image")
+
+go_binary(
+    name = "boskos",
+    embed = [":go_default_library"],
+    pure = "on",
+    visibility = ["//visibility:public"],
+)
+
+prow_image(
+    name = "image",
+    visibility = ["//visibility:public"],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["boskos.go"],
+    importpath = "k8s.io/test-infra/boskos/cmd/boskos",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//boskos/common:go_default_library",
+        "//boskos/crds:go_default_library",
+        "//boskos/ranch:go_default_library",
+        "//prow/config:go_default_library",
+        "//prow/interrupts:go_default_library",
+        "//prow/logrusutil:go_default_library",
+        "//prow/metrics:go_default_library",
+        "//prow/pjutil:go_default_library",
+        "//prow/simplifypath:go_default_library",
+        "@com_github_fsnotify_fsnotify//:go_default_library",
+        "@com_github_prometheus_client_golang//prometheus:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+        "@com_github_spf13_viper//:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "boskos_test.go",
+        "server_client_test.go",
+        "storage_test.go",
+    ],
+    embed = [":go_default_library"],
+    deps = [
+        "//boskos/client:go_default_library",
+        "//boskos/common:go_default_library",
+        "//boskos/crds:go_default_library",
+        "//boskos/ranch:go_default_library",
+        "//boskos/storage: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/boskos/boskos.go → boskos/cmd/boskos/boskos.go b/boskos/boskos.go → boskos/cmd/boskos/boskos.go
diff --git a/boskos/boskos_test.go → boskos/cmd/boskos/boskos_test.go b/boskos/boskos_test.go → boskos/cmd/boskos/boskos_test.go
diff --git a/boskos/server_client_test.go → boskos/cmd/boskos/server_client_test.go b/boskos/server_client_test.go → boskos/cmd/boskos/server_client_test.go
diff --git a/boskos/storage_test.go → boskos/cmd/boskos/storage_test.go b/boskos/storage_test.go → boskos/cmd/boskos/storage_test.go
diff --git a/boskos/cleaner/cmd/BUILD.bazel → boskos/cmd/cleaner/BUILD.bazel b/boskos/cleaner/cmd/BUILD.bazel → boskos/cmd/cleaner/BUILD.bazel
@@ -4,7 +4,7 @@ load("//prow:def.bzl", "prow_image")
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
-    importpath = "k8s.io/test-infra/boskos/cleaner/cmd",
+    importpath = "k8s.io/test-infra/boskos/cmd/cleaner",
     visibility = ["//visibility:private"],
     deps = [
         "//boskos/cleaner:go_default_library",

diff --git a/boskos/cleaner/cmd/example-deployment.yaml → boskos/cmd/cleaner/example-deployment.yaml b/boskos/cleaner/cmd/example-deployment.yaml → boskos/cmd/cleaner/example-deployment.yaml
diff --git a/boskos/cleaner/cmd/main.go → boskos/cmd/cleaner/main.go b/boskos/cleaner/cmd/main.go → boskos/cmd/cleaner/main.go
diff --git a/boskos/mason/fake-mason/BUILD.bazel → boskos/cmd/fake-mason/BUILD.bazel b/boskos/mason/fake-mason/BUILD.bazel → boskos/cmd/fake-mason/BUILD.bazel
@@ -4,7 +4,7 @@ load("//prow:def.bzl", "prow_image")
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
-    importpath = "k8s.io/test-infra/boskos/mason/fake-mason",
+    importpath = "k8s.io/test-infra/boskos/cmd/fake-mason",
     visibility = ["//visibility:private"],
     deps = [
         "//boskos/client:go_default_library",

diff --git a/boskos/mason/fake-mason/main.go → boskos/cmd/fake-mason/main.go b/boskos/mason/fake-mason/main.go → boskos/cmd/fake-mason/main.go
diff --git a/boskos/janitor/BUILD.bazel → boskos/cmd/janitor/BUILD.bazel b/boskos/janitor/BUILD.bazel → boskos/cmd/janitor/BUILD.bazel
@@ -19,7 +19,7 @@ go_binary(
 go_library(
     name = "go_default_library",
     srcs = ["janitor.go"],
-    importpath = "k8s.io/test-infra/boskos/janitor",
+    importpath = "k8s.io/test-infra/boskos/cmd/janitor",
     deps = [
         "//boskos/client:go_default_library",
         "//boskos/common:go_default_library",

diff --git a/boskos/janitor/gcp_janitor.py → boskos/cmd/janitor/gcp_janitor.py b/boskos/janitor/gcp_janitor.py → boskos/cmd/janitor/gcp_janitor.py
diff --git a/boskos/janitor/janitor.go → boskos/cmd/janitor/janitor.go b/boskos/janitor/janitor.go → boskos/cmd/janitor/janitor.go
diff --git a/boskos/janitor/janitor_test.go → boskos/cmd/janitor/janitor_test.go b/boskos/janitor/janitor_test.go → boskos/cmd/janitor/janitor_test.go
diff --git a/boskos/metrics/BUILD.bazel → boskos/cmd/metrics/BUILD.bazel b/boskos/metrics/BUILD.bazel → boskos/cmd/metrics/BUILD.bazel
@@ -19,7 +19,7 @@ go_binary(
 go_library(
     name = "go_default_library",
     srcs = ["metrics.go"],
-    importpath = "k8s.io/test-infra/boskos/metrics",
+    importpath = "k8s.io/test-infra/boskos/cmd/metrics",
     deps = [
         "//boskos/client:go_default_library",
         "//boskos/common:go_default_library",

diff --git a/boskos/metrics/metrics.go → boskos/cmd/metrics/metrics.go b/boskos/metrics/metrics.go → boskos/cmd/metrics/metrics.go
diff --git a/boskos/reaper/BUILD.bazel → boskos/cmd/reaper/BUILD.bazel b/boskos/reaper/BUILD.bazel → boskos/cmd/reaper/BUILD.bazel
@@ -12,7 +12,7 @@ go_binary(
 go_library(
     name = "go_default_library",
     srcs = ["reaper.go"],
-    importpath = "k8s.io/test-infra/boskos/reaper",
+    importpath = "k8s.io/test-infra/boskos/cmd/reaper",
     deps = [
         "//boskos/client:go_default_library",
         "//boskos/common:go_default_library",

diff --git a/boskos/reaper/reaper.go → boskos/cmd/reaper/reaper.go b/boskos/reaper/reaper.go → boskos/cmd/reaper/reaper.go
diff --git a/boskos/mason/BUILD.bazel b/boskos/mason/BUILD.bazel
@@ -44,10 +44,7 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//boskos/mason/fake-mason:all-srcs",
-    ],
+    srcs = [":package-srcs"],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
diff --git a/config/jobs/kubernetes/test-infra/janitors.yaml b/config/jobs/kubernetes/test-infra/janitors.yaml
@@ -39,7 +39,7 @@ periodics:
       - experiment/ci-janitor/main.go
       - --config-path=config/prow/config.yaml
       - --job-config-path=config/jobs
-      - --janitor-path=boskos/janitor/gcp_janitor.py
+      - --janitor-path=boskos/cmd/janitor/gcp_janitor.py
       image: gcr.io/k8s-testimages/kubekins-e2e:v20200205-602500d-master
       resources:
         requests:

diff --git a/scenarios/kubernetes_janitor.py b/scenarios/kubernetes_janitor.py
@@ -63,7 +63,7 @@ def clean_project(project, hours=24, dryrun=False, ratelimit=None, filt=None):
         return
     CHECKED.add(project)
 
-    cmd = ['python', test_infra('boskos/janitor/gcp_janitor.py'), '--project=%s' % project]
+    cmd = ['python', test_infra('boskos/cmd/janitor/gcp_janitor.py'), '--project=%s' % project]
     cmd.append('--hour=%d' % hours)
     if dryrun:
         cmd.append('--dryrun')