[WIP] Fixes for #134, #135, and some more tests (#136)

* fixed up delete tests * added generate test case against a template * setting all properties to interface{} as a template can no only be validated by cfn itself * removed fmt
KablamoOSS · Nov 19, 2018 · 47f1d46 · 47f1d46
1 parent 6119755
commit 47f1d46
Show file tree

Hide file tree

Showing 740 changed files with 40,833 additions and 25,092 deletions.
diff --git a/generate/README.md b/generate/README.md
@@ -1,9 +1,3 @@
 #generate
 
-Auto generated cloudformation parsers
-
-##Installation:
-
-```sh
-go get github.com/KablamoOSS/kombustion/generate
-```
+To generate new parsers,run `go generate` from the root directory.
diff --git a/generate/generate.go b/generate/generate.go
@@ -83,11 +83,6 @@ func buildPropertyYaml(obj string, cfnType CfnType) string {
 			propertyStrings = append(propertyStrings, str)
 		}
 	}
-	for _, property := range sortProperties(cfnType.Properties) {
-		if str := validatorYaml(obj, property.name, property.CfnProperty); len(str) > 0 {
-			validatorStrings = append(validatorStrings, str)
-		}
-	}
 
 	buf := bytes.NewBufferString("")
 	t := template.Must(template.New("").Parse(propertyTemplate))
@@ -111,11 +106,6 @@ func buildResourceYaml(obj string, cfnType CfnType) string {
 			propertyStrings = append(propertyStrings, str)
 		}
 	}
-	for _, property := range sortProperties(cfnType.Properties) {
-		if str := validatorYaml(obj, property.name, property.CfnProperty); len(str) > 0 {
-			validatorStrings = append(validatorStrings, str)
-		}
-	}
 
 	buf := bytes.NewBufferString("")
 	t := template.Must(template.New("").Parse(resourceTemplate))

diff --git a/generate/source/Canada.json b/generate/source/Canada.json
diff --git a/generate/source/Frankfurt.json b/generate/source/Frankfurt.json
diff --git a/generate/source/Ireland.json b/generate/source/Ireland.json
diff --git a/generate/source/London.json b/generate/source/London.json
diff --git a/generate/source/Mumbai.json b/generate/source/Mumbai.json
diff --git a/generate/source/North California.json b/generate/source/North California.json
diff --git a/generate/source/North Virginia.json b/generate/source/North Virginia.json
diff --git a/generate/source/Ohio.json b/generate/source/Ohio.json
diff --git a/generate/source/Oregon.json b/generate/source/Oregon.json
diff --git a/generate/source/Sao Paulo.json b/generate/source/Sao Paulo.json
diff --git a/generate/source/Seoul.json b/generate/source/Seoul.json
diff --git a/generate/source/Singapore.json b/generate/source/Singapore.json
diff --git a/generate/source/Sydney.json b/generate/source/Sydney.json
diff --git a/generate/source/Tokyo.json b/generate/source/Tokyo.json
diff --git a/generate/templates.go b/generate/templates.go
diff --git a/generate/util.go b/generate/util.go
@@ -1,13 +1,11 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"sort"
 	"strings"
-	"text/template"
 )
 
 func checkError(err error) {
@@ -21,30 +19,30 @@ func valueStringYaml(propPackage, obj, name string, property CfnProperty) string
 	if property.Required {
 		omitempty = ""
 	}
-	if len(property.PrimitiveType) > 0 {
-		return name + " interface{} `yaml:" + `"` + name + omitempty + `"` + "`"
-	} else if len(property.Type) > 0 && property.Type != "List" && property.Type != "Map" {
-		subPropertyName := propertyNameFromResourceType(obj, property.Type)
-		return name + " *" + propPackage + subPropertyName + " `yaml:" + `"` + name + omitempty + `"` + "`"
-	}
+	// if len(property.PrimitiveType) > 0 {
+	// return name + " interface{} `yaml:" + `"` + name + omitempty + `"` + "`"
+	// } else if len(property.Type) > 0 && property.Type != "List" && property.Type != "Map" {
+	// 	subPropertyName := propertyNameFromResourceType(obj, property.Type)
+	// 	return name + " *" + propPackage + subPropertyName + " `yaml:" + `"` + name + omitempty + `"` + "`"
+	// }
 	return name + " interface{} `yaml:" + `"` + name + omitempty + `"` + "`"
 }
 
-func validatorYaml(obj, name string, property CfnProperty) string {
-	if !property.Required {
-		return ""
-	}
-
-	buf := bytes.NewBufferString("")
-	t := template.Must(template.New("").Parse(validatorTemplate))
-	err := t.Execute(buf, map[string]interface{}{
-		"Name":          name,
-		"PrimitiveType": len(property.PrimitiveType) > 0,
-		"ListMapType":   len(property.Type) > 0 && property.Type != "List" && property.Type != "Map",
-	})
-	checkError(err)
-	return buf.String()
-}
+// func validatorYaml(obj, name string, property CfnProperty) string {
+// 	if !property.Required {
+// 		return ""
+// 	}
+
+// 	buf := bytes.NewBufferString("")
+// 	t := template.Must(template.New("").Parse(validatorTemplate))
+// 	err := t.Execute(buf, map[string]interface{}{
+// 		"Name":          name,
+// 		"PrimitiveType": len(property.PrimitiveType) > 0,
+// 		"ListMapType":   len(property.Type) > 0 && property.Type != "List" && property.Type != "Map",
+// 	})
+// 	checkError(err)
+// 	return buf.String()
+// }
 
 func sortSpecList(specList map[string]string) []string {
 	regions := make([]string, len(specList))

diff --git a/internal/cloudformation/tasks/delete.go b/internal/cloudformation/tasks/delete.go
@@ -2,13 +2,14 @@ package tasks
 
 import (
 	"fmt"
-	printer "github.com/KablamoOSS/go-cli-printer"
 	"os"
 	"time"
 
-	"github.com/KablamoOSS/kombustion/internal/cloudformation"
 	"github.com/aws/aws-sdk-go/aws"
 	awsCF "github.com/aws/aws-sdk-go/service/cloudformation"
+
+	printer "github.com/KablamoOSS/go-cli-printer"
+	"github.com/KablamoOSS/kombustion/internal/cloudformation"
 )
 
 // DeleteStack removes a cloudformation stack
@@ -31,15 +32,15 @@ func DeleteStack(client cloudformation.StackDeleter, stackName, region string) {
 		status, err := client.DescribeStacks(&awsCF.DescribeStacksInput{StackName: aws.String(stackName)})
 		checkErrorDeletePoll(err)
 
-		events, err := client.DescribeStackEvents(
-			&awsCF.DescribeStackEventsInput{StackName: aws.String(stackName)},
-		)
-		checkError(err)
-
 		if len(status.Stacks) > 0 {
+			events, err := client.DescribeStackEvents(
+				&awsCF.DescribeStackEventsInput{StackName: aws.String(stackName)},
+			)
+			checkErrorDeletePoll(err)
+
 			stackStatus := *status.Stacks[0].StackStatus
 
-			if len(events.StackEvents) > 0 {
+			if events != nil && len(events.StackEvents) > 0 {
 				PrintStackEvent(events.StackEvents[0], false)
 			}
 			if stackStatus == awsCF.StackStatusDeleteInProgress {

diff --git a/internal/cloudformation/tasks/util.go b/internal/cloudformation/tasks/util.go
@@ -24,8 +24,9 @@ func checkError(err error) {
 				"",
 			)
 		} else {
+			fmt.Println(err)
 			// TODO: Make this error more helpful
-			printer.Fatal(err, "", "")
+			printer.Fatal(err, "An unknown error occured, please subbmit an issue", "https://github.com/KablamoOSS/kombustion/issues/new?template=bug_report.md")
 		}
 	}
 }

diff --git a/internal/coretest/object_store.go b/internal/coretest/object_store.go
@@ -1,6 +1,7 @@
 package coretest
 
 import (
+	"io/ioutil"
 	"strings"
 )
 
@@ -17,6 +18,7 @@ func NewMockObjectStore() *MockObjectStore {
 	}
 }
 
+// Get an object
 func (objstore *MockObjectStore) Get(path string, subpath ...string) ([]byte, error) {
 	fullPath := strings.Join(append([]string{path}, subpath...), "/")
 	data, ok := objstore.Objects[fullPath]
@@ -26,8 +28,20 @@ func (objstore *MockObjectStore) Get(path string, subpath ...string) ([]byte, er
 	return data, nil
 }
 
+// Put a string into the objectStore
 func (objstore *MockObjectStore) Put(data []byte, path string, subpath ...string) error {
 	fullPath := strings.Join(append([]string{path}, subpath...), "/")
 	objstore.Objects[fullPath] = data
 	return nil
 }
+
+// PutFile into the objectStore by reading `localPath` from disk
+func (objstore *MockObjectStore) PutFile(localPath string, path string, subpath ...string) error {
+	data, err := ioutil.ReadFile(localPath)
+	if err != nil {
+		return err
+	}
+	fullPath := strings.Join(append([]string{path}, subpath...), "/")
+	objstore.Objects[fullPath] = data
+	return nil
+}
diff --git a/internal/tasks/common_test.go b/internal/tasks/common_test.go
@@ -0,0 +1,34 @@
+package tasks
+
+var sampleKombYaml = `---
+Name: Kombustion
+Region: ""
+Environments:
+  ci:
+    Parameters:
+      BucketName: fooBucket
+GenerateDefaultOutputs: false
+Tags: {}
+`
+
+var sampleKombLock = `plugins: {}`
+
+var sampleYaml = `AWSTemplateFormatVersion: 2010-09-09
+Description: S3 test bucket
+Parameters:
+  BucketName:
+    Type: "String"
+    Default: "testBucket"
+    Description: "S3 bucket name"
+
+Mappings: {}
+Resources:
+  testBucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: !Ref: BucketName
+      AccessControl: PublicRead
+      Tags:
+      - Key: Name
+        Value: 123
+`
diff --git a/internal/tasks/delete_test.go b/internal/tasks/delete_test.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"testing"
 
-	printer "github.com/KablamoOSS/go-cli-printer"
-	"github.com/KablamoOSS/kombustion/internal/coretest"
 	"github.com/aws/aws-sdk-go/aws"
 	awsCF "github.com/aws/aws-sdk-go/service/cloudformation"
 	"github.com/stretchr/testify/assert"
+
+	printer "github.com/KablamoOSS/go-cli-printer"
+	"github.com/KablamoOSS/kombustion/internal/coretest"
 )
 
 type MockStackDeleter struct {
@@ -30,22 +31,30 @@ func (msd *MockStackDeleter) Open(_, _ string) string {
 func (msd *MockStackDeleter) DeleteStack(input *awsCF.DeleteStackInput) (*awsCF.DeleteStackOutput, error) {
 	stack, ok := msd.Stacks[*input.StackName]
 	if !ok {
-		return nil, fmt.Errorf("stack not found: %s", *input.StackName)
+		return nil, fmt.Errorf("Stack with id %s does not exist", *input.StackName)
 	}
 	stack.StackStatus = aws.String("DELETE_IN_PROGRESS")
 	return &awsCF.DeleteStackOutput{}, nil
 }
 
 func (msd *MockStackDeleter) DescribeStackEvents(input *awsCF.DescribeStackEventsInput) (*awsCF.DescribeStackEventsOutput, error) {
 	events, ok := msd.Events[*input.StackName]
+	fmt.Println(ok, events, *input.StackName, msd.Events)
 	if !ok {
-		return nil, fmt.Errorf("stack %s not found", *input.StackName)
+		return nil, fmt.Errorf("Stack with id %s does not exist", *input.StackName)
+
 	}
 
 	out := &awsCF.DescribeStackEventsOutput{
 		StackEvents: events,
 	}
-
+	stack, ok := msd.Stacks[*input.StackName]
+	if ok {
+		if *stack.StackStatus == "DELETE_IN_PROGRESS" {
+			delete(msd.Stacks, *input.StackName)
+			delete(msd.Events, *input.StackName)
+		}
+	}
 	return out, nil
 }
 
@@ -62,21 +71,18 @@ func (msd *MockStackDeleter) DescribeStackEventsPages(input *awsCF.DescribeStack
 func (msd *MockStackDeleter) DescribeStacks(input *awsCF.DescribeStacksInput) (*awsCF.DescribeStacksOutput, error) {
 	stack, ok := msd.Stacks[*input.StackName]
 	if !ok {
-		return nil, fmt.Errorf("stack not found: %s", *input.StackName)
+		return nil, fmt.Errorf("Stack with id %s does not exist", *input.StackName)
 	}
 	output := &awsCF.DescribeStacksOutput{
 		Stacks: []*awsCF.Stack{stack},
 	}
-	if *stack.StackStatus == "DELETE_IN_PROGRESS" {
-		delete(msd.Stacks, *input.StackName)
-		delete(msd.Events, *input.StackName)
-	}
 	return output, nil
 }
 
 func TestDeleteTask(t *testing.T) {
 	printer.Test()
 
+	stackName := "TestDeleteTaskStack"
 	objectStore := coretest.NewMockObjectStore()
 	objectStore.Put([]byte(sampleKombYaml), "kombustion.yaml")
 	objectStore.Put([]byte(sampleKombLock), "kombustion.lock")
@@ -85,29 +91,29 @@ func TestDeleteTask(t *testing.T) {
 	stacks := make(map[string]*awsCF.Stack)
 	events := make(map[string][]*awsCF.StackEvent)
 
-	stacks["foo-stack"] = &awsCF.Stack{
-		StackId:     aws.String("foo-stack"),
-		StackName:   aws.String("foo-stack"),
+	stacks[stackName] = &awsCF.Stack{
+		StackId:     aws.String(stackName),
+		StackName:   aws.String(stackName),
 		StackStatus: aws.String("CREATE_COMPLETE"),
 	}
-	events["foo-stack"] = []*awsCF.StackEvent{}
+	events[stackName] = []*awsCF.StackEvent{}
 
 	deleter := &MockStackDeleter{
 		Stacks: stacks,
 		Events: events,
 	}
-
+	fmt.Println(deleter.Events)
 	assert.NotPanics(
 		t,
 		func() {
 			taskDelete(
 				deleter,
 				objectStore,
 				"test.yaml",       // templatePath
-				"foo-stack",       // stackName
-				"ci",              // envName
 				"profile",         // profile
+				stackName,         // stackName
 				"region",          // region
+				"ci",              // envName
 				"kombustion.yaml", // manifest location
 			)
 		},
@@ -131,10 +137,10 @@ func TestDeleteTaskStackNotFound(t *testing.T) {
 				deleter,
 				objectStore,
 				"test.yaml",       // templatePath
-				"event-stack",     // stackName
-				"ci",              // envName
 				"profile",         // profile
+				"event-stack",     // stackName
 				"region",          // region
+				"ci",              // envName
 				"kombustion.yaml", // manifest location
 			)
 		},