use string instead of types.JSONText in the gorm table structs

Author: Keerthan Mala

Makefile

@@ -12,7 +12,7 @@ DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.1
 SWAGGER_IMAGE := quay.io/goswagger/swagger:0.5.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
-DEV_ENV_CMD := ${DEV_ENV_PREFIX} -e GODEBUG=cgocheck=0 ${DEV_ENV_IMAGE}
+DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 SWAGGER_CMD := docker run --rm -e GOPATH=/go -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${SWAGGER_IMAGE}
 
 # SemVer with build information is defined in the SemVer 2 spec, but Docker

pkg/data/cluster.go

@@ -29,7 +29,7 @@ func GetCluster(db *gorm.DB, id string) (models.Cluster, error) {
 	if resDB.Error != nil {
 		return models.Cluster{}, resDB.Error
 	}
-	cluster, err := parseJSONCluster(ret.Data)
+	cluster, err := parseJSONCluster([]byte(ret.Data))
 	if err != nil {
 		return models.Cluster{}, errParsingCluster{origErr: err}
 	}
@@ -54,13 +54,13 @@ func upsertCluster(db *gorm.DB, id string, cluster models.Cluster) (models.Clust
 	var resDB *gorm.DB
 	if numExisting == 0 {
 		// no existing clusters, so create one
-		createDB := db.Create(&clustersTable{ClusterID: id, Data: js})
+		createDB := db.Create(&clustersTable{ClusterID: id, Data: string(js)})
 		if createDB.Error != nil {
 			return models.Cluster{}, createDB.Error
 		}
 		resDB = createDB
 	} else {
-		updateDB := db.Save(&clustersTable{ClusterID: id, Data: js})
+		updateDB := db.Save(&clustersTable{ClusterID: id, Data: string(js)})
 		if updateDB.Error != nil {
 			return models.Cluster{}, updateDB.Error
 		}
@@ -138,7 +138,7 @@ func FilterClustersByAge(db *gorm.DB, filter *ClusterAgeFilter) ([]*models.Clust
 
 	clusters := make([]*models.Cluster, len(rows))
 	for i, row := range rows {
-		cluster, err := parseJSONCluster(row.Data)
+		cluster, err := parseJSONCluster([]byte(row.Data))
 		if err != nil {
 			return nil, err
 		}

pkg/data/cluster_count_test.go

@@ -12,7 +12,7 @@ func TestGetClusterCount(t *testing.T) {
 	count, err := GetClusterCount(db)
 	assert.NoErr(t, err)
 	assert.Equal(t, count, 0, "count")
-	d1 := db.Create(&clustersTable{ClusterID: uuid.New(), Data: []byte("{}")})
+	d1 := db.Create(&clustersTable{ClusterID: uuid.New(), Data: "{}"})
 	assert.NoErr(t, d1.Error)
 	count, err = GetClusterCount(d1)
 	assert.NoErr(t, err)

pkg/data/cluster_filter_by_age_test.go

@@ -130,7 +130,7 @@ func createAndCheckinClusters(db *gorm.DB, totalNumClusters, filterNum int, fca
 		if marshalErr != nil {
 			return fmt.Errorf("error JSON serializing cluster %d for filter %d (%s)", clusterNum, filterNum, marshalErr)
 		}
-		createDB := db.Model(&clustersTable{}).Create(&clustersTable{ClusterID: cluster.ID, Data: clusterJSON})
+		createDB := db.Model(&clustersTable{}).Create(&clustersTable{ClusterID: cluster.ID, Data: string(clusterJSON)})
 		if createDB.Error != nil {
 			return fmt.Errorf("error creating cluster %s for filter %d in DB (%s)", cluster.ID, filterNum, createDB.Error)
 		}

pkg/data/clusters_checkins_table.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"log"
 	"time"
-
-	"github.com/jmoiron/sqlx/types"
 )
 
 const (
@@ -19,18 +17,18 @@ const (
 
 // ClustersCheckinsTable type that expresses the `clusters_checkins` postgres table schema
 type clustersCheckinsTable struct {
-	CheckinsID string         `gorm:"primary_key;type:bigserial;column_name:checkins_id"`
-	ClusterID  string         `gorm:"type:uuid;column_name:cluster_id;index"`
-	CreatedAt  string         `gorm:"type:timestamp;column_name:created_at;index"`
-	Data       types.JSONText `gorm:"type:json;column_name:data"`
+	CheckinsID string `gorm:"primary_key;type:bigserial;column_name:checkins_id"`
+	ClusterID  string `gorm:"type:uuid;column_name:cluster_id;index"`
+	CreatedAt  string `gorm:"type:timestamp;column_name:created_at;index"`
+	Data       string `gorm:"type:json;column_name:data"`
 }
 
 func newClustersCheckinsTable(checkinID, clusterID string, createdAt time.Time, clusterData []byte) clustersCheckinsTable {
 	return clustersCheckinsTable{
 		CheckinsID: checkinID,
 		ClusterID:  clusterID,
 		CreatedAt:  Timestamp{Time: createdAt}.String(),
-		Data:       types.JSONText(clusterData),
+		Data:       string(clusterData),
 	}
 }
 

pkg/data/clusters_table.go

@@ -4,8 +4,6 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
-
-	"github.com/jmoiron/sqlx/types"
 )
 
 const (
@@ -16,8 +14,8 @@ const (
 
 // ClustersTable type that expresses the `clusters` postgres table schema
 type clustersTable struct {
-	ClusterID string         `gorm:"primary_key;type:uuid;column:cluster_id"` // PRIMARY KEY
-	Data      types.JSONText `gorm:"type:json;column:data"`
+	ClusterID string `gorm:"primary_key;type:uuid;column:cluster_id"` // PRIMARY KEY
+	Data      string `gorm:"type:json;column:data"`
 }
 
 func (c clustersTable) TableName() string {