Merge pull request #5 from Zeerg/develop

v0.1

.gitignore

@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+bin/

Dockerfile

@@ -11,7 +11,6 @@ WORKDIR /
 
 # Until Go Embed stuff
 COPY --from=build /helix-honeypot /helix-honeypot
-COPY --from=build /app/kube_json /kube_json
 
 EXPOSE 8000
 

handler/apiHandler.go

@@ -4,36 +4,28 @@ import (
 	"github.com/labstack/echo/v4"
 	"net/http"
 	"encoding/json"
-    "io/ioutil"
 )
-// Root Route Handler
 func ApiHandler(c echo.Context) error {
-	jsonFile, err := ioutil.ReadFile("./kube_json/api.json")
-    if err != nil {
-		c.Logger().Print(err)
-    }
 	var data map[string]interface{}
-	err = json.Unmarshal(jsonFile, &data)
-
+	err := json.Unmarshal(embedGet("api.json"), &data)
+	if err != nil {
+		c.Logger().Print(err)
+	}
 	return c.JSON(http.StatusOK, data)
 }
-// Basic API Handler
 func ApiResourceList(c echo.Context) error {
-	jsonFile, err := ioutil.ReadFile("./kube_json/api_resourcelist.json")
-    if err != nil {
-		c.Logger().Print(err)
-    }
 	var data map[string]interface{}
-	err = json.Unmarshal(jsonFile, &data)
-
+	err := json.Unmarshal(embedGet("api_resourcelist.json"), &data)
+	if err != nil {
+		c.Logger().Print(err)
+	}
 	return c.JSON(http.StatusOK, data)
 }
 func ApiGroupList(c echo.Context) error {
-	jsonFile, err := ioutil.ReadFile("./kube_json/api_grouplist.json")
-    if err != nil {
-		c.Logger().Print(err)
-    }
 	var data map[string]interface{}
-	err = json.Unmarshal(jsonFile, &data)
+	err := json.Unmarshal(embedGet("api_grouplist.json"), &data)
+	if err != nil {
+		c.Logger().Print(err)
+	}
 	return c.JSON(http.StatusOK, data)
 }

handler/embed.go

@@ -0,0 +1,18 @@
+package handler
+
+import (
+	"embed"
+	"fmt"
+)
+// Embed the required files
+//go:embed embedded/*
+var embededFS embed.FS
+
+// Embed FS function
+func embedGet(fileName string) []byte {
+	fileBytes, err := embededFS.ReadFile("embedded/" + fileName)
+	if err != nil {
+		fmt.Print(err)
+	}
+	return fileBytes
+}

handler/openapiHandler.go

@@ -6,15 +6,12 @@ import (
 	"bytes"
 	"compress/gzip"
 	"crypto/sha512"
-	_ "embed"
 
 	"github.com/labstack/echo/v4"
 	"github.com/golang/protobuf/proto"
 	openapi_v2 "github.com/googleapis/gnostic/openapiv2"
 )
-// Embed the yaml file with go embed
-//go:embed openapiYaml/k8s_v1.19.7_openapi.yaml
-var openApiBytes []byte
+
 // Kubectl expects gzip usually....I really don't know
 func gzipHelper(data []byte) []byte {
 	var buf bytes.Buffer
@@ -29,8 +26,7 @@ func computeETag(data []byte) string {
 }
 // OpenAPI Handler becuase unless the swagger doc is cached locally it's transferred on every request :(
 func OpenApiHandler(c echo.Context) error {
-
-	openApiDoc, err := openapi_v2.ParseDocument(openApiBytes)
+	openApiDoc, err := openapi_v2.ParseDocument(embedGet("v1.19.7_openapi.yaml"))
 	if err != nil {
 		c.Logger().Print(err)
 	}

handler/resourcesHandler.go

@@ -4,18 +4,15 @@ import (
 	"github.com/labstack/echo/v4"
 	"net/http"
 	"encoding/json"
-    "io/ioutil"
 )
 
 // Pods Handler for default routes etc..Just returns blank
 func PodsHandler(c echo.Context) error {
-	jsonFile, err := ioutil.ReadFile("./kube_json/default_pods.json")
-    if err != nil {
-      c.Logger().Print(err)
-    }
 	var data map[string]interface{}
-	err = json.Unmarshal(jsonFile, &data)
-
+	err := json.Unmarshal(embedGet("empty_list.json"), &data)
+	if err != nil {
+		c.Logger().Print(err)
+	}
 	return c.JSON(http.StatusOK, data)
 }
 // Handler for any k8s resource like deployments etc.

handler/rootHandler.go

@@ -4,17 +4,13 @@ import (
 	"github.com/labstack/echo/v4"
 	"net/http"
 	"encoding/json"
-    "fmt"
-    "io/ioutil"
 )
 // Root Route Handler
 func RootHandler(c echo.Context) error {
-	jsonFile, err := ioutil.ReadFile("./kube_json/root.json")
-    if err != nil {
-      fmt.Print(err)
-    }
 	var data map[string]interface{}
-	err = json.Unmarshal(jsonFile, &data)
-
+	err := json.Unmarshal(embedGet("root.json"), &data)
+	if err != nil {
+		c.Logger().Print(err)
+	}
 	return c.JSON(http.StatusOK, data)
 }

handler/serviceHandler.go

@@ -4,22 +4,20 @@ import (
 	"github.com/labstack/echo/v4"
 	"net/http"
     "fmt"
-    "io/ioutil"
 	"encoding/json"
 
 )
 //Pods Handler
 func ServiceHandler(c echo.Context) error {
-	servicePathBase := "./kube_json/resource_dump/"
+	servicePathBase := "resource_dump/"
 	service := c.Param("service")
 	version := c.Param("version")
 	fileName := "serverresources.json"
 	filePath := fmt.Sprintf("%s%s/%s/%s", servicePathBase, service, version, fileName)
-	jsonFile, err := ioutil.ReadFile(filePath)
-    if err != nil {
+	var data map[string]interface{}
+	err := json.Unmarshal(embedGet(filePath), &data)
+	if err != nil {
 		c.Logger().Print(err)
-    }
-	var result map[string]interface{}
-	json.Unmarshal(jsonFile, &result)
-	return c.JSON(http.StatusOK, result)
+	}
+	return c.JSON(http.StatusOK, data)
 }