Merge pull request #157 from Appliscale/configuration-file-test

Configuration file test
Appliscale · Sep 17, 2018 · 68f0214 · 68f0214
2 parents 6be9486 + 862c81a
commit 68f0214
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/linter/stylechecker.go b/linter/stylechecker.go
@@ -92,8 +92,8 @@ func checkAWSCFSpecificStuff(ctx *context.Context, rawTemplate string, lintConf
 	}
 
 	for resourceName := range goFormationTemplate.Resources {
-		if lintConf.CheckLogicalName(resourceName) {
-			ctx.Logger.Warning("Resource '" + resourceName + "' does not meet the given logical Name regex")
+		if !lintConf.CheckLogicalName(resourceName) {
+			ctx.Logger.Warning("Resource '" + resourceName + "' does not meet the given logical Name regex: " + lintConf.Global.NamingConventions.LogicalNames)
 		}
 	}
 }

diff --git a/progress/parsewriter.go b/progress/parsewriter.go
@@ -71,9 +71,9 @@ func NewParseWriter() (pw *ParseWriter) {
 		createCompleteStatus:                          pw.bgGreen,
 		updateCompleteStatus:                          pw.bgGreen,
 		reviewInProgressStatus:                        pw.cyan,
-		add:    pw.bgGreen,
-		remove: pw.bgRed,
-		modify: pw.fgOrange,
+		add:                                           pw.bgGreen,
+		remove:                                        pw.bgRed,
+		modify:                                        pw.fgOrange,
 	}
 	return
 }

diff --git a/stack/mocks/mock_context.go b/stack/mocks/mock_context.go
@@ -3,6 +3,7 @@ package mocks
 import (
 	"github.com/Appliscale/perun/cliparser"
 	"github.com/Appliscale/perun/configuration"
+	"github.com/Appliscale/perun/configurator"
 	"github.com/Appliscale/perun/context"
 	"github.com/Appliscale/perun/logger"
 	"io/ioutil"
@@ -19,11 +20,7 @@ func SetupContext(t *testing.T, args []string) *context.Context {
 		return &context.Context{}
 	}
 
-	config, err := configuration.GetConfiguration(cliArguments, &myLogger)
-	if err != nil {
-		t.Error(err.Error())
-		return &context.Context{}
-	}
+	config := createDefaultConfiguration()
 	iconsistenciesConfig := configuration.ReadInconsistencyConfiguration(&myLogger)
 
 	ctx := context.Context{
@@ -44,3 +41,13 @@ func ReadFile(t *testing.T, filePath string) string {
 	template := string(rawTemplate)
 	return template
 }
+
+func createDefaultConfiguration() configuration.Configuration {
+	return configuration.Configuration{
+		DefaultProfile:        "default",
+		DefaultRegion:         "region",
+		SpecificationURL:      configurator.ResourceSpecificationURL,
+		DefaultDecisionForMFA: false,
+		DefaultDurationForMFA: 3600,
+		DefaultVerbosity:      "INFO"}
+}
diff --git a/utilities/utilities.go b/utilities/utilities.go
@@ -26,8 +26,8 @@ import (
 
 const Motto = "Swiss army knife for AWS CloudFormation templates"
 
-const ReleaseName = "Nimbostratus"
-const VersionNumber = "1.1.0-beta"
+const ReleaseName = "Altostratus"
+const VersionNumber = "1.3.1"
 
 func VersionStatus() string {
 	return fmt.Sprintf("perun %s (%s release) - %s", VersionNumber, ReleaseName, Motto)