extends plese and proto fixes to prs that were inflight when these fi…

…xes landed (#33)
thought-machine · May 29, 2020 · 3149e38 · 3149e38
1 parent 47589a7
commit 3149e38
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/consumers/slack/BUILD b/consumers/slack/BUILD
@@ -1,4 +1,4 @@
-subinclude("@pleasings//docker")
+subinclude("@third_party/subrepos/pleasings//docker")
 
 
 go_binary(
@@ -9,8 +9,8 @@ go_binary(
     deps = [
         "//consumers",
         "//consumers/slack/utils:utils",
-        "//pkg/genproto/v1",
-        "//third_party/go:golang_protobuf",
+        "//api/proto:v1",
+        "//third_party/go:protobuf",
     ],
 )
 

diff --git a/consumers/slack/types/BUILD b/consumers/slack/types/BUILD
@@ -7,6 +7,6 @@ go_library(
     visibility = [
         "//consumers/slack/...",
     ],
-    deps = ["//pkg/genproto/v1",]
+    deps = ["//api/proto:v1",]
 
 )
diff --git a/consumers/slack/types/full-document.go b/consumers/slack/types/full-document.go
@@ -3,7 +3,7 @@ package types
 import (
 	"time"
 
-	v1 "github.com/thought-machine/dracon/pkg/genproto/v1"
+	v1 "api/proto/v1"
 )
 
 type FullDocument struct {

diff --git a/consumers/slack/utils/BUILD b/consumers/slack/utils/BUILD
@@ -7,9 +7,10 @@ go_library(
     visibility = [
         "//consumers/slack/...",
     ],
-    deps = ["//pkg/genproto/v1",
+    deps = ["//api/proto:v1",
          "//consumers/slack/types",
-        "//third_party/go:golang_protobuf",]
+        "//third_party/go:protobuf",
+        ]
 
 )
 go_test(
@@ -21,9 +22,9 @@ go_test(
     deps = [
         ":utils",
         "//consumers",
-        "//pkg/genproto/v1",
+        "//api/proto:v1",
         "//third_party/go:gogo_protobuf",
-        "//third_party/go:golang_protobuf",
+        "//third_party/go:protobuf",
         "//third_party/go:stretchr_testify",
     ],
 )
diff --git a/consumers/slack/utils/utils.go b/consumers/slack/utils/utils.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/ptypes"
-	v1 "github.com/thought-machine/dracon/pkg/genproto/v1"
+	"api/proto/v1"
 )
 
 func push(b string, webhook string) error {

diff --git a/consumers/slack/utils/utils_test.go b/consumers/slack/utils/utils_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/stretchr/testify/assert"
-	v1 "github.com/thought-machine/dracon/pkg/genproto/v1"
+	"api/proto/v1"
 )
 
 //TODO tests: count* get*

diff --git a/producers/dependency_check/BUILD b/producers/dependency_check/BUILD
@@ -1,4 +1,4 @@
-subinclude("@pleasings//docker")
+subinclude("@third_party/subrepos/pleasings//docker")
 
 go_binary(
     name = "dependency_check",

diff --git a/producers/pipsafety/BUILD b/producers/pipsafety/BUILD
@@ -1,4 +1,4 @@
-subinclude("@pleasings//docker")
+subinclude("@third_party/subrepos/pleasings//docker")
 
 go_binary(
     name = "pipsafety",

diff --git a/producers/pipsafety/types/safety-issue.go b/producers/pipsafety/types/safety-issue.go
@@ -23,6 +23,6 @@ func (i *SafetyIssue) UnmarshalJSON(data []byte) error {
 	i.Name, _ = v[0].(string)
 	i.VersionConstraint, _ = v[1].(string)
 	i.CurrentVersion, _ = v[2].(string)
-	i.Descriptionm, _ = v[3].(string)
+	i.Description, _ = v[3].(string)
 	return nil
 }