Use Go embed for static texts

.gitignore

@@ -41,9 +41,6 @@ pkg/app/web/src/service
 .ijwb
 .idea
 
-# Generated proto go files
-*.embed.go
-
 .dev
 
 # Terraform workspace

BUILD.bazel

@@ -68,6 +68,3 @@ genrule(
 # gazelle:exclude pkg/model/role.pb.validate.go
 # gazelle:exclude pkg/model/user.pb.validate.go
 # gazelle:exclude pkg/app/helloworld/service/service.pb.validate.go
-# gazelle:exclude pkg/datastore/mysql/ensurer/sql.embed.go
-# gazelle:exclude pkg/app/ops/handler/templates.embed.go
-# gazelle:exclude pkg/app/ops/firestoreindexensurer/indexes.embed.go

WORKSPACE

@@ -34,13 +34,6 @@ go_register_toolchains(
     go_version = "1.17.6",
 )
 
-load(
-    "@io_bazel_rules_go//extras:embed_data_deps.bzl",
-    "go_embed_data_dependencies",
-)
-
-go_embed_data_dependencies()
-
 http_archive(
     name = "bazel_gazelle",
     sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",

hack/expose-generated-go.sh

@@ -113,25 +113,6 @@ for package in $(bazelisk query 'kind(gomock, //...)' --output package); do
 	expose_package ${out_path} ${package} old_links generated_files
 done
 
-############################
-# For go_embed_data go files
-############################
-
-# Link to the generated files and add them to excluding list in the root BUILD file.
-for label in $(bazelisk query 'kind(go_embed_data, //...)'); do
-	package="${label%%:*}"
-	package="${package##//}"
-	target="${label##*:}"
-	[[ -d "${package}" ]] || continue
-
-	# Compute the path where Bazel puts the files.
-	out_path="bazel-bin/${package}"
-
-	old_links=${package}/${target}.go
-	generated_files=${out_path}/${target}.go
-	expose_package ${out_path} ${package} old_links generated_files
-done
-
 # Reset the root BUILD file
 cat ${GENERATED_BUILD_FILE} > ${BUILD_FILE}
 rm ${GENERATED_BUILD_FILE}

pkg/app/ops/firestoreindexensurer/BUILD.bazel

@@ -6,8 +6,8 @@ go_library(
         "gcloud.go",
         "indexensurer.go",
         "indexes.go",
-        ":indexes.embed",  #keep
     ],
+    embedsrcs = ["indexes.json"],
     importpath = "github.com/pipe-cd/pipecd/pkg/app/ops/firestoreindexensurer",
     visibility = ["//visibility:public"],
     deps = ["@org_uber_go_zap//:go_default_library"],
@@ -27,13 +27,3 @@ go_test(
         "@com_github_stretchr_testify//require:go_default_library",
     ],
 )
-
-load("@io_bazel_rules_go//go:def.bzl", "go_embed_data")
-
-go_embed_data(
-    name = "indexes.embed",
-    src = "indexes.json",
-    package = "firestoreindexensurer",
-    var = "indexesJSON",
-    visibility = ["//visibility:public"],
-)

pkg/app/ops/firestoreindexensurer/indexes.go

@@ -15,11 +15,15 @@
 package firestoreindexensurer
 
 import (
+	_ "embed"
 	"encoding/json"
 	"fmt"
 	"strings"
 )
 
+//go:embed indexes.json
+var indexesJSON []byte
+
 // index represents a Firestore composite index.
 type index struct {
 	CollectionGroup string  `json:"collectionGroup"`

pkg/app/ops/handler/BUILD.bazel

@@ -2,9 +2,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "handler.go",
-        ":templates.embed",  #keep
+    srcs = ["handler.go"],
+    embedsrcs = [
+        "templates/AddProject",
+        "templates/AddedProject",
+        "templates/ApplicationCounts",
+        "templates/ListProjects",
+        "templates/Top",
     ],
     importpath = "github.com/pipe-cd/pipecd/pkg/app/ops/handler",
     visibility = ["//visibility:public"],
@@ -17,18 +21,6 @@ go_library(
     ],
 )
 
-load("@io_bazel_rules_go//go:def.bzl", "go_embed_data")
-
-go_embed_data(
-    name = "templates.embed",
-    srcs = glob(["templates/*"]),
-    flatten = True,
-    package = "handler",
-    string = True,
-    var = "Templates",
-    visibility = ["//visibility:public"],
-)
-
 go_test(
     name = "go_default_test",
     size = "small",

pkg/app/ops/handler/handler.go

@@ -16,6 +16,7 @@ package handler
 
 import (
 	"context"
+	"embed"
 	"fmt"
 	"html/template"
 	"net/http"
@@ -30,12 +31,15 @@ import (
 	"github.com/pipe-cd/pipecd/pkg/model"
 )
 
+//go:embed templates/*
+var templateFS embed.FS
+
 var (
-	topPageTmpl           = template.Must(template.New("Top").Parse(Templates["Top"]))
-	listProjectsTmpl      = template.Must(template.New("ListProjects").Parse(Templates["ListProjects"]))
-	applicationCountsTmpl = template.Must(template.New("ApplicationCounts").Parse(Templates["ApplicationCounts"]))
-	addProjectTmpl        = template.Must(template.New("AddProject").Parse(Templates["AddProject"]))
-	addedProjectTmpl      = template.Must(template.New("AddedProject").Parse(Templates["AddedProject"]))
+	topPageTmpl           = template.Must(template.ParseFS(templateFS, "templates/Top"))
+	listProjectsTmpl      = template.Must(template.ParseFS(templateFS, "templates/ListProjects"))
+	applicationCountsTmpl = template.Must(template.ParseFS(templateFS, "templates/ApplicationCounts"))
+	addProjectTmpl        = template.Must(template.ParseFS(templateFS, "templates/AddProject"))
+	addedProjectTmpl      = template.Must(template.ParseFS(templateFS, "templates/AddedProject"))
 )
 
 type projectStore interface {

pkg/app/server/grpcapi/BUILD.bazel

@@ -58,5 +58,3 @@ go_test(
         "@org_uber_go_zap//:go_default_library",
     ],
 )
-
-load("@io_bazel_rules_go//go:def.bzl", "go_embed_data")

pkg/datastore/mysql/ensurer/BUILD.bazel

@@ -4,9 +4,12 @@ go_library(
     name = "go_default_library",
     srcs = [
         "client.go",
-        "sql.embed",  #keep
         "sqlsensurer.go",
     ],
+    embedsrcs = [
+        "indexes.sql",
+        "schema.sql",
+    ],
     importpath = "github.com/pipe-cd/pipecd/pkg/datastore/mysql/ensurer",
     visibility = ["//visibility:public"],
     deps = [
@@ -16,19 +19,6 @@ go_library(
     ],
 )
 
-load("@io_bazel_rules_go//go:def.bzl", "go_embed_data")
-
-go_embed_data(
-    name = "sql.embed",
-    srcs = [
-        "indexes.sql",
-        "schema.sql",
-    ],
-    package = "ensurer",
-    string = True,
-    var = "mysqlProperties",
-)
-
 go_test(
     name = "go_default_test",
     size = "small",

pkg/datastore/mysql/ensurer/client.go

@@ -17,6 +17,7 @@ package ensurer
 import (
 	"context"
 	"database/sql"
+	_ "embed"
 	"fmt"
 	"strings"
 
@@ -27,8 +28,10 @@ import (
 )
 
 var (
-	mysqlDatabaseSchema  = mysqlProperties_1
-	mysqlDatabaseIndexes = mysqlProperties_0
+	//go:embed schema.sql
+	mysqlDatabaseSchema string
+	//go:embed indexes.sql
+	mysqlDatabaseIndexes string
 )
 
 const (