adding error code for unable to read files

Author: xibz

aws/session/internal/ini/ini.go

@@ -3,14 +3,16 @@ package ini
 import (
 	"io"
 	"os"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 // OpenFile takes a path to a given file, and will open  and parse
 // that file.
 func OpenFile(path string) (Sections, error) {
 	f, err := os.Open(path)
 	if err != nil {
-		return nil, err
+		return nil, awserr.New(ErrCodeUnableToReadFile, "unable to open file", err)
 	}
 	defer f.Close()
 

aws/session/internal/ini/ini_lexer.go

@@ -3,6 +3,14 @@ package ini
 import (
 	"io"
 	"io/ioutil"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+const (
+	// ErrCodeUnableToReadFile is used when a file is failed to be
+	// opened or read from.
+	ErrCodeUnableToReadFile = "FailedRead"
 )
 
 // TokenType represents the various different tokens types
@@ -61,7 +69,7 @@ type Token interface {
 func (l *iniLexer) Tokenize(r io.Reader) ([]Token, error) {
 	b, err := ioutil.ReadAll(r)
 	if err != nil {
-		return nil, err
+		return nil, awserr.New(ErrCodeUnableToReadFile, "unable to read file", err)
 	}
 
 	var tok Token

aws/session/internal/ini/newline_token.go

@@ -25,7 +25,7 @@ func isNewline(b []byte) bool {
 
 func newNewlineToken(b []byte) (newlineToken, int, error) {
 	value := string(b[0])
-	if isNewline(b[1:]) {
+	if value[0] != '\n' && isNewline(b[1:]) {
 		value += string(b[1])
 	}
 

aws/session/shared_config.go

@@ -2,7 +2,6 @@ package session
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -106,18 +105,16 @@ func loadSharedConfigIniFiles(filenames []string) ([]sharedConfigFile, error) {
 	files := make([]sharedConfigFile, 0, len(filenames))
 
 	for _, filename := range filenames {
-		f, err := os.Open(filename)
-		if err != nil {
+		sections, err := ini.OpenFile(filename)
+		if aerr, ok := err.(awserr.Error); ok && aerr.Code() == ini.ErrCodeUnableToReadFile {
+			// Skip files which can't be opened and read for whatever reason
 			continue
-		}
-
-		tables, err := ini.Parse(f)
-		if err != nil {
+		} else if err != nil {
 			return nil, SharedConfigLoadError{Filename: filename, Err: err}
 		}
 
 		files = append(files, sharedConfigFile{
-			Filename: filename, IniData: tables,
+			Filename: filename, IniData: sections,
 		})
 	}