Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Commit

Permalink
Pass through any resource that is unknown (#139)
Browse files Browse the repository at this point in the history 
* Pass through any resource that is unknown

* Updated test snapshots
  • Loading branch information
@ojkelly
ojkelly authored Jan 25, 2019
1 parent 9b9be0f commit d6e62ba
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 251 deletions.
29 changes: 16 additions & 13 deletions internal/cloudformation/template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ import (
"strings"

printer "github.com/KablamoOSS/go-cli-printer"

"github.com/KablamoOSS/kombustion/internal/plugins"
"github.com/KablamoOSS/kombustion/pkg/parsers"
"github.com/KablamoOSS/kombustion/types"

"github.com/KablamoOSS/yaml"
)

Expand Down Expand Up @@ -174,7 +172,15 @@ func processParsers(
strings.HasPrefix(templateResource.Type, "Custom::") {
resources = mergeTemplatesWithError(
templateResourceName,
"aws-custom-resource",
"non-plugin-resource",
templateResource.Type,
resources,
types.TemplateObject{templateResourceName: templateResource},
)
} else if strings.HasPrefix(templateResource.Type, "AWS::") {
resources = mergeTemplatesWithError(
templateResourceName,
"aws-resource",
templateResource.Type,
resources,
types.TemplateObject{templateResourceName: templateResource},
Expand All @@ -183,17 +189,14 @@ func processParsers(
// Check if there is a parser for this resource
parser, ok := parserFuncs[templateResource.Type]

// If theres no parser log an error
// If theres no parser dont adjust the out
if !ok {
printer.Error(
fmt.Errorf("No parser found"),
fmt.Sprintf(
"\n ├─ Name: %s\n ├─ Type: %s\n └─ Resolution: %s",
templateResourceName,
templateResource.Type,
"You may need to install a plugin to parse the resource.",
),
"",
resources = mergeTemplatesWithError(
templateResourceName,
"unknown-resource",
templateResource.Type,
resources,
types.TemplateObject{templateResourceName: templateResource},
)
continue
}
Expand Down
244 changes: 8 additions & 236 deletions internal/cloudformation/template_parsers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"

printer "github.com/KablamoOSS/go-cli-printer"
"github.com/KablamoOSS/kombustion/internal/coretest"
"github.com/KablamoOSS/kombustion/pkg/parsers/resources"
"github.com/KablamoOSS/kombustion/types"
"github.com/stretchr/testify/assert"
)

var testYaml = `AWSTemplateFormatVersion: "2010-09-09"
Expand Down Expand Up @@ -59,232 +60,17 @@ func TestGenerateYamlTemplate(t *testing.T) {
ObjectStore: objectStore,
Filename: "test.yaml",
},
output: YamlCloudformation{
AWSTemplateFormatVersion: "2010-09-09",
Description: "A Demo Template for testing Kombustion",
Metadata: types.TemplateObject{},
Parameters: types.TemplateObject{
"Environment": map[interface{}]interface{}{
"Type": "String",
"Default": "UnknownEnvironment",
},
},
Mappings: types.TemplateObject{},
Conditions: types.TemplateObject{},
Transform: types.TemplateObject{},
Resources: types.TemplateObject{
"MyDemoLogGroup4": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{
"-",
[]interface{}{
"MyDemoLogGroup4",
map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil)},
"MyDemoLogGroup": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{
"-", []interface{}{
"MyDemoLogGroup1",
map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil)}, "MyDemoLogGroup2": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup", Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{
"-", []interface{}{
"MyDemoLogGroup2",
map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil)}, "MyDemoLogGroup3": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{
"-",
[]interface{}{
"MyDemoLogGroup3",
map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil),
},
},
Outputs: types.TemplateObject{},
},
err: nil,
output: YamlCloudformation{AWSTemplateFormatVersion: "2010-09-09", Description: "A Demo Template for testing Kombustion", Metadata: types.TemplateObject{}, Parameters: types.TemplateObject{"Environment": map[interface{}]interface{}{"Type": "String", "Default": "UnknownEnvironment"}}, Mappings: types.TemplateObject{}, Conditions: types.TemplateObject{}, Transform: types.TemplateObject{}, Resources: types.TemplateObject{"MyDemoLogGroup4": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup4", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup1", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup2": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"RetentionInDays": 1, "LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup2", map[string]interface{}{"Ref": "Environment"}}}}}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup3": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup3", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}}, Outputs: types.TemplateObject{}},
err: nil,
},
{
input: GenerateParams{
ObjectStore: objectStore,
Filename: "test.yaml",
GenerateDefaultOutputs: true,
},
output: YamlCloudformation{
AWSTemplateFormatVersion: "2010-09-09",
Description: "A Demo Template for testing Kombustion",
Metadata: types.TemplateObject{},
Parameters: types.TemplateObject{
"Environment": map[interface{}]interface{}{
"Type": "String", "Default": "UnknownEnvironment",
},
},
Mappings: types.TemplateObject{},
Conditions: types.TemplateObject{},
Transform: types.TemplateObject{},
Resources: types.TemplateObject{
"MyDemoLogGroup2": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{"-", []interface{}{
"MyDemoLogGroup2", map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil),
},
"MyDemoLogGroup3": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{"-", []interface{}{
"MyDemoLogGroup3",
map[interface{}]interface{}{
"Ref": "Environment",
},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil),
},
"MyDemoLogGroup4": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{
"-",
[]interface{}{
"MyDemoLogGroup4",
map[interface{}]interface{}{"Ref": "Environment"},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil)},
"MyDemoLogGroup": resources.LogsLogGroup{
Type: "AWS::Logs::LogGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: map[interface{}]interface{}{
"Fn::Join": []interface{}{"-",
[]interface{}{"MyDemoLogGroup1",
map[interface{}]interface{}{"Ref": "Environment"},
},
},
},
RetentionInDays: 1,
},
Condition: interface{}(nil),
Metadata: interface{}(nil),
DependsOn: interface{}(nil),
},
},
Outputs: types.TemplateObject{
"MyDemoLogGroup2": types.TemplateObject{
"Description": "MyDemoLogGroup2 Object",
"Value": map[string]interface{}{
"Ref": "MyDemoLogGroup2",
},
"Export": map[string]interface{}{
"Name": map[string]interface{}{
"Fn::Sub": "${AWS::StackName}-LogsLogGroup-MyDemoLogGroup2",
},
},
},
"MyDemoLogGroup3": types.TemplateObject{
"Description": "MyDemoLogGroup3 Object",
"Value": map[string]interface{}{
"Ref": "MyDemoLogGroup3",
},
"Export": map[string]interface{}{
"Name": map[string]interface{}{
"Fn::Sub": "${AWS::StackName}-LogsLogGroup-MyDemoLogGroup3",
},
},
},
"MyDemoLogGroup4": types.TemplateObject{
"Export": map[string]interface{}{
"Name": map[string]interface{}{
"Fn::Sub": "${AWS::StackName}-LogsLogGroup-MyDemoLogGroup4",
},
}, "Description": "MyDemoLogGroup4 Object",
"Value": map[string]interface{}{
"Ref": "MyDemoLogGroup4",
},
},
"MyDemoLogGroup": types.TemplateObject{
"Description": "MyDemoLogGroup Object",
"Value": map[string]interface{}{
"Ref": "MyDemoLogGroup",
},
"Export": map[string]interface{}{
"Name": map[string]interface{}{
"Fn::Sub": "${AWS::StackName}-LogsLogGroup-MyDemoLogGroup",
},
},
},
},
},
err: nil,
output: YamlCloudformation{AWSTemplateFormatVersion: "2010-09-09", Description: "A Demo Template for testing Kombustion", Metadata: types.TemplateObject{}, Parameters: types.TemplateObject{"Environment": map[interface{}]interface{}{"Default": "UnknownEnvironment", "Type": "String"}}, Mappings: types.TemplateObject{}, Conditions: types.TemplateObject{}, Transform: types.TemplateObject{}, Resources: types.TemplateObject{"MyDemoLogGroup4": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup4", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup1", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup2": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup2", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}, "MyDemoLogGroup3": types.CfResource{Type: "AWS::Logs::LogGroup", Properties: map[interface{}]interface{}{"LogGroupName": map[string]interface{}{"Fn::Join": []interface{}{"-", []interface{}{"MyDemoLogGroup3", map[string]interface{}{"Ref": "Environment"}}}}, "RetentionInDays": 1}, Condition: interface{}(nil), Metadata: interface{}(nil), DependsOn: interface{}(nil), CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}}, Outputs: types.TemplateObject{}},
err: nil,
},
}

Expand Down Expand Up @@ -360,22 +146,8 @@ func TestProcessParsers(t *testing.T) {
mappings: types.TemplateObject{},
outputs: types.TemplateObject{},
parameters: types.TemplateObject{},
resources: types.TemplateObject{
"Test": resources.LogsLogGroup{
Type: "AWS::Logs::LogsGroup",
Properties: resources.LogsLogGroupProperties{
LogGroupName: "TestLogGroup",
RetentionInDays: interface{}(nil)},
Condition: map[interface{}]interface{}{
"ConditionName": "ConditionValue",
},
Metadata: map[interface{}]interface{}{
"MetadataName": "MetadataValue",
},
DependsOn: []interface{}{"OtherResource"},
},
},
transform: types.TemplateObject{},
resources: types.TemplateObject{"Test": types.CfResource{Type: "AWS::Logs::LogsGroup", Properties: map[string]interface{}{"LogGroupName": "TestLogGroup"}, Condition: map[string]interface{}{"ConditionName": "ConditionValue"}, Metadata: map[string]interface{}{"MetadataName": "MetadataValue"}, DependsOn: []interface{}{"OtherResource"}, CreationPolicy: interface{}(nil), UpdatePolicy: interface{}(nil), DeletionPolicy: interface{}(nil)}},
transform: types.TemplateObject{},
},
},
{
Expand Down
6 changes: 4 additions & 2 deletions internal/cloudformation/template_util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package cloudformation

import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"

printer "github.com/KablamoOSS/go-cli-printer"
"github.com/KablamoOSS/kombustion/types"
"github.com/stretchr/testify/assert"
"testing"
)

// This test confirms the merge works, but does not
Expand Down

0 comments on commit d6e62ba

Please sign in to comment.