Merge pull request #337 from linkernetworks/phstsai/configmap-base64

[Task] Remove decode base64 step when creating configmap
linkernetworks · Oct 2, 2018 · d0f57a9 · d0f57a9
2 parents a0b1a83 + 4c35139
commit d0f57a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/server/handler_configmap.go b/src/server/handler_configmap.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"encoding/base64"
 	"fmt"
 	"io/ioutil"
 	"math"
@@ -49,14 +48,8 @@ func createConfigMapHandler(ctx *web.Context) {
 	})
 	defer session.Close()
 
-	// Decode the data from base64 to string
 	for dataName, dataContent := range n.Data {
-		decoded, err := base64.StdEncoding.DecodeString(dataContent)
-		if err != nil {
-			response.BadRequest(req.Request, resp.ResponseWriter, err)
-			return
-		}
-		n.Data[dataName] = string(decoded)
+		n.Data[dataName] = string(dataContent)
 	}
 
 	// Check whether this name has been used

diff --git a/src/server/handler_configmap_test.go b/src/server/handler_configmap_test.go
@@ -66,8 +66,8 @@ func TestConfigMapSuite(t *testing.T) {
 
 func (suite *ConfigMapTestSuite) TestCreateConfigMap() {
 	data := map[string]string{
-		"firstData":  "YXdlc29tZQ==",
-		"secondData": "ewogICJjb2xvcnMiOiBbCiAgICB7CiAgICAgICJjb2xvciI6ICJibGFjayIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJwcmltYXJ5IiwKICAgICAgImNvZGUiOiB7CiAgICAgICAgInJnYmEiOiBbMjU1LDI1NSwyNTUsMV0sCiAgICAgICAgImhleCI6ICIjMDAwIgogICAgICB9CiAgICB9LAogICAgewogICAgICAiY29sb3IiOiAid2hpdGUiLAogICAgICAiY2F0ZWdvcnkiOiAidmFsdWUiLAogICAgICAiY29kZSI6IHsKICAgICAgICAicmdiYSI6IFswLDAsMCwxXSwKICAgICAgICAiaGV4IjogIiNGRkYiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJyZWQiLAogICAgICAiY2F0ZWdvcnkiOiAiaHVlIiwKICAgICAgInR5cGUiOiAicHJpbWFyeSIsCiAgICAgICJjb2RlIjogewogICAgICAgICJyZ2JhIjogWzI1NSwwLDAsMV0sCiAgICAgICAgImhleCI6ICIjRkYwIgogICAgICB9CiAgICB9LAogICAgewogICAgICAiY29sb3IiOiAiYmx1ZSIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJwcmltYXJ5IiwKICAgICAgImNvZGUiOiB7CiAgICAgICAgInJnYmEiOiBbMCwwLDI1NSwxXSwKICAgICAgICAiaGV4IjogIiMwMEYiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJ5ZWxsb3ciLAogICAgICAiY2F0ZWdvcnkiOiAiaHVlIiwKICAgICAgInR5cGUiOiAicHJpbWFyeSIsCiAgICAgICJjb2RlIjogewogICAgICAgICJyZ2JhIjogWzI1NSwyNTUsMCwxXSwKICAgICAgICAiaGV4IjogIiNGRjAiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJncmVlbiIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJzZWNvbmRhcnkiLAogICAgICAiY29kZSI6IHsKICAgICAgICAicmdiYSI6IFswLDI1NSwwLDFdLAogICAgICAgICJoZXgiOiAiIzBGMCIKICAgICAgfQogICAgfSwKICBdCn0=",
+		"firstData":  "awesome",
+		"secondData": "{\r\n  \"colors\": [\r\n    {\r\n      \"color\": \"black\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,255,255,1],\r\n        \"hex\": \"#000\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"white\",\r\n      \"category\": \"value\",\r\n      \"code\": {\r\n        \"rgba\": [0,0,0,1],\r\n        \"hex\": \"#FFF\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"red\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,0,0,1],\r\n        \"hex\": \"#FF0\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"blue\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [0,0,255,1],\r\n        \"hex\": \"#00F\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"yellow\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,255,0,1],\r\n        \"hex\": \"#FF0\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"green\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"secondary\",\r\n      \"code\": {\r\n        \"rgba\": [0,255,0,1],\r\n        \"hex\": \"#0F0\"\r\n      }\r\n    },\r\n  ]\r\n}",
 	}
 	configMap := entity.ConfigMap{
 		ID:        bson.NewObjectId(),
@@ -163,8 +163,8 @@ func (suite *ConfigMapTestSuite) TestDeleteConfigMapWithInvalidID() {
 func (suite *ConfigMapTestSuite) TestGetConfigMap() {
 	configMapName := namesgenerator.GetRandomName(0)
 	data := map[string]string{
-		"firstData":  "YXdlc29tZQ==",
-		"secondData": "ewogICJjb2xvcnMiOiBbCiAgICB7CiAgICAgICJjb2xvciI6ICJibGFjayIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJwcmltYXJ5IiwKICAgICAgImNvZGUiOiB7CiAgICAgICAgInJnYmEiOiBbMjU1LDI1NSwyNTUsMV0sCiAgICAgICAgImhleCI6ICIjMDAwIgogICAgICB9CiAgICB9LAogICAgewogICAgICAiY29sb3IiOiAid2hpdGUiLAogICAgICAiY2F0ZWdvcnkiOiAidmFsdWUiLAogICAgICAiY29kZSI6IHsKICAgICAgICAicmdiYSI6IFswLDAsMCwxXSwKICAgICAgICAiaGV4IjogIiNGRkYiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJyZWQiLAogICAgICAiY2F0ZWdvcnkiOiAiaHVlIiwKICAgICAgInR5cGUiOiAicHJpbWFyeSIsCiAgICAgICJjb2RlIjogewogICAgICAgICJyZ2JhIjogWzI1NSwwLDAsMV0sCiAgICAgICAgImhleCI6ICIjRkYwIgogICAgICB9CiAgICB9LAogICAgewogICAgICAiY29sb3IiOiAiYmx1ZSIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJwcmltYXJ5IiwKICAgICAgImNvZGUiOiB7CiAgICAgICAgInJnYmEiOiBbMCwwLDI1NSwxXSwKICAgICAgICAiaGV4IjogIiMwMEYiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJ5ZWxsb3ciLAogICAgICAiY2F0ZWdvcnkiOiAiaHVlIiwKICAgICAgInR5cGUiOiAicHJpbWFyeSIsCiAgICAgICJjb2RlIjogewogICAgICAgICJyZ2JhIjogWzI1NSwyNTUsMCwxXSwKICAgICAgICAiaGV4IjogIiNGRjAiCiAgICAgIH0KICAgIH0sCiAgICB7CiAgICAgICJjb2xvciI6ICJncmVlbiIsCiAgICAgICJjYXRlZ29yeSI6ICJodWUiLAogICAgICAidHlwZSI6ICJzZWNvbmRhcnkiLAogICAgICAiY29kZSI6IHsKICAgICAgICAicmdiYSI6IFswLDI1NSwwLDFdLAogICAgICAgICJoZXgiOiAiIzBGMCIKICAgICAgfQogICAgfSwKICBdCn0=",
+		"firstData":  "awesome",
+		"secondData": "{\r\n  \"colors\": [\r\n    {\r\n      \"color\": \"black\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,255,255,1],\r\n        \"hex\": \"#000\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"white\",\r\n      \"category\": \"value\",\r\n      \"code\": {\r\n        \"rgba\": [0,0,0,1],\r\n        \"hex\": \"#FFF\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"red\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,0,0,1],\r\n        \"hex\": \"#FF0\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"blue\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [0,0,255,1],\r\n        \"hex\": \"#00F\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"yellow\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"primary\",\r\n      \"code\": {\r\n        \"rgba\": [255,255,0,1],\r\n        \"hex\": \"#FF0\"\r\n      }\r\n    },\r\n    {\r\n      \"color\": \"green\",\r\n      \"category\": \"hue\",\r\n      \"type\": \"secondary\",\r\n      \"code\": {\r\n        \"rgba\": [0,255,0,1],\r\n        \"hex\": \"#0F0\"\r\n      }\r\n    },\r\n  ]\r\n}",
 	}
 	configMap := entity.ConfigMap{
 		ID:        bson.NewObjectId(),