Unpin BurntSushi/toml now that 1.2.1 is out

- BurntSushi/toml#360 is closed in 1.2.1 Signed-off-by: Natalie Arellano <narellano@vmware.com>
buildpacks · Nov 9, 2022 · 4b57756 · 4b57756
1 parent 0b6589a
commit 4b57756
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/buildpack/build_test.go b/buildpack/build_test.go
@@ -789,7 +789,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 								filepath.Join(appDir, "launch-A-v1.toml"),
 							)
 							_, err := executor.Build(descriptor, inputs, logger)
-							h.AssertError(t, err, "toml: incompatible types: TOML key \"processes.command\" has type string; destination has type slice")
+							h.AssertError(t, err, `toml: line 2 (last key "processes.command"): incompatible types: TOML value has type string; destination has type slice`)
 						})
 
 						it("preserves command args", func() {
@@ -1347,7 +1347,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 							filepath.Join(appDir, "launch-A-v1.toml"),
 						)
 						_, err := executor.Build(descriptor, inputs, logger)
-						h.AssertError(t, err, "toml: incompatible types: TOML key \"processes.command\" has type []interface {}; destination has type string")
+						h.AssertError(t, err, `toml: line 2 (last key "processes.command"): incompatible types: TOML value has type []interface {}; destination has type string`)
 					})
 				})
 			})

diff --git a/go.mod b/go.mod
@@ -125,9 +125,6 @@ require (
 
 go 1.18
 
-// Pin BurntSushi/toml due to https://github.com/BurntSushi/toml/issues/360
-replace github.com/BurntSushi/toml => github.com/BurntSushi/toml v1.1.0
-
 // Ensure we only pull in the latest version of containerd
 replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.9
 

diff --git a/go.sum b/go.sum
@@ -126,8 +126,9 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
-github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
+github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
 github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=