Merge pull request #1146 from tkan145/replace-go-bindata-with-embed

Replace go-bindata with embed

Author: tkan145

Makefile

@@ -193,14 +193,6 @@ $(OPERATOR_SDK):
 .PHONY: operator-sdk
 operator-sdk: $(OPERATOR_SDK)
 
-GO_BINDATA=$(PROJECT_PATH)/bin/go-bindata
-GO_BINDATA_VERSION = v3.1.3
-$(GO_BINDATA):
-	$(call go-install-tool,$(GO_BINDATA),github.com/go-bindata/go-bindata/v3/...,$(GO_BINDATA_VERSION))
-
-.PHONY: go-bindata
-go-bindata: $(GO_BINDATA)
-
 # Install CRDs into a cluster
 install: manifests $(KUSTOMIZE)
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) create -f - || $(KUSTOMIZE) build config/crd | $(KUBECTL) replace -f -
@@ -239,10 +231,8 @@ lint: $(GOLANGCI-LINT) ## Run lint tests
 	$(GOLANGCI-LINT) run
 
 # Generate code
-generate: $(CONTROLLER_GEN) $(GO_BINDATA)
+generate: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
-	@echo Generate Go embedded assets files by processing source
-	export PATH=$(PROJECT_PATH)/bin:$$PATH;	$(GO) generate github.com/3scale/3scale-operator/pkg/assets
 
 # Build the docker image
 .PHONY: docker-build

doc/dependency_decisions.yml

@@ -189,13 +189,6 @@
     :why: 
     :versions: []
     :when: 2019-11-26 10:15:34.001520959 Z
-- - :license
-  - github.com/go-bindata/go-bindata
-  - CC0 1.0 Universal
-  - :who: 
-    :why: https://github.com/go-bindata/go-bindata/blob/master/LICENSE
-    :versions: []
-    :when: 2020-06-15 09:58:31.161619176 Z
 - - :license
   - github.com/RHsyseng/operator-utils
   - Apache 2.0

pkg/assets/assets.go

@@ -2,25 +2,25 @@ package assets
 
 import (
 	"bytes"
+	"embed"
 	"text/template"
 )
 
-// Important: Run "make" to regenerate code after modifying/adding/removing any asset
-// adding -nometadata to not preserve size, mode, and modtime info. It should not be necessary as the content will be embedded in custom resources.
-//go:generate go-bindata --prefix assets -pkg $GOPACKAGE -nometadata -o bindata.go assets/...
+//go:embed assets/*
+var embeddedFiles embed.FS
 
 // SafeStringAsset Returns asset data as string
 // panic if not found or any err is detected
 func SafeStringAsset(name string) string {
-	data, err := Asset(name)
+	data, err := embeddedFiles.ReadFile("assets/" + name)
 	if err != nil {
 		panic(err)
 	}
 
 	return string(data)
 }
 
-// TemplateAsset Executes one tamplate by applying it to a daata structure.
+// TemplateAsset Executes one template by applying it to a data structure.
 // panic if not found or any err is detected
 func TemplateAsset(name string, data interface{}) string {
 	tObj, err := template.New(name).Parse(SafeStringAsset(name))