From a84d6fa9a281c7d64607baebd8cdbaa7cab4110d Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Thu, 18 Nov 2021 21:30:09 -0500 Subject: [PATCH] Remove yaml.v3's version lock This will cause whitespace changes for manifestYaml* native functions --- go.mod | 4 ---- go.sum | 4 +++- pkg/jsonnet/native/funcs_test.go | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index c612ae73d..7565b92ac 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,6 @@ module github.com/grafana/tanka go 1.17 -// Pin gopkg.in/yaml.v3 -// yaml.v3 should be bumped with care. The new versions change all list indents -replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - require ( github.com/Masterminds/semver v1.5.0 github.com/Masterminds/sprig/v3 v3.2.2 diff --git a/go.sum b/go.sum index 8bb6d2728..106012e91 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,10 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk= diff --git a/pkg/jsonnet/native/funcs_test.go b/pkg/jsonnet/native/funcs_test.go index 71a9293da..5cb8b70ed 100644 --- a/pkg/jsonnet/native/funcs_test.go +++ b/pkg/jsonnet/native/funcs_test.go @@ -114,9 +114,9 @@ func TestManifestYAMLFromJSONList(t *testing.T) { assert.Empty(t, callerr) assert.Equal(t, `list: - - a - - b - - c + - a + - b + - c `, ret) assert.Empty(t, err) }