tyhal · tyhal · Mar 3, 2022 · Feb 3, 2022 · Mar 3, 2022
diff --git a/cmd/crie/conf/languages.go b/cmd/crie/conf/languages.go
@@ -24,11 +24,6 @@ var LanguageList = []linter.Language{
 		Fmt:   &cli.Lint{Bin: `autopep8`, FrontPar: cli.Par{`--in-place`, `--aggressive`, `--aggressive`}, Docker: cli.DockerCmd{Image: imgCriePip}},
 		Chk:   &cli.Lint{Bin: `pylint`, Docker: cli.DockerCmd{Image: imgCriePip}},
 	},
-	{
-		Name:  `pythondeps`,
-		Match: regexp.MustCompile(`requirements.txt$`),
-		Fmt:   &cli.Lint{Bin: `pur`, FrontPar: cli.Par{`-r`}},
-	},
 	{
 		Name:  `proto`,
 		Match: regexp.MustCompile(`.proto$`),
@@ -140,7 +135,7 @@ var LanguageList = []linter.Language{
 	{
 		Name:  `ansible`,
 		Match: regexp.MustCompile(`playbook.yml$`),
-		//Chk:   &imp.Lint{Bin: `ansible-lint`}
+		Chk:   &cli.Lint{Bin: `ansible-lint`, Docker: cli.DockerCmd{Image: imgCriePip}},
 	},
 
 	{

diff --git a/cmd/crie/main.go b/cmd/crie/main.go
@@ -12,7 +12,7 @@ import (
 
 var majorNum = "0"
 var minorOffset = 0
-var patchNum = "80"
+var patchNum = "166"
 
 //`
 //	|> crie: the act of crying and dying at the same time

diff --git a/img/pip/requirements.txt b/img/pip/requirements.txt
@@ -3,6 +3,5 @@ docker-compose==1.29.2
 yamllint==1.26.3
 pylint==2.12.2
 autopep8==1.6.0
-pur==6.0.1
 ansible-lint==5.4.0
 ansible==5.4.0
diff --git a/pkg/crie/linter/type.go b/pkg/crie/linter/type.go
@@ -18,9 +18,10 @@ type Report struct {
 type Linter interface {
 	Name() string
 	WillRun() error
-	DidRun()
+	Cleanup()
 	MaxConcurrency() int
 	Run(filepath string, rep chan Report)
+	WaitForCleanup() error
 }
 
 // Language is used to associate a file pattern to the relevant tools to check and format
@@ -33,7 +34,7 @@ type Language struct {
 
 // GetLinter allows for string indexing to get fmt or chk...
 // TODO remove requirement for this function
-func (l Language) GetLinter(which string) Linter {
+func (l *Language) GetLinter(which string) Linter {
 	if which == "fmt" {
 		return l.Fmt
 	} else if which == "chk" {

diff --git a/pkg/crie/project/execution.go b/pkg/crie/project/execution.go
@@ -91,13 +91,13 @@ func (s *LintConfiguration) NoStandards() {
 	table.Render()
 }
 
-func (s *LintConfiguration) tryLint(l linter.Language) error {
-	selectedLinter := l.GetLinter(s.lintType)
+func (s *LintConfiguration) tryLint(l linter.Language) (selectedLinter linter.Linter, err error) {
+	selectedLinter = l.GetLinter(s.lintType)
 	toLog := log.WithFields(log.Fields{"lang": l.Name, "type": s.lintType})
 
 	if selectedLinter == nil {
 		toLog.Debug("there are no configurations associated for this action")
-		return nil
+		return
 	}
 
 	// Get the match for this formatter's files.
@@ -108,25 +108,19 @@ func (s *LintConfiguration) tryLint(l linter.Language) error {
 
 	// Skip language as no files found
 	if len(filteredFilepaths) == 0 {
-		return nil
+		return nil, err
 	}
 
-	defer selectedLinter.DidRun()
-
-	err := selectedLinter.WillRun()
+	defer func() { go selectedLinter.Cleanup() }()
+	err = selectedLinter.WillRun()
 	if err != nil {
 		toLog.Error(err.Error())
-		return err
+		return
 	}
 
 	toLog.WithFields(log.Fields{"files": len(filteredFilepaths)}).Info("running")
 	err = linter.LintFileList(selectedLinter, filteredFilepaths)
-	if err != nil {
-		toLog.Error(err.Error())
-		return err
-	}
-
-	return nil
+	return
 }
 
 // Run is the generic way to run everything based on the packages configuration
@@ -153,8 +147,20 @@ func (s *LintConfiguration) Run(lintType string) error {
 
 	// Run every linter.
 	for _, l := range currentLangs {
-		err := s.tryLint(l)
+		cleanupLinter, err := s.tryLint(l)
+
+		// If tryLint returns a non nil linter reference then we should call WaitForCleanup later
+		if cleanupLinter != nil {
+			defer func() {
+				err := cleanupLinter.WaitForCleanup()
+				if err != nil {
+					log.Error(err)
+				}
+			}()
+		}
+
 		if err != nil {
+			log.Error(err.Error())
 			errCount++
 			if !s.ContinueOnError {
 				break

diff --git a/pkg/linter/cli/cli.go b/pkg/linter/cli/cli.go
@@ -30,6 +30,7 @@ type Lint struct {
 	EndPar    Par
 	Docker    DockerCmd
 	useDocker bool
+	cleanedUp chan error
 }
 
 // Par represents cli parameters
@@ -50,6 +51,13 @@ func (e *Lint) Name() string {
 // WillRun does preflight checks for the 'Run'
 func (e *Lint) WillRun() error {
 	e.useDocker = exec.Command("which", e.Bin).Run() != nil
+
+	// Ensure cleanup channel is created
+	if e.cleanedUp == nil {
+		e.cleanedUp = make(chan error)
+	}
+
+	// Startup sidecar container if needed
 	if e.useDocker {
 		if e.Docker.Image == "" {
 			return errors.New("could not find " + e.Bin + ", possibly not installed")
@@ -60,6 +68,7 @@ func (e *Lint) WillRun() error {
 	} else {
 		log.Debug("using local binary")
 	}
+
 	return nil
 }
 
@@ -203,8 +212,14 @@ func (e *Lint) startDocker() error {
 	return e.Docker.client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
 }
 
-// DidRun should be called after all other Runs to clean up
-func (e *Lint) DidRun() {
+// Cleanup remove any additional resources created in the process
+func (e *Lint) Cleanup() {
+	var err error = nil
+	defer func() {
+		e.cleanedUp <- err
+		close(e.cleanedUp)
+	}()
+
 	if e.useDocker && e.Docker.id != "" {
 		ctx := context.Background()
 		var timeout time.Duration
@@ -213,16 +228,28 @@ func (e *Lint) DidRun() {
 		d := log.WithFields(log.Fields{"dockerId": e.Docker.id})
 
 		d.Debug("stopping container")
-		if err := e.Docker.client.ContainerStop(ctx, e.Docker.id, &timeout); err != nil {
-			log.Error(err)
+		if err = e.Docker.client.ContainerStop(ctx, e.Docker.id, &timeout); err != nil {
+			return
 		}
 		d.Debug("removing container")
-		if err := e.Docker.client.ContainerRemove(ctx, e.Docker.id, types.ContainerRemoveOptions{}); err != nil {
-			log.Fatal(err)
+		if err = e.Docker.client.ContainerRemove(ctx, e.Docker.id, types.ContainerRemoveOptions{}); err != nil {
+			return
 		}
 	}
 }
 
+// WaitForCleanup Useful for when Cleanup is running in the background
+func (e *Lint) WaitForCleanup() error {
+	var timeout time.Duration = 10
+
+	select {
+	case err := <-e.cleanedUp:
+		return err
+	case <-time.After(time.Second * timeout):
+		return fmt.Errorf("timeout waiting for cleanup for %s (%d seconds)", e.Name(), timeout)
+	}
+}
+
 // Run does the work required to lint the given filepath
 func (e *Lint) Run(filepath string, rep chan linter.Report) {
 

diff --git a/pkg/linter/shfmt/shfmt.go b/pkg/linter/shfmt/shfmt.go
@@ -20,14 +20,19 @@ func (e *Lint) Name() string {
 
 // WillRun do nothing as there are no external deps
 func (e *Lint) WillRun() (err error) {
-	return
+	return nil
 }
 
-// DidRun cleanup funtion
-func (e *Lint) DidRun() {
+// Cleanup remove any additional resources created in the process
+func (e *Lint) Cleanup() {
 	return
 }
 
+// WaitForCleanup Useful for when Cleanup is running in the background
+func (e *Lint) WaitForCleanup() (err error) {
+	return nil
+}
+
 // MaxConcurrency return max amount of parallel files to fmt
 func (e *Lint) MaxConcurrency() int {
 	return math.MaxInt32