imported configfile struct instead of redefining, updated test

runfinch · Jun 29, 2023 · e9a9036 · e9a9036
1 parent e6bc698
commit e9a9036
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/pkg/dependency/credhelper/cred_helper_binary.go b/pkg/dependency/credhelper/cred_helper_binary.go
@@ -17,36 +17,10 @@ import (
 	"github.com/runfinch/finch/pkg/dependency"
 	"github.com/runfinch/finch/pkg/flog"
 	"github.com/runfinch/finch/pkg/path"
+
+	"github.com/docker/cli/cli/config/configfile"
 )
 
-// ConfigFile is taken from https://github.com/docker/cli/blob/master/cli/config/configfile/file.go
-type ConfigFile struct {
-	AuthConfigs          map[string]interface{}       `json:"auths,omitempty"`
-	HTTPHeaders          map[string]string            `json:"HttpHeaders,omitempty"`
-	PsFormat             string                       `json:"psFormat,omitempty"`
-	ImagesFormat         string                       `json:"imagesFormat,omitempty"`
-	NetworksFormat       string                       `json:"networksFormat,omitempty"`
-	PluginsFormat        string                       `json:"pluginsFormat,omitempty"`
-	VolumesFormat        string                       `json:"volumesFormat,omitempty"`
-	StatsFormat          string                       `json:"statsFormat,omitempty"`
-	DetachKeys           string                       `json:"detachKeys,omitempty"`
-	CredentialsStore     string                       `json:"credsStore,omitempty"`
-	CredentialHelpers    map[string]string            `json:"credHelpers,omitempty"`
-	Filename             string                       `json:"-"` // Note: for internal use only
-	ServiceInspectFormat string                       `json:"serviceInspectFormat,omitempty"`
-	ServicesFormat       string                       `json:"servicesFormat,omitempty"`
-	TasksFormat          string                       `json:"tasksFormat,omitempty"`
-	SecretFormat         string                       `json:"secretFormat,omitempty"`
-	ConfigFormat         string                       `json:"configFormat,omitempty"`
-	NodesFormat          string                       `json:"nodesFormat,omitempty"`
-	PruneFilters         []string                     `json:"pruneFilters,omitempty"`
-	Proxies              map[string]interface{}       `json:"proxies,omitempty"`
-	Experimental         string                       `json:"experimental,omitempty"`
-	CurrentContext       string                       `json:"currentContext,omitempty"`
-	CLIPluginsExtraDirs  []string                     `json:"cliPluginsExtraDirs,omitempty"`
-	Plugins              map[string]map[string]string `json:"plugins,omitempty"`
-	Aliases              map[string]string            `json:"aliases,omitempty"`
-}
 type binaries struct {
 	fp         path.Finch
 	fs         afero.Fs
@@ -101,7 +75,7 @@ func updateConfigFile(bin *binaries) error {
 		if err != nil {
 			return err
 		}
-		var cfg ConfigFile
+		var cfg configfile.ConfigFile
 		err = json.Unmarshal(bytes, &cfg)
 		if err != nil {
 			return err

diff --git a/pkg/dependency/credhelper/cred_helper_binary_test.go b/pkg/dependency/credhelper/cred_helper_binary_test.go
@@ -1,8 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// Ensures that the binaries required for networking are installed in a privileged location.
-// More information here: https://github.com/lima-vm/socket_vmnet
 package credhelper
 
 import (
@@ -105,7 +103,7 @@ func Test_updateConfigFile(t *testing.T) {
 			postRunCheck: func(t *testing.T, fs afero.Fs) {
 				fileBytes, err := afero.ReadFile(fs, "mock_prefix/.finch/config.json")
 				require.NoError(t, err)
-				JSONstr := fmt.Sprintf("{\"credsStore\":\"%s\"}", "binary")
+				JSONstr := fmt.Sprintf("{\"auths\":null,\"credsStore\":\"%s\"}", "binary")
 				fileData := []byte(JSONstr)
 				assert.Equal(t, fileData, fileBytes)