removing dependency of ini parse

Author: xibz

aws/external/shared_config.go

@@ -2,13 +2,13 @@ package external
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/go-ini/ini"
+	"github.com/aws/aws-sdk-go-v2/aws/awserr"
+	"github.com/aws/aws-sdk-go-v2/internal/ini"
 )
 
 const (
@@ -199,32 +199,27 @@ func NewSharedConfig(profile string, filenames []string) (SharedConfig, error) {
 
 type sharedConfigFile struct {
 	Filename string
-	IniData  *ini.File
+	IniData  ini.Sections
 }
 
 func loadSharedConfigIniFiles(filenames []string) ([]sharedConfigFile, error) {
 	files := make([]sharedConfigFile, 0, len(filenames))
 
 	errs := SharedConfigNotExistErrors{}
 	for _, filename := range filenames {
-		b, err := ioutil.ReadFile(filename)
-		if err != nil {
-			if os.IsNotExist(err) {
-				errs = append(errs,
-					SharedConfigFileNotExistError{Filename: filename, Err: err},
-				)
-				continue
-			}
-			return nil, SharedConfigLoadError{Filename: filename, Err: err}
-		}
-
-		f, err := ini.Load(b)
-		if err != nil {
+		sections, err := ini.OpenFile(filename)
+		if aerr, ok := err.(awserr.Error); ok && aerr.Code() == ini.ErrCodeUnableToReadFile {
+			errs = append(errs,
+				SharedConfigFileNotExistError{Filename: filename, Err: err},
+			)
+			// Skip files which can't be opened and read for whatever reason
+			continue
+		} else if err != nil {
 			return nil, SharedConfigLoadError{Filename: filename, Err: err}
 		}
 
 		files = append(files, sharedConfigFile{
-			Filename: filename, IniData: f,
+			Filename: filename, IniData: sections,
 		})
 	}
 
@@ -298,47 +293,47 @@ func (c *SharedConfig) setFromIniFiles(profile string, files []sharedConfigFile)
 // if a config file only includes aws_access_key_id but no aws_secret_access_key
 // the aws_access_key_id will be ignored.
 func (c *SharedConfig) setFromIniFile(profile string, file sharedConfigFile) error {
-	section, err := file.IniData.GetSection(profile)
-	if err != nil {
+	section, ok := file.IniData.GetSection(profile)
+	if !ok {
 		// Fallback to to alternate profile name: profile <name>
-		section, err = file.IniData.GetSection(fmt.Sprintf("profile %s", profile))
-		if err != nil {
+		section, ok = file.IniData.GetSection(fmt.Sprintf("profile %s", profile))
+		if !ok {
 			return SharedConfigProfileNotExistError{
 				Filename: file.Filename,
 				Profile:  profile,
-				Err:      err,
+				Err:      nil,
 			}
 		}
 	}
 
 	// Shared Credentials
-	akid := section.Key(accessKeyIDKey).String()
-	secret := section.Key(secretAccessKey).String()
+	akid := section.String(accessKeyIDKey)
+	secret := section.String(secretAccessKey)
 	if len(akid) > 0 && len(secret) > 0 {
 		c.Credentials = aws.Credentials{
 			AccessKeyID:     akid,
 			SecretAccessKey: secret,
-			SessionToken:    section.Key(sessionTokenKey).String(),
+			SessionToken:    section.String(sessionTokenKey),
 			Source:          fmt.Sprintf("SharedConfigCredentials: %s", file.Filename),
 		}
 	}
 
 	// Assume Role
-	roleArn := section.Key(roleArnKey).String()
-	srcProfile := section.Key(sourceProfileKey).String()
+	roleArn := section.String(roleArnKey)
+	srcProfile := section.String(sourceProfileKey)
 	if len(roleArn) > 0 && len(srcProfile) > 0 {
 		c.AssumeRole = AssumeRoleConfig{
 			RoleARN:         roleArn,
-			ExternalID:      section.Key(externalIDKey).String(),
-			MFASerial:       section.Key(mfaSerialKey).String(),
-			RoleSessionName: section.Key(roleSessionNameKey).String(),
+			ExternalID:      section.String(externalIDKey),
+			MFASerial:       section.String(mfaSerialKey),
+			RoleSessionName: section.String(roleSessionNameKey),
 
 			sourceProfile: srcProfile,
 		}
 	}
 
 	// Region
-	if v := section.Key(regionKey).String(); len(v) > 0 {
+	if v := section.String(regionKey); len(v) > 0 {
 		c.Region = v
 	}
 

aws/external/shared_config_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/go-ini/ini"
+	"github.com/aws/aws-sdk-go-v2/internal/ini"
 )
 
 var _ RegionProvider = (*SharedConfig)(nil)
@@ -96,12 +96,12 @@ func TestNewSharedConfig(t *testing.T) {
 					SharedConfigProfileNotExistError{
 						Profile:  "profile_not_exists",
 						Filename: testConfigOtherFilename,
-						Err:      fmt.Errorf("section 'profile profile_not_exists' does not exist"),
+						Err:      nil,
 					},
 					SharedConfigProfileNotExistError{
 						Profile:  "profile_not_exists",
 						Filename: testConfigFilename,
-						Err:      fmt.Errorf("section 'profile profile_not_exists' does not exist"),
+						Err:      nil,
 					},
 				},
 			},
@@ -153,7 +153,7 @@ func TestNewSharedConfig(t *testing.T) {
 			Profile:   "profile_name",
 			Err: SharedConfigLoadError{
 				Filename: filepath.Join("testdata", "shared_config_invalid_ini"),
-				Err:      fmt.Errorf("unclosed section: [profile_nam"),
+				Err:      fmt.Errorf("INIParseError:"),
 			},
 		},
 	}
@@ -180,11 +180,11 @@ func TestNewSharedConfig(t *testing.T) {
 
 func TestLoadSharedConfigFromFile(t *testing.T) {
 	filename := testConfigFilename
-	f, err := ini.Load(filename)
+	sections, err := ini.OpenFile(filename)
 	if err != nil {
 		t.Fatalf("failed to load test config file, %s, %v", filename, err)
 	}
-	iniFile := sharedConfigFile{IniData: f, Filename: filename}
+	iniFile := sharedConfigFile{IniData: sections, Filename: filename}
 
 	cases := []struct {
 		Profile  string
@@ -267,7 +267,7 @@ func TestLoadSharedConfigFromFile(t *testing.T) {
 			Err: SharedConfigProfileNotExistError{
 				Filename: "testdata/shared_config",
 				Profile:  "does_not_exist",
-				Err:      fmt.Errorf("section 'profile does_not_exist' does not exist"),
+				Err:      nil,
 			},
 		},
 	}
@@ -419,7 +419,7 @@ func TestLoadSharedConfig(t *testing.T) {
 				testConfigOtherFilename, testConfigFilename,
 			},
 			LoadFn: LoadSharedConfig,
-			Err:    "section 'profile profile_not_exists' does not exist",
+			Err:    "failed to get shared config profile",
 		},
 		{
 			Configs: Configs{
@@ -429,7 +429,7 @@ func TestLoadSharedConfig(t *testing.T) {
 				testConfigOtherFilename, testConfigFilename,
 			},
 			LoadFn: LoadSharedConfigIgnoreNotExist,
-			Err:    "section 'profile profile_not_exists' does not exist",
+			Err:    "failed to get shared config profile",
 		},
 	}
 

internal/ini/.DS_Store

@@ -0,0 +1,120 @@
+package ini
+
+// ASTKind represents different states in the parse table
+// and the type of AST that is being constructed
+type ASTKind int
+
+// ASTKind* is used in the parse table to transition between
+// the different states
+const (
+	ASTKindNone = ASTKind(iota)
+	ASTKindStart
+	ASTKindExpr
+	ASTKindEqualExpr
+	ASTKindStatement
+	ASTKindSkipStatement
+	ASTKindExprStatement
+	ASTKindSectionStatement
+	ASTKindNestedSectionStatement
+	ASTKindCompletedNestedSectionStatement
+	ASTKindCommentStatement
+	ASTKindCompletedSectionStatement
+)
+
+func (k ASTKind) String() string {
+	switch k {
+	case ASTKindNone:
+		return "none"
+	case ASTKindStart:
+		return "start"
+	case ASTKindExpr:
+		return "expr"
+	case ASTKindStatement:
+		return "stmt"
+	case ASTKindSectionStatement:
+		return "section_stmt"
+	case ASTKindExprStatement:
+		return "expr_stmt"
+	case ASTKindCommentStatement:
+		return "comment"
+	case ASTKindNestedSectionStatement:
+		return "nested_section_stmt"
+	case ASTKindCompletedSectionStatement:
+		return "completed_stmt"
+	case ASTKindSkipStatement:
+		return "skip"
+	default:
+		return ""
+	}
+}
+
+// AST interface allows us to determine what kind of node we
+// are on and casting may not need to be necessary.
+//
+// The root is always the first node in Children
+type AST struct {
+	Kind      ASTKind
+	Root      Token
+	RootToken bool
+	Children  []AST
+}
+
+func newAST(kind ASTKind, root AST, children ...AST) AST {
+	return AST{
+		Kind:     kind,
+		Children: append([]AST{root}, children...),
+	}
+}
+
+func newASTWithRootToken(kind ASTKind, root Token, children ...AST) AST {
+	return AST{
+		Kind:      kind,
+		Root:      root,
+		RootToken: true,
+		Children:  children,
+	}
+}
+
+// AppendChild will append to the list of children an AST has.
+func (a *AST) AppendChild(child AST) {
+	a.Children = append(a.Children, child)
+}
+
+// GetRoot will return the root AST which can be the first entry
+// in the children list or a token.
+func (a *AST) GetRoot() AST {
+	if a.RootToken {
+		return *a
+	}
+
+	if len(a.Children) == 0 {
+		return AST{}
+	}
+
+	return a.Children[0]
+}
+
+// GetChildren will return the current AST's list of children
+func (a *AST) GetChildren() []AST {
+	if len(a.Children) == 0 {
+		return []AST{}
+	}
+
+	if a.RootToken {
+		return a.Children
+	}
+
+	return a.Children[1:]
+}
+
+// SetChildren will set and override all children of the AST.
+func (a *AST) SetChildren(children []AST) {
+	if a.RootToken {
+		a.Children = children
+	} else {
+		a.Children = append(a.Children[:1], children...)
+	}
+}
+
+// Start is used to indicate the starting state of the parse table.
+var Start = newAST(ASTKindStart, AST{})

internal/ini/ast.go

@@ -0,0 +1,40 @@
+package ini
+
+import (
+	oldini "github.com/go-ini/ini"
+	"testing"
+)
+
+const (
+	section = `[default]
+region = us-west-2
+credential_source = Ec2InstanceMetadata
+s3 =
+	foo=bar
+	bar=baz
+output = json
+
+[assumerole]
+output = json
+region = us-west-2
+`
+)
+
+func BenchmarkINIParser(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		ParseBytes([]byte(section))
+	}
+}
+
+func BenchmarkGoINIParser(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		oldini.Load([]byte(section))
+	}
+}
+
+func BenchmarkTokenize(b *testing.B) {
+	lexer := iniLexer{}
+	for i := 0; i < b.N; i++ {
+		lexer.tokenize([]byte(section))
+	}
+}

internal/ini/bench_test.go

@@ -0,0 +1,11 @@
+package ini
+
+var commaRunes = []rune(",")
+
+func isComma(b rune) bool {
+	return b == ','
+}
+
+func newCommaToken() Token {
+	return newToken(TokenComma, commaRunes, NoneType)
+}