Parcourir la source

get golink working in bazel builds

Breandan Dezendorf il y a 2 ans
Parent
commit
db8d0059c5

+ 11 - 0
BUILD.bazel

@@ -2,3 +2,14 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 
 # gazelle:prefix github.com/example/project
 gazelle(name = "gazelle")
+
+gazelle(
+    name = "gazelle-update-repos",
+    args = [
+        "-from_file=go.mod",
+        "-to_macro=deps.bzl%go_dependencies",
+        "-prune",
+        "-build_file_proto_mode=disable_global",
+    ],
+    command = "update-repos",
+)

+ 8 - 1
WORKSPACE

@@ -43,6 +43,13 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 # The first declaration of an external repository "wins".
 ############################################################
 
+go_repository(
+    name = "com_github_julienschmidt_httprouter",
+    importpath = "github.com/julienschmidt/httprouter",
+    sum = "h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=",
+    version = "v1.3.0",
+)
+
 go_rules_dependencies()
 
 go_register_toolchains(version = "1.19.5")
@@ -52,4 +59,4 @@ gazelle_dependencies()
 #go_repository(
 #    name = "com_github_julienschmidt_httprouter",
 #    importpath = "github.com/julienschmidt/httprouter"
-#)
+#)

+ 2 - 2
dezendorf/applications/golink/cmd/main/BUILD.bazel

@@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 go_library(
     name = "main_lib",
     srcs = ["main.go"],
-    importpath = "gogs.dezendorf.net/breandan/monorepo/dezendorf/applications/golink/cmd/main",
+    importpath = "//dezendorf/applications/golink/cmd/main",
     visibility = ["//visibility:private"],
     deps = [
         "//dezendorf/applications/golink/internal/core",
         "//dezendorf/applications/golink/internal/routes",
-
+        "@com_github_julienschmidt_httprouter//:go_default_library"
     ]
 )
 

+ 4 - 4
dezendorf/applications/golink/cmd/main/main.go

@@ -6,10 +6,10 @@ import (
   "log"
   "net/http"
   "github.com/julienschmidt/httprouter"
+  "gogs.dezendorf.net/breandan/monorepo/dezendorf/applications/golink/internal/core"
+  "gogs.dezendorf.net/breandan/monorepo/dezendorf/applications/golink/internal/routes"
 )
 
-import core "gogs.dezendorf.net/breandan/monorepo/dezendorf/applications/golink/internal/core"
-
 var serverPort = flag.Int("port", 80, "webserver port")
 var server = flag.Bool("server", false, "enable webserver")
 func init() {
@@ -22,8 +22,8 @@ func main() {
   if *server {
     fmt.Printf("Starting linkserver on port :%d", *serverPort)
     router := httprouter.New()
-    router.GET("/", core.List)
-    router.GET("/search/:target", core.Search)
+    router.GET("/", routes.List)
+    router.GET("/search/:target", routes.Search)
 
     if err := http.ListenAndServe(":80", nil); err != nil {
       log.Fatal(err)

+ 1 - 0
dezendorf/applications/golink/go.sum

@@ -1,2 +1,3 @@
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+gogs.dezendorf.net/breandan/monorepo v0.0.0-20230307205022-647733b8e7e5 h1:OeE92BSkm5qI1j+LAXPCNOCIGea/pSOtLCQum5XJryM=

+ 2 - 1
dezendorf/applications/golink/internal/routes/BUILD.bazel

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "routes",
     srcs = ["routes.go"],
-    importpath = "github.com/example/project/dezendorf/applications/golink/internal/routes",
+    importpath = "gogs.dezendorf.net/breandan/monorepo/dezendorf/applications/golink/internal/routes",
     visibility = ["//dezendorf/applications/golink:__subpackages__"],
+    deps = ["@com_github_julienschmidt_httprouter//:go_default_library"],
 )

+ 1 - 1
dezendorf/applications/golink/internal/routes/routes.go

@@ -1,4 +1,4 @@
-package core
+package routes
 
 import (
 	"fmt"