ref(*): rename CheckInAndSetCluster to UpsertCluster (#133)

* ref(*): rename CheckInAndSetCluster to UpsertCluster

also adds a target to the Makefile to run tests directly on the host, instead of in a container

Author: arschles

Makefile

@@ -46,6 +46,9 @@ build:
 test:
 	${DEV_ENV_CMD} sh -c 'go test -tags testonly $$(glide nv)'
 
+test-native:
+	go test -tags=testonly $$(glide nv)
+
 docker-build:
 	docker build --rm -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}

data/cluster.go

@@ -1,7 +1,6 @@
 package data
 
 import (
-	"database/sql"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -88,9 +87,8 @@ func upsertCluster(db *gorm.DB, id string, cluster ClusterStateful) (ClusterStat
 	return retCluster, nil
 }
 
-// CheckInAndSetCluster creates or updates the cluster with the given ID.
-// TODO: rename this function to better reflect what it does (https://github.com/deis/workflow-manager-api/issues/128)
-func CheckInAndSetCluster(db *gorm.DB, id string, cluster ClusterStateful) (ClusterStateful, error) {
+// UpsertCluster creates or updates the cluster with the given ID.
+func UpsertCluster(db *gorm.DB, id string, cluster ClusterStateful) (ClusterStateful, error) {
 	txn := db.Begin()
 	if txn.Error != nil {
 		return ClusterStateful{}, txErr{orig: nil, err: txn.Error, op: "begin"}

data/cluster_test.go

@@ -50,14 +50,14 @@ func TestClusterRoundTrip(t *testing.T) {
 	assert.Equal(t, cluster, ClusterStateful{}, "returned cluster")
 	expectedCluster := testCluster()
 	// the first time we invoke .CheckInAndSetCluster() it will create a new record
-	newCluster, err := CheckInAndSetCluster(sqliteDB, clusterID, expectedCluster)
+	newCluster, err := UpsertCluster(sqliteDB, clusterID, expectedCluster)
 	assert.NoErr(t, err)
 	assert.Equal(t, newCluster.ID, expectedCluster.ID, "cluster ID property")
 	assert.Equal(t, newCluster.Components[0].Component.Description, expectedCluster.Components[0].Component.Description, "cluster component description property")
 	// modify the cluster object
 	expectedCluster.Components[0].Component.Description = "new description"
 	// the next time we invoke .CheckInAndSetCluster() it should update the existing record we just created
-	updatedCluster, err := CheckInAndSetCluster(sqliteDB, clusterID, expectedCluster)
+	updatedCluster, err := UpsertCluster(sqliteDB, clusterID, expectedCluster)
 	assert.NoErr(t, err)
 	assert.Equal(t, updatedCluster.Components[0].Component.Description, expectedCluster.Components[0].Component.Description, "cluster component description property")
 	getCluster, err := GetCluster(sqliteDB, clusterID)

filter_by_age_test.go

@@ -46,7 +46,7 @@ func TestFilterByClusterAge(t *testing.T) {
 	cluster.ID = uuid.New()
 	srv := newServer(memDB)
 	defer srv.Close()
-	_, setErr := data.CheckInAndSetCluster(memDB, cluster.ID, cluster)
+	_, setErr := data.UpsertCluster(memDB, cluster.ID, cluster)
 	assert.NoErr(t, setErr)
 	assert.NoErr(t, data.CheckInCluster(memDB, cluster.ID, time.Now(), cluster))
 	queryPairsMap := map[string]string{

handlers/handlers.go

@@ -54,7 +54,7 @@ func ClusterCheckin(db *gorm.DB) http.Handler {
 			return
 		}
 		var result data.ClusterStateful
-		result, err = data.CheckInAndSetCluster(db, id, cluster)
+		result, err = data.UpsertCluster(db, id, cluster)
 		if err != nil {
 			log.Printf("data.SetCluster error (%s)", err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

server_test.go

@@ -201,7 +201,7 @@ func TestGetClusterByID(t *testing.T) {
 	cluster := data.ClusterStateful{}
 	cluster.ID = clusterID
 	cluster.Components = nil
-	newCluster, err := data.CheckInAndSetCluster(memDB, clusterID, cluster)
+	newCluster, err := data.UpsertCluster(memDB, clusterID, cluster)
 	assert.NoErr(t, err)
 	resp, err := httpGet(srv, urlPath(1, "clusters", clusterID))
 	assert.NoErr(t, err)