Merge deps back to workspace file. Fix proto imports, add missing dep…

…endency.
kubernetes · Jul 16, 2019 · d842d51 · d842d51
1 parent 0a0f951
commit d842d51
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 222 deletions.
diff --git a/_logviewer/WORKSPACE b/_logviewer/WORKSPACE
@@ -18,8 +18,210 @@ go_rules_dependencies()
 
 go_register_toolchains()
 
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
 gazelle_dependencies()
 
-load("//:repositories.bzl", "go_repositories")
+go_repository(
+    name = "com_github_klauspost_pgzip",
+    importpath = "github.com/klauspost/pgzip",
+    tag = "v1.2.1",
+)
+
+go_repository(
+    name = "org_golang_google_api",
+    importpath = "google.golang.org/api",
+    tag = "v0.6.0",
+)
+
+go_repository(
+    name = "org_golang_google_grpc",
+    importpath = "google.golang.org/grpc",
+    tag = "v1.21.1",
+)
+
+go_repository(
+    name = "io_k8s_klog",
+    importpath = "k8s.io/klog",
+    tag = "v0.3.2",
+)
+
+go_repository(
+    name = "com_google_cloud_go",
+    importpath = "cloud.google.com/go",
+    tag = "v0.40.0",
+)
+
+go_repository(
+    name = "co_honnef_go_tools",
+    commit = "e561f6794a2a",
+    importpath = "honnef.co/go/tools",
+)
+
+go_repository(
+    name = "com_github_burntsushi_toml",
+    importpath = "github.com/BurntSushi/toml",
+    tag = "v0.3.1",
+)
+
+go_repository(
+    name = "com_github_client9_misspell",
+    importpath = "github.com/client9/misspell",
+    tag = "v0.3.4",
+)
+
+go_repository(
+    name = "com_github_golang_glog",
+    commit = "23def4e6c14b",
+    importpath = "github.com/golang/glog",
+)
+
+go_repository(
+    name = "com_github_golang_mock",
+    importpath = "github.com/golang/mock",
+    tag = "v1.2.0",
+)
+
+go_repository(
+    name = "com_github_golang_protobuf",
+    importpath = "github.com/golang/protobuf",
+    tag = "v1.3.1",
+)
+
+go_repository(
+    name = "com_github_google_btree",
+    commit = "4030bb1f1f0c",
+    importpath = "github.com/google/btree",
+)
+
+go_repository(
+    name = "com_github_google_go_cmp",
+    importpath = "github.com/google/go-cmp",
+    tag = "v0.3.0",
+)
+
+go_repository(
+    name = "com_github_google_martian",
+    importpath = "github.com/google/martian",
+    tag = "v2.1.0",
+)
+
+go_repository(
+    name = "com_github_google_pprof",
+    commit = "3ea8567a2e57",
+    importpath = "github.com/google/pprof",
+)
+
+go_repository(
+    name = "com_github_hashicorp_golang_lru",
+    importpath = "github.com/hashicorp/golang-lru",
+    tag = "v0.5.1",
+)
+
+go_repository(
+    name = "com_github_jstemmer_go_junit_report",
+    commit = "af01ea7f8024",
+    importpath = "github.com/jstemmer/go-junit-report",
+)
+
+go_repository(
+    name = "com_github_klauspost_compress",
+    importpath = "github.com/klauspost/compress",
+    tag = "v1.7.0",
+)
+
+go_repository(
+    name = "com_github_klauspost_cpuid",
+    importpath = "github.com/klauspost/cpuid",
+    tag = "v1.2.1",
+)
+
+go_repository(
+    name = "io_opencensus_go",
+    importpath = "go.opencensus.io",
+    tag = "v0.21.0",
+)
+
+go_repository(
+    name = "io_rsc_binaryregexp",
+    importpath = "rsc.io/binaryregexp",
+    tag = "v0.2.0",
+)
+
+go_repository(
+    name = "org_golang_google_appengine",
+    importpath = "google.golang.org/appengine",
+    tag = "v1.5.0",
+)
+
+go_repository(
+    name = "org_golang_google_genproto",
+    commit = "fb225487d101",
+    importpath = "google.golang.org/genproto",
+)
+
+go_repository(
+    name = "org_golang_x_crypto",
+    commit = "c2843e01d9a2",
+    importpath = "golang.org/x/crypto",
+)
+
+go_repository(
+    name = "org_golang_x_exp",
+    commit = "438050ddec5e",
+    importpath = "golang.org/x/exp",
+)
+
+go_repository(
+    name = "org_golang_x_lint",
+    commit = "959b441ac422",
+    importpath = "golang.org/x/lint",
+)
+
+go_repository(
+    name = "org_golang_x_net",
+    commit = "f4e77d36d62c",
+    importpath = "golang.org/x/net",
+)
+
+go_repository(
+    name = "org_golang_x_oauth2",
+    commit = "0f29369cfe45",
+    importpath = "golang.org/x/oauth2",
+)
+
+go_repository(
+    name = "org_golang_x_sync",
+    commit = "112230192c58",
+    importpath = "golang.org/x/sync",
+)
+
+go_repository(
+    name = "org_golang_x_sys",
+    commit = "ecd444e8653b",
+    importpath = "golang.org/x/sys",
+)
+
+go_repository(
+    name = "org_golang_x_text",
+    importpath = "golang.org/x/text",
+    tag = "v0.3.2",
+)
+
+go_repository(
+    name = "org_golang_x_time",
+    commit = "85acf8d2951c",
+    importpath = "golang.org/x/time",
+)
+
+go_repository(
+    name = "org_golang_x_tools",
+    commit = "2d16b83fe98c",
+    importpath = "golang.org/x/tools",
+)
+
+go_repository(
+    name = "com_github_googleapis_gax_go",
+    importpath = "github.com/googleapis/gax-go",
+    tag = "v1.0.2",
+)
diff --git a/_logviewer/go.mod b/_logviewer/go.mod
@@ -5,6 +5,7 @@ go 1.12
 require (
 	cloud.google.com/go v0.40.0
 	github.com/golang/protobuf v1.3.1
+	github.com/googleapis/gax-go v2.0.4 // indirect
 	github.com/klauspost/compress v1.7.0 // indirect
 	github.com/klauspost/cpuid v1.2.1 // indirect
 	github.com/klauspost/pgzip v1.2.1

diff --git a/_logviewer/mixer/request/BUILD.bazel b/_logviewer/mixer/request/BUILD.bazel
@@ -6,7 +6,7 @@ proto_library(
     srcs = ["request.proto"],
     visibility = ["//visibility:public"],
     deps = [
-        "//k8s.io/perf-tests/logviewer/worker/work:work_proto",
+        "//worker/work:work_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )
@@ -17,7 +17,7 @@ go_proto_library(
     importpath = "k8s.io/perf-tests/logviewer/mixer/request",
     proto = ":request_proto",
     visibility = ["//visibility:public"],
-    deps = ["//k8s.io/perf-tests/logviewer/worker/work:go_default_library"],
+    deps = ["//worker/work:go_default_library"],
 )
 
 go_library(

diff --git a/_logviewer/mixer/request/request.proto b/_logviewer/mixer/request/request.proto
@@ -1,11 +1,10 @@
 syntax = "proto3";
 
 import "google/protobuf/timestamp.proto";
-import "k8s.io/perf-tests/logviewer/worker/work/work.proto";
+import "worker/work/work.proto";
 
-option go_package = "k8s.io/perf-tests/logviewer/mixer/request";
-
-package request;
+package k8s.io.perftests.logviewer.mixer.request;
+option go_package = "request";
 
 message MixerRequest {
     int32 buildNumber = 1;
@@ -16,7 +15,7 @@ message MixerRequest {
   }
 
   message MixerResult {
-    repeated work.LogLine logLines = 1;
+    repeated k8s.io.perftests.logviewer.worker.work.LogLine logLines = 1;
   }
 
   service MixerService {