fix lint errors

Signed-off-by: Ashok Pon Kumar <[email protected]>
konveyor · Sep 18, 2020 · d4590d5 · d4590d5
1 parent 708e0c0
commit d4590d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/internal/source/cfmanifest2kube.go b/internal/source/cfmanifest2kube.go
@@ -99,7 +99,6 @@ func (c CfManifestTranslator) GetServiceOptions(inputPath string, plan plantypes
 		}
 		path, _ := plan.GetRelativePath(fullpath)
 		for _, application := range applications {
-			containerizationoptionsfound := false
 			fullbuilddirectory := filepath.Dir(fullpath)
 			if application.Path != "" {
 				fullbuilddirectory = filepath.Join(fullpath, application.Path)
@@ -122,8 +121,8 @@ func (c CfManifestTranslator) GetServiceOptions(inputPath string, plan plantypes
 				service.UpdateContainerBuildPipeline = false
 				services = append(services, service)
 				appsCovered = append(appsCovered, applicationName)
-				containerizationoptionsfound = true
 			} else {
+				containerizationoptionsfound := false
 				for _, cop := range allcontainerizers.GetContainerizationOptions(plan, fullbuilddirectory) {
 					service := c.newService(applicationName)
 					service.ContainerBuildType = cop.ContainerizationType
@@ -192,7 +191,6 @@ func (c CfManifestTranslator) GetServiceOptions(inputPath string, plan plantypes
 			for _, application := range apps {
 				applicationName := application.Name
 				if !common.IsStringPresent(appsCovered, applicationName) {
-					containerizationoptionsfound := false
 					fullbuilddirectory := filepath.Dir(appfilepath)
 					applicationName := application.Name
 					if applicationName == "" {
@@ -207,8 +205,8 @@ func (c CfManifestTranslator) GetServiceOptions(inputPath string, plan plantypes
 						}
 						service.UpdateContainerBuildPipeline = false
 						services = append(services, service)
-						containerizationoptionsfound = true
 					} else {
+						containerizationoptionsfound := false
 						//TODO: Think whether we should include this for only runtime manifest file
 						for _, cop := range allcontainerizers.GetContainerizationOptions(plan, fullbuilddirectory) {
 							service := c.newService(applicationName)

diff --git a/internal/transformer/k8stransformer.go b/internal/transformer/k8stransformer.go
@@ -119,7 +119,7 @@ func (kt *K8sTransformer) WriteObjects(outpath string) error {
 
 	_, err := writeTransformedObjects(artifactspath, objs)
 	if err != nil {
-		log.Errorf("Error occured while writing transformed objects %s", err)
+		log.Errorf("Error occurred while writing transformed objects %s", err)
 	}
 	if kt.Helm {
 		_ = kt.createOperator(kt.Name, outpath)

diff --git a/internal/transformer/knativetransformer.go b/internal/transformer/knativetransformer.go
@@ -67,7 +67,7 @@ func (kt *KnativeTransformer) WriteObjects(outpath string) error {
 
 	_, err := writeTransformedObjects(artifactspath, kt.TransformedObjects)
 	if err != nil {
-		log.Errorf("Error occured while writing transformed objects %s", err)
+		log.Errorf("Error occurred while writing transformed objects %s", err)
 	}
 	kt.writeDeployScript(kt.Name, outpath)
 	kt.writeReadeMe(kt.Name, areNewImagesCreated, outpath)

diff --git a/types/output/helmvaluesoutput.go b/types/output/helmvaluesoutput.go
@@ -23,7 +23,7 @@ const (
 	ServicesTag string = "services"
 	// ImageTagTag is the tag name for images
 	ImageTagTag string = "imagetag"
-	// ContainersTag is the tag name for conatiners
+	// ContainersTag is the tag name for containers
 	ContainersTag string = "containers"
 )