chore(PL-2662): separate user and catalog configurations

cmd/joy/build_promote_test.go

@@ -65,7 +65,7 @@ func TestBuildPromote(t *testing.T) {
 			}
 
 			cfg := &config.Config{
-				CatalogDir: catalogDir,
+				User: config.User{CatalogDir: catalogDir},
 			}
 			ctx := config.ToContext(context.Background(), cfg)
 			ctx = catalog.ToContext(ctx, cat)

cmd/joy/links_test.go

@@ -77,23 +77,25 @@ func TestEnvironmentSpecificLink(t *testing.T) {
 
 func executeLinksCommand(t *testing.T, cmd *cobra.Command, args ...string) string {
 	cfg := config.Config{
-		GitHubOrganization: "acme",
-		Templates: config.Templates{
-			Environment: config.EnvironmentTemplates{
-				Links: map[string]string{
-					"cd": "https://argo-cd.acme.com/applications/{{ .Environment.Name }}",
+		Catalog: config.Catalog{
+			GitHubOrganization: "acme",
+			Templates: config.Templates{
+				Environment: config.EnvironmentTemplates{
+					Links: map[string]string{
+						"cd": "https://argo-cd.acme.com/applications/{{ .Environment.Name }}",
+					},
 				},
-			},
-			Project: config.ProjectTemplates{
-				Links: map[string]string{
-					"repo":    "https://github.com/{{ .Repository }}",
-					"actions": "https://github.com/{{ .Repository }}/actions",
-					"pulls":   "https://github.com/{{ .Repository }}/pulls",
+				Project: config.ProjectTemplates{
+					Links: map[string]string{
+						"repo":    "https://github.com/{{ .Repository }}",
+						"actions": "https://github.com/{{ .Repository }}/actions",
+						"pulls":   "https://github.com/{{ .Repository }}/pulls",
+					},
 				},
-			},
-			Release: config.ReleaseTemplates{
-				Links: map[string]string{
-					"tag": "https://github.com/{{ .Repository }}/releases/tag/{{ .GitTag }}",
+				Release: config.ReleaseTemplates{
+					Links: map[string]string{
+						"tag": "https://github.com/{{ .Repository }}/releases/tag/{{ .GitTag }}",
+					},
 				},
 			},
 		},

cmd/joy/main_test.go

@@ -221,6 +221,7 @@ func TestMainRun(t *testing.T) {
 			}
 
 			if tc.expectedError != "" {
+				require.NotNil(t, err)
 				require.Contains(t, err.Error(), tc.expectedError)
 			} else {
 				require.NoError(t, err)

cmd/joy/release_render_test.go

@@ -37,21 +37,25 @@ func TestReleaseRender(t *testing.T) {
 
 	t.Run("render not found", func(t *testing.T) {
 		cfg := &config.Config{
-			CatalogDir: testCatalogPath,
-			Charts: map[string]helm.Chart{
-				"generic": {
-					RepoURL: "file://./testdata/charts",
-					Name:    "base",
-				},
+			User: config.User{
+				CatalogDir: testCatalogPath,
 			},
-			DefaultChartRef: "generic",
-			ValueMapping: &config.ValueMapping{
-				Mappings: map[string]any{
-					"image.tag": "{{ .Release.Spec.Version }}",
+			Catalog: config.Catalog{
+				Charts: map[string]helm.Chart{
+					"generic": {
+						RepoURL: "file://./testdata/charts",
+						Name:    "base",
+					},
+				},
+				DefaultChartRef: "generic",
+				ValueMapping: &config.ValueMapping{
+					Mappings: map[string]any{
+						"image.tag": "{{ .Release.Spec.Version }}",
+					},
 				},
+				GitHubOrganization: "nestoca",
 			},
-			JoyCache:           testCache,
-			GitHubOrganization: "nestoca",
+			JoyCache: testCache,
 		}
 
 		ctx := config.ToContext(context.Background(), cfg)
@@ -73,21 +77,25 @@ func TestReleaseRender(t *testing.T) {
 
 	t.Run("diff", func(t *testing.T) {
 		cfg := &config.Config{
-			CatalogDir: testCatalogPath,
-			Charts: map[string]helm.Chart{
-				"generic": {
-					RepoURL: "file://./testdata/charts",
-					Name:    "base",
-				},
+			User: config.User{
+				CatalogDir: testCatalogPath,
 			},
-			DefaultChartRef: "generic",
-			ValueMapping: &config.ValueMapping{
-				Mappings: map[string]any{
-					"image.tag": "{{ .Release.Spec.Version }}",
+			Catalog: config.Catalog{
+				Charts: map[string]helm.Chart{
+					"generic": {
+						RepoURL: "file://./testdata/charts",
+						Name:    "base",
+					},
 				},
+				DefaultChartRef: "generic",
+				ValueMapping: &config.ValueMapping{
+					Mappings: map[string]any{
+						"image.tag": "{{ .Release.Spec.Version }}",
+					},
+				},
+				GitHubOrganization: "nestoca",
 			},
-			JoyCache:           testCache,
-			GitHubOrganization: "nestoca",
+			JoyCache: testCache,
 		}
 
 		ctx := config.ToContext(context.Background(), cfg)
@@ -129,21 +137,25 @@ func TestReleaseRender(t *testing.T) {
 
 	t.Run("diff of new release", func(t *testing.T) {
 		cfg := &config.Config{
-			CatalogDir: testCatalogPath,
-			Charts: map[string]helm.Chart{
-				"generic": {
-					RepoURL: "file://./testdata/charts",
-					Name:    "base",
-				},
+			User: config.User{
+				CatalogDir: testCatalogPath,
 			},
-			DefaultChartRef: "generic",
-			ValueMapping: &config.ValueMapping{
-				Mappings: map[string]any{
-					"image.tag": "{{ .Release.Spec.Version }}",
+			Catalog: config.Catalog{
+				Charts: map[string]helm.Chart{
+					"generic": {
+						RepoURL: "file://./testdata/charts",
+						Name:    "base",
+					},
 				},
+				DefaultChartRef: "generic",
+				ValueMapping: &config.ValueMapping{
+					Mappings: map[string]any{
+						"image.tag": "{{ .Release.Spec.Version }}",
+					},
+				},
+				GitHubOrganization: "nestoca",
 			},
-			JoyCache:           testCache,
-			GitHubOrganization: "nestoca",
+			JoyCache: testCache,
 		}
 
 		ctx := config.ToContext(context.Background(), cfg)
@@ -185,21 +197,25 @@ func TestReleaseRender(t *testing.T) {
 
 	t.Run("diff of new release inversed refs", func(t *testing.T) {
 		cfg := &config.Config{
-			CatalogDir: testCatalogPath,
-			Charts: map[string]helm.Chart{
-				"generic": {
-					RepoURL: "file://./testdata/charts",
-					Name:    "base",
-				},
+			User: config.User{
+				CatalogDir: testCatalogPath,
 			},
-			DefaultChartRef: "generic",
-			ValueMapping: &config.ValueMapping{
-				Mappings: map[string]any{
-					"image.tag": "{{ .Release.Spec.Version }}",
+			Catalog: config.Catalog{
+				Charts: map[string]helm.Chart{
+					"generic": {
+						RepoURL: "file://./testdata/charts",
+						Name:    "base",
+					},
+				},
+				DefaultChartRef: "generic",
+				ValueMapping: &config.ValueMapping{
+					Mappings: map[string]any{
+						"image.tag": "{{ .Release.Spec.Version }}",
+					},
 				},
+				GitHubOrganization: "nestoca",
 			},
-			JoyCache:           testCache,
-			GitHubOrganization: "nestoca",
+			JoyCache: testCache,
 		}
 
 		ctx := config.ToContext(context.Background(), cfg)
@@ -241,21 +257,25 @@ func TestReleaseRender(t *testing.T) {
 
 	t.Run("diff release not found", func(t *testing.T) {
 		cfg := &config.Config{
-			CatalogDir: testCatalogPath,
-			Charts: map[string]helm.Chart{
-				"generic": {
-					RepoURL: "file://./testdata/charts",
-					Name:    "base",
-				},
+			User: config.User{
+				CatalogDir: testCatalogPath,
 			},
-			DefaultChartRef: "generic",
-			ValueMapping: &config.ValueMapping{
-				Mappings: map[string]any{
-					"image.tag": "{{ .Release.Spec.Version }}",
+			Catalog: config.Catalog{
+				Charts: map[string]helm.Chart{
+					"generic": {
+						RepoURL: "file://./testdata/charts",
+						Name:    "base",
+					},
+				},
+				DefaultChartRef: "generic",
+				ValueMapping: &config.ValueMapping{
+					Mappings: map[string]any{
+						"image.tag": "{{ .Release.Spec.Version }}",
+					},
 				},
+				GitHubOrganization: "nestoca",
 			},
-			JoyCache:           testCache,
-			GitHubOrganization: "nestoca",
+			JoyCache: testCache,
 		}
 
 		ctx := config.ToContext(context.Background(), cfg)

cmd/joy/root_test.go

@@ -56,8 +56,8 @@ Please update joy! >> brew update && brew upgrade joy`,
 	for _, tc := range cases {
 		t.Run(tc.Name, func(t *testing.T) {
 			ctx := config.ToContext(context.Background(), &config.Config{
-				MinVersion: tc.MinVersion,
-				CatalogDir: catalogDir,
+				User:    config.User{CatalogDir: catalogDir},
+				Catalog: config.Catalog{MinVersion: tc.MinVersion},
 			})
 
 			cmd := NewRootCmd(tc.Version, make(PreRunConfigs))

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
 	github.com/davidmdm/x/xerr v0.0.3
 	github.com/davidmdm/x/xfs v0.0.4
+	github.com/go-git/go-git/v5 v5.12.0
 	github.com/go-test/deep v1.1.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
@@ -41,7 +42,6 @@ require (
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.12.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -74,6 +74,6 @@ require (
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -24,6 +24,10 @@ github.com/TwiN/go-color v1.4.1 h1:mqG0P/KBgHKVqmtL5ye7K0/Gr4l6hTksPgTgMk3mUzc=
 github.com/TwiN/go-color v1.4.1/go.mod h1:WcPf/jtiW95WBIsEeY1Lc/b8aaWoiqQpu5cf8WFxu+s=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
@@ -42,16 +46,22 @@ github.com/davidmdm/x/xerr v0.0.3 h1:WwHvo6qzR+eRmHq69Ftgb7PL9832iwy313XpQyJRGtM
 github.com/davidmdm/x/xerr v0.0.3/go.mod h1:nEfdhUc3O/FmGUGLiJp2hHRhBeANkon7PJexIQ1DlAE=
 github.com/davidmdm/x/xfs v0.0.4 h1:7g0ue0Gfs5mrIaV8QGA03hgIPm3tJvHUVdsr6obQTt4=
 github.com/davidmdm/x/xfs v0.0.4/go.mod h1:Mpo/6dE+3m6XNFPqai975wPt/XundxCW4cErGpvUSdc=
+github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
+github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
+github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
 github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
 github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
 github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
@@ -60,8 +70,6 @@ github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
 github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -125,6 +133,8 @@ github.com/nestoca/survey/v2 v2.0.0 h1:orM/TXtBSQJCPiZy9N51hcwH0WzFjQJ7TQKCfMTnG
 github.com/nestoca/survey/v2 v2.0.0/go.mod h1:QfmcQfCRtqsiBpePFhHEW0MY9QH7lSpw3CQinsdC/dc=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
+github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
@@ -137,6 +147,7 @@ github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -148,8 +159,6 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/rogpeppe/go-internal v1.11.1-0.20231026093722-fa6a31e0812c h1:fPpdjePK1atuOg28PXfNSqgwf9I/qD1Hlo39JFwKBXk=
 github.com/rogpeppe/go-internal v1.11.1-0.20231026093722-fa6a31e0812c/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -199,8 +208,6 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -245,8 +252,9 @@ golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
 golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/godo.v2 v2.0.9 h1:jnbznTzXVk0JDKOxN3/LJLDPYJzIl0734y+Z0cEJb4A=
 gopkg.in/godo.v2 v2.0.9/go.mod h1:wgvPPKLsWN0hPIJ4JyxvFGGbIW3fJMSrXhdvSuZ1z/8=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=