cleanup

Signed-off-by: Kyle Quest <[email protected]>

Author: kcq

COMMUNITY_ACTIVITY_LOG.md

@@ -0,0 +1,18 @@
+# Community Activity Log
+
+## Meetings/Events
+
+TBD
+
+## Engaging with CNCF TAGs
+
+TBD
+
+## Collaborating/Integrating with Other Projects (CNCF or Not)
+
+TBD
+
+## Conferences
+
+TBD
+

pkg/app/master/commands/clifvgetter.go

@@ -239,7 +239,8 @@ func GetContainerOverrides(xc *app.ExecutionContext, ctx *cli.Context) (*config.
 	if envErr != nil {
 		return nil, envErr
 	}
-	env := validateAndCleanEnvVariables(ctx.StringSlice(FlagEnv), xc)
+	envList = validateAndCleanEnvVariables(xc, envList, "param.env-file.value")
+	env := validateAndCleanEnvVariables(xc, ctx.StringSlice(FlagEnv), "param.env")
 	envList = append(envList, env...)
 	overrides := &config.ContainerOverrides{
 		User:     ctx.String(FlagUser),
@@ -408,9 +409,7 @@ func GetDockerClientConfig(ctx *cli.Context) *config.DockerClient {
 	return config
 }
 
-func validateAndCleanEnvVariables(envList []string, xc *app.ExecutionContext) []string {
-	xc.Out.Info("Validating and cleaning environment variables")
-
+func validateAndCleanEnvVariables(xc *app.ExecutionContext, envList []string, errType string) []string {
 	var envStaging []string
 
 	if len(envList) == 0 {
@@ -425,19 +424,24 @@ func validateAndCleanEnvVariables(envList []string, xc *app.ExecutionContext) []
 		}
 
 		if !strings.ContainsAny(kv, "=") {
-			xc.Out.Prompt(fmt.Sprintf("Malformed env key/value (idx: %v kv: %s). Excluding from list", i, kv))
+			xc.Out.Error(errType, fmt.Sprintf("skipping malformed env var - (index=%d data='%s')", i, kv))
 			continue
 		}
 
 		envKeyValue := strings.SplitN(kv, "=", 2)
+		if len(envKeyValue) != 2 {
+			xc.Out.Error(errType, fmt.Sprintf("skipping malformed env var - (index=%d data='%s')", i, kv))
+			continue
+		}
+
 		keyIsEmpty := len(strings.TrimSpace(envKeyValue[0])) == 0
-		valIsEmpty := len(strings.TrimSpace(envKeyValue[1])) == 0
+		//no need to trim value (it may have spaces intentionally)
+		valIsEmpty := len(envKeyValue[1]) == 0
 
-		if len(envKeyValue) == 2 && !keyIsEmpty && !valIsEmpty {
-			xc.Out.Prompt(fmt.Sprintf("Adding key value %s to list of env values", kv))
+		if !keyIsEmpty && !valIsEmpty {
 			envStaging = append(envStaging, kv)
 		} else {
-			xc.Out.Prompt(fmt.Sprintf("Malformed env key/value (idx: %v kv: %s). Excluding from list", i, kv))
+			xc.Out.Error(errType, fmt.Sprintf("skipping malformed env var - (index=%d data='%s')", i, kv))
 		}
 	}
 

pkg/app/master/commands/clifvparser.go

@@ -877,10 +877,8 @@ func ParseEnvFile(filePath string) ([]string, error) {
 	for _, line := range lines {
 		line = strings.TrimSpace(line)
 		if len(line) > 0 {
-			parts := strings.SplitN(line, "=", 2)
-			if len(parts) == 2 {
-				output = append(output, line)
-			}
+			//env var format validation is done separately
+			output = append(output, line)
 		}
 	}
 	return output, nil

pkg/app/sensor/artifact/artifact.go

@@ -447,11 +447,9 @@ func (a *processor) ProcessReports(
 	logger.Debug("processing data...")
 
 	fileCount := 0
-	for _, processFileMap := range fanReport.ProcessFiles {
-		fileCount += len(processFileMap)
-	}
 	fileList := make([]string, 0, fileCount)
 	for _, processFileMap := range fanReport.ProcessFiles {
+		fileCount += len(processFileMap)
 		for fpath := range processFileMap {
 			fileList = append(fileList, fpath)
 		}