Validation Namings

Changed validation naming convention to match our current validation approach.

Author: maxiwoj

README.md

@@ -83,7 +83,7 @@ To validate your template, just type:
 ~ $ perun validate <PATH TO YOUR TEMPLATE>
 ```
 Your template will be then validated using both our validation mechanism and AWS API
-(*online validation*).
+(*aws validation*).
 
 #### Configuration
 To create your own configuration file use `configure` mode:

cliparser/cliparser.go

@@ -171,7 +171,7 @@ func ParseCliArguments(args []string) (cliArguments CliArguments, err error) {
 
 	switch kingpin.MustParse(app.Parse(args[1:])) {
 
-	//online validate
+	// validate
 	case validate.FullCommand():
 		cliArguments.Mode = &ValidateMode
 		cliArguments.TemplatePath = validateTemplate

validator/onlinevalidator.go validator/awsvalidator.go

@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package onlinevalidator provides tools for online CloudFormation template
+// Package awsvalidator provides tools for online CloudFormation template
 // validation using AWS API.
 package validator
 

validator/onlinevalidator_test.go validator/awsvalidator_test.go

@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package validator provides tools for offline CloudFormation template
+// Package validator provides tools for local CloudFormation template
 // validation.
 package validator
 
@@ -98,7 +98,7 @@ func validateTemplateFile(templatePath string, templateName string, context *con
 	resources := obtainResources(deNilizedTemplate, perunTemplate, context.Logger)
 	deadResources := getNilResources(resources)
 	deadProperties := getNilProperties(resources)
-	if hasAllowedValuesParametersValid(goFormationTemplate.Parameters, context.Logger) {
+	if hasAllowedValuesParametersValid(goFormationTemplate.Parameters) {
 		valid = true
 	} else {
 		valid = false
@@ -115,7 +115,7 @@ func validateTemplateFile(templatePath string, templateName string, context *con
 }
 
 // Looking for AllowedValues and checking what Type is it. If it finds Type other than String then it will return false.
-func hasAllowedValuesParametersValid(parameters template.Parameters, logger logger.LoggerInt) bool {
+func hasAllowedValuesParametersValid(parameters template.Parameters) bool {
 	isType := false
 	isAllovedValues := false
 	for _, value := range parameters {

validator/offlinevalidator.go validator/localvalidator.go

@@ -30,7 +30,7 @@ import (
 
 var spec specification.Specification
 
-var sink logger.Logger
+//var _ logger.Logger
 
 var deadProp = make([]string, 0)
 var deadRes = make([]string, 0)
@@ -342,25 +342,25 @@ func TestInvalidMapProperty(t *testing.T) {
 }
 
 func TestHasAllowedValuesParametersValid(t *testing.T) {
-	sink = logger.Logger{}
+	_ = logger.Logger{}
 	data := make(map[string]interface{})
 
 	data["AllowedValues"] = ""
 	data["Type"] = "String"
 	parameters := createParameters("Correct", data)
 
-	assert.True(t, hasAllowedValuesParametersValid(parameters, &sink), "This template has AllowedValues with Type String")
+	assert.True(t, hasAllowedValuesParametersValid(parameters), "This template has AllowedValues with Type String")
 }
 
 func TestHasAllowedValuesParametersInvalid(t *testing.T) {
-	sink = logger.Logger{}
+	_ = logger.Logger{}
 	data := make(map[string]interface{})
 
 	data["AllowedValues"] = ""
 	data["Type"] = "AWS::EC2::VPC::Id"
 	parameters := createParameters("Incorrect", data)
 
-	assert.False(t, hasAllowedValuesParametersValid(parameters, &sink), "This template has AllowedValues with Type other than String")
+	assert.False(t, hasAllowedValuesParametersValid(parameters), "This template has AllowedValues with Type other than String")
 }
 
 func createResourceWithNestedProperties(resourceType string, propertyName string, nestedPropertyValue map[string]interface{}) template.Resource {