resolve comments

Author: Aishwarya-Lad

docker.go

@@ -158,36 +158,30 @@ func (p Plugin) Exec() error {
 		os.MkdirAll(dockerHome, 0600)
 
 		path := filepath.Join(dockerHome, "config.json")
-		file, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
-		if err != nil {
-			return fmt.Errorf("Error writing config.json: %s", err)
-		}
-		_, err = file.Write([]byte(p.Login.Config))
-		fmt.Println("Writing p.Login.Config")
-
+		err := os.WriteFile(path, []byte(p.Login.Config), 0600)
 		if err != nil {
 			return fmt.Errorf("Error writing config.json: %s", err)
 		}
-		defer file.Close()
+		file.Close()
 	}
+	
 	// add base image docker credentials to the existing config file, else create new
 	if p.BaseImagePassword != "" {
 		json, err := setDockerAuth(p.Login.Username, p.Login.Password, p.Login.Registry,
 			p.BaseImageUsername, p.BaseImagePassword, p.BaseImageRegistry)
 		if err != nil {
 			return fmt.Errorf("Failed to set authentication in docker config %s", err)
 		}
-		if json != nil {
-			path := filepath.Join(dockerHome, "config.json")
-			file, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
-			if err != nil {
-				return fmt.Errorf("Error opening config.json: %s", err)
-			}
-			defer file.Close()
-			_, err = file.Write(json)
-			if err != nil {
-				return fmt.Errorf("Error writing config.json: %s", err)
-			}
+		os.MkdirAll(dockerHome, 0600)
+		path := filepath.Join(dockerHome, "config.json")
+		file, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
+		if err != nil {
+			return fmt.Errorf("Error opening config.json: %s", err)
+		}
+		defer file.Close()
+		_, err = file.Write(json)
+		if err != nil {
+			return fmt.Errorf("Error writing config.json: %s", err)
 		}
 	}
 
@@ -307,7 +301,7 @@ func setDockerAuth(username, password, registry, baseImageUsername,
 	var credentials []docker.RegistryCredentials
 	// add only docker registry to the config
 	dockerConfig := docker.NewConfig()
-	if password != "" && strings.Contains(registry, "docker") {
+	if password != "" {
 		pushToRegistryCreds := docker.RegistryCredentials{
 			Registry: registry,
 			Username: username,

internal/docker/config.go

@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
-	"os"
 	"strings"
 )
 
@@ -71,19 +69,3 @@ func (c *Config) CreateDockerConfigJson(credentials []RegistryCredentials) ([]by
 
 	return jsonBytes, nil
 }
-
-func WriteDockerConfig(data []byte, path string) (string error) {
-	err := os.MkdirAll(path, 0600)
-	if err != nil {
-		if !os.IsExist(err) {
-			return errors.New("failed to create %s directory")
-		}
-	}
-
-	filePath := path + "/config.json"
-	err = ioutil.WriteFile(filePath, data, 0644)
-	if err != nil {
-		return errors.New("failed to create docker config file at %s")
-	}
-	return nil
-}