Move github app HTML templates to templates folder

The html templates for the github app creation helper have been moved into `./templates/github/` so a user can avoid copying extra files/folders if using ofc-bootstrap outside the clone dir. This was tested by building and running the create-github-app command and generating a github app Signed-off-by: Alistair Hey <[email protected]>
openfaas · May 11, 2020 · 88f790d · 88f790d
1 parent 9eacb6e
commit 88f790d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 39 deletions.
diff --git a/cmd/create_github.go b/cmd/create_github.go
@@ -65,7 +65,7 @@ func createGitHubAppE(command *cobra.Command, _ []string) error {
 		"GitHubEvent": fmt.Sprintf("%s://system.%s/github-event", scheme, rootDomain),
 	}
 
-	if _, err := os.Stat(path.Join("./pkg/github", "index.html")); err != nil {
+	if _, err := os.Stat(path.Join("./templates", "github", "index.html")); err != nil {
 		return fmt.Errorf(`cannot find template "index.html", run this command from the ofc-bootstrap repository`)
 	}
 

diff --git a/pkg/github/handler.go b/pkg/github/handler.go
@@ -40,7 +40,7 @@ func MakeHandler(inputMap map[string]string, resCh chan AppResult) func(w http.R
 		if r.URL.Path == "/" || r.URL.Path == "" {
 
 			var outBuffer bytes.Buffer
-			tmpl, err := template.ParseFiles(path.Join("./pkg/github", "index.html"))
+			tmpl, err := template.ParseFiles(path.Join("./templates/github", "index.html"))
 			err = tmpl.Execute(&outBuffer, &inputMap)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)

diff --git a/pkg/github/result.html b/pkg/github/result.html
diff --git a/pkg/github/index.html → templates/github/index.html b/pkg/github/index.html → templates/github/index.html