From a1720db58ea633068db2a9eb9e2d84adacf386b7 Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zach@dactiv.llc>
Date: Wed, 4 Nov 2020 21:18:02 -0800
Subject: [PATCH] Fix regression creating packs (#17)

This is another error introduced in
https://github.com/kolide/fleet/pull/2327 we did not catch previously
due to insufficient unit test coverage. Test is now added.
---
 server/datastore/datastore_packs_test.go | 14 ++++++++++++++
 server/datastore/datastore_test.go       |  1 +
 server/datastore/mysql/packs.go          |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/server/datastore/datastore_packs_test.go b/server/datastore/datastore_packs_test.go
index 4cfaec5852..ebb2261489 100644
--- a/server/datastore/datastore_packs_test.go
+++ b/server/datastore/datastore_packs_test.go
@@ -25,6 +25,20 @@ func testDeletePack(t *testing.T, ds kolide.Datastore) {
 	assert.NotNil(t, err)
 }
 
+func testNewPack(t *testing.T, ds kolide.Datastore) {
+	pack := &kolide.Pack{
+		Name: "foo",
+	}
+
+	pack, err := ds.NewPack(pack)
+	require.NoError(t, err)
+	assert.NotEqual(t, uint(0), pack.ID)
+
+	pack, err = ds.Pack(pack.ID)
+	require.NoError(t, err)
+	assert.Equal(t, "foo", pack.Name)
+}
+
 func testGetPackByName(t *testing.T, ds kolide.Datastore) {
 	pack := test.NewPack(t, ds, "foo")
 	assert.NotEqual(t, uint(0), pack.ID)
diff --git a/server/datastore/datastore_test.go b/server/datastore/datastore_test.go
index 375e2d1891..5552ad4c6f 100644
--- a/server/datastore/datastore_test.go
+++ b/server/datastore/datastore_test.go
@@ -23,6 +23,7 @@ var testFunctions = [...]func(*testing.T, kolide.Datastore){
 	testSaveQuery,
 	testListQuery,
 	testDeletePack,
+	testNewPack,
 	testEnrollHost,
 	testAuthenticateHost,
 	testAuthenticateHostCaseSensitive,
diff --git a/server/datastore/mysql/packs.go b/server/datastore/mysql/packs.go
index 0c06f5abe8..83e03e67e2 100644
--- a/server/datastore/mysql/packs.go
+++ b/server/datastore/mysql/packs.go
@@ -223,7 +223,7 @@ func (d *Datastore) NewPack(pack *kolide.Pack, opts ...kolide.OptionalArg) (*kol
 	query := `
 	INSERT INTO packs
 		(name, description, platform, disabled)
-		VALUES ( ?, ?, ?, ?, ?)
+		VALUES ( ?, ?, ?, ? )
 	`
 
 	result, err := db.Exec(query, pack.Name, pack.Description, pack.Platform, pack.Disabled)