Merge pull request #474 from cloudfoundry-incubator/jandubois-go1.12

Update tests to Go 1.12
cloudfoundry-incubator · Mar 5, 2019 · 65aa6e5 · 65aa6e5
2 parents 859afdf + 8a9ed8f
commit 65aa6e5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ agent.
 ## Getting fissile
 
 ### Prerequisites
-Building fissile needs [Go 1.9] or higher and [Docker].
+Building fissile needs [Go 1.12] or higher and [Docker].
 
-[Go 1.9]: https://golang.org/doc/install
+[Go 1.12]: https://golang.org/doc/install
 [Docker]: https://www.docker.com
 
 ### Build procedure

diff --git a/kube/deployment_test.go b/kube/deployment_test.go
@@ -103,7 +103,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :11:17: executing "" at <fail "some_group mus...>: error calling fail: some_group must have at least 1 instances`)
+			`template: :11:17: executing "" at <fail "some_group must have at least 1 instances">: error calling fail: some_group must have at least 1 instances`)
 	})
 
 	t.Run("Configured, not enough replicas", func(t *testing.T) {
@@ -118,7 +118,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :11:17: executing "" at <fail "some_group mus...>: error calling fail: some_group must have at least 1 instances`)
+			`template: :11:17: executing "" at <fail "some_group must have at least 1 instances">: error calling fail: some_group must have at least 1 instances`)
 	})
 
 	t.Run("Configured, too many replicas", func(t *testing.T) {
@@ -133,7 +133,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :7:17: executing "" at <fail "some_group can...>: error calling fail: some_group cannot have more than 1 instances`)
+			`template: :7:17: executing "" at <fail "some_group cannot have more than 1 instances">: error calling fail: some_group cannot have more than 1 instances`)
 	})
 
 	t.Run("Configured, bad key sizing.HA", func(t *testing.T) {
@@ -144,7 +144,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :15:21: executing "" at <fail "Bad use of mov...>: error calling fail: Bad use of moved variable sizing.HA. The new name to use is config.HA`)
+			`template: :15:21: executing "" at <fail "Bad use of moved variable sizing.HA. The new name to use is config.HA">: error calling fail: Bad use of moved variable sizing.HA. The new name to use is config.HA`)
 	})
 
 	t.Run("Configured, bad key sizing.memory.limits", func(t *testing.T) {
@@ -155,7 +155,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :27:70: executing "" at <fail "Bad use of mov...>: error calling fail: Bad use of moved variable sizing.memory.limits. The new name to use is config.memory.limits`)
+			`template: :27:70: executing "" at <fail "Bad use of moved variable sizing.memory.limits. The new name to use is config.memory.limits">: error calling fail: Bad use of moved variable sizing.memory.limits. The new name to use is config.memory.limits`)
 	})
 
 	t.Run("Configured, bad key sizing.memory.requests", func(t *testing.T) {
@@ -166,7 +166,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :31:74: executing "" at <fail "Bad use of mov...>: error calling fail: Bad use of moved variable sizing.memory.requests. The new name to use is config.memory.requests`)
+			`template: :31:74: executing "" at <fail "Bad use of moved variable sizing.memory.requests. The new name to use is config.memory.requests">: error calling fail: Bad use of moved variable sizing.memory.requests. The new name to use is config.memory.requests`)
 	})
 
 	t.Run("Configured, bad key sizing.cpu.limits", func(t *testing.T) {
@@ -177,7 +177,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :19:64: executing "" at <fail "Bad use of mov...>: error calling fail: Bad use of moved variable sizing.cpu.limits. The new name to use is config.cpu.limits`)
+			`template: :19:64: executing "" at <fail "Bad use of moved variable sizing.cpu.limits. The new name to use is config.cpu.limits">: error calling fail: Bad use of moved variable sizing.cpu.limits. The new name to use is config.cpu.limits`)
 	})
 
 	t.Run("Configured, bad key sizing.cpu.requests", func(t *testing.T) {
@@ -188,7 +188,7 @@ func TestNewDeploymentHelm(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :23:68: executing "" at <fail "Bad use of mov...>: error calling fail: Bad use of moved variable sizing.cpu.requests. The new name to use is config.cpu.requests`)
+			`template: :23:68: executing "" at <fail "Bad use of moved variable sizing.cpu.requests. The new name to use is config.cpu.requests">: error calling fail: Bad use of moved variable sizing.cpu.requests. The new name to use is config.cpu.requests`)
 	})
 
 	t.Run("Configured", func(t *testing.T) {
@@ -600,7 +600,7 @@ func TestNewDeploymentWithEmptyDirVolume(t *testing.T) {
 		}
 		_, err := RenderNode(deployment, config)
 		assert.EqualError(err,
-			`template: :11:17: executing "" at <fail "some_group mus...>: error calling fail: some_group must have at least 1 instances`)
+			`template: :11:17: executing "" at <fail "some_group must have at least 1 instances">: error calling fail: some_group must have at least 1 instances`)
 	})
 
 	t.Run("Configured", func(t *testing.T) {

diff --git a/kube/pod_test.go b/kube/pod_test.go
@@ -1000,7 +1000,7 @@ func TestPodGetEnvVarsFromConfigNonSecretHelmUserRequired(t *testing.T) {
 		t.Parallel()
 		_, err := RenderNode(ev, nil)
 		assert.EqualError(err,
-			`template: :7:219: executing "" at <fail "env.SOMETHING ...>: error calling fail: env.SOMETHING has not been set`)
+			`template: :7:219: executing "" at <fail "env.SOMETHING has not been set">: error calling fail: env.SOMETHING has not been set`)
 	})
 
 	t.Run("Undefined", func(t *testing.T) {
@@ -1010,7 +1010,7 @@ func TestPodGetEnvVarsFromConfigNonSecretHelmUserRequired(t *testing.T) {
 		}
 		_, err := RenderNode(ev, config)
 		assert.EqualError(err,
-			`template: :7:219: executing "" at <fail "env.SOMETHING ...>: error calling fail: env.SOMETHING has not been set`)
+			`template: :7:219: executing "" at <fail "env.SOMETHING has not been set">: error calling fail: env.SOMETHING has not been set`)
 	})
 
 	t.Run("Present", func(t *testing.T) {

diff --git a/kube/secret_test.go b/kube/secret_test.go
@@ -215,7 +215,7 @@ func TestMakeSecretsHelm(t *testing.T) {
 
 		_, err := RenderNode(secret, nil)
 		assert.EqualError(err,
-			`template: :6:237: executing "" at <fail "secrets.const ...>: error calling fail: secrets.const has not been set`)
+			`template: :6:237: executing "" at <fail "secrets.const has not been set">: error calling fail: secrets.const has not been set`)
 	})
 
 	t.Run("Undefined", func(t *testing.T) {
@@ -231,7 +231,7 @@ func TestMakeSecretsHelm(t *testing.T) {
 
 		_, err := RenderNode(secret, config)
 		assert.EqualError(err,
-			`template: :6:237: executing "" at <fail "secrets.const ...>: error calling fail: secrets.const has not been set`)
+			`template: :6:237: executing "" at <fail "secrets.const has not been set">: error calling fail: secrets.const has not been set`)
 	})
 
 	t.Run("Present", func(t *testing.T) {