👻 fix dockerfile to use release image

.github/workflows/ci.yaml

@@ -1,6 +1,7 @@
 name: tackle2-addon-analyzer CI
 
 on:
+  workflow_dispatch:
   push:
   pull_request:
 
@@ -28,3 +29,4 @@ jobs:
     uses: konveyor/ci/.github/workflows/global-ci.yml@main
     with:
       component_name: tackle2-addon-analyzer
+      api_tests_ref: release-0.3

Dockerfile

@@ -1,11 +1,11 @@
-FROM quay.io/konveyor/windup-shim:latest as shim
+FROM quay.io/konveyor/windup-shim:release-0.3 as shim
 
 FROM registry.access.redhat.com/ubi9/go-toolset:latest as addon
 ENV GOPATH=$APP_ROOT
 COPY --chown=1001:0 . .
-RUN make cmd
+RUN make build
 
-FROM quay.io/konveyor/analyzer-lsp:latest
+FROM quay.io/konveyor/analyzer-lsp:release-0.3
 USER root
 RUN echo -e "[centos9]" \
  "\nname = centos9" \

Makefile

@@ -1,11 +1,22 @@
-GOBIN    ?= ${GOPATH}/bin
-IMG      ?= quay.io/konveyor/tackle2-addon-analyzer:latest
-CMD      ?= bin/addon
-AddonDir ?= /tmp/addon
+GOPATH    ?= $(HOME)/go
+GOBIN     ?= $(GOPATH)/bin
+IMG       ?= quay.io/konveyor/tackle2-addon-analyzer:latest
+CMD       ?= bin/addon
+AddonDir  ?= /tmp/addon
+GOIMPORTS = $(GOBIN)/goimports
+
+PKG = ./cmd/... \
+      ./builder/...
+
+PKGDIR = $(subst /...,,$(PKG))
+
 
 cmd: fmt vet
 	go build -ldflags="-w -s" -o ${CMD} github.com/konveyor/tackle2-addon-analyzer/cmd
 
+build:
+	go build -ldflags="-w -s" -o ${CMD} github.com/konveyor/tackle2-addon-analyzer/cmd
+
 image-docker:
 	docker build -t ${IMG} .
 
@@ -17,9 +28,12 @@ run: cmd
 	$(eval cmd := $(abspath ${CMD}))
 	cd ${AddonDir};${cmd}
 
-fmt:
-	go fmt ./...
+fmt: $(GOIMPORTS)
+	$(GOIMPORTS) -w $(PKGDIR)
 
 vet:
-	go vet ./...
+	go vet $(PKG)
 
+# Ensure goimports installed.
+$(GOIMPORTS):
+	go install golang.org/x/tools/cmd/goimports@latest

builder/deps.go

@@ -1,11 +1,12 @@
 package builder
 
 import (
+	"io"
+	"os"
+
 	output "github.com/konveyor/analyzer-lsp/output/v1/konveyor"
 	"github.com/konveyor/tackle2-hub/api"
 	"gopkg.in/yaml.v2"
-	"io"
-	"os"
 )
 
 // Deps builds dependencies.

builder/issue.go

@@ -2,15 +2,16 @@ package builder
 
 import (
 	"fmt"
+	"io"
+	"net/url"
+	"os"
+
 	output "github.com/konveyor/analyzer-lsp/output/v1/konveyor"
 	hub "github.com/konveyor/tackle2-hub/addon"
 	"github.com/konveyor/tackle2-hub/api"
 	"go.lsp.dev/uri"
 	"gopkg.in/yaml.v2"
-	"io"
 	"k8s.io/utils/pointer"
-	"net/url"
-	"os"
 )
 
 var (

cmd/analyzer.go

@@ -1,9 +1,10 @@
 package main
 
 import (
+	"path"
+
 	"github.com/konveyor/tackle2-addon-analyzer/builder"
 	"github.com/konveyor/tackle2-addon/command"
-	"path"
 )
 
 type RuleError = builder.RuleError

cmd/cmd_test.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/onsi/gomega"
 	"testing"
+
+	"github.com/onsi/gomega"
 )
 
 func TestRuleSelector(t *testing.T) {

cmd/rules.go

@@ -1,17 +1,18 @@
 package main
 
 import (
+	"os"
+	"path"
+	"regexp"
+	"strconv"
+	"strings"
+
 	"github.com/konveyor/analyzer-lsp/parser"
 	"github.com/konveyor/tackle2-addon/command"
 	"github.com/konveyor/tackle2-addon/repository"
 	"github.com/konveyor/tackle2-hub/api"
 	"github.com/konveyor/tackle2-hub/nas"
 	"github.com/rogpeppe/go-internal/semver"
-	"os"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
 )
 
 type History = map[uint]byte
@@ -85,13 +86,13 @@ func (r *Rules) addFiles() (err error) {
 	}
 	for _, ent := range entries {
 		if ent.Name() == parser.RULE_SET_GOLDEN_FILE_NAME {
-			r.rules = append(r.rules, ruleDir)
+			r.append(ruleDir)
 			return
 		}
 	}
 	for _, ent := range entries {
 		p := path.Join(ruleDir, ent.Name())
-		r.rules = append(r.rules, p)
+		r.append(p)
 	}
 	return
 }
@@ -183,11 +184,11 @@ func (r *Rules) addRules(ruleset *api.RuleSet) (err error) {
 			break
 		}
 		if n == 1 {
-			r.rules = append(r.rules, path)
+			r.append(path)
 		}
 	}
 	if n > 1 {
-		r.rules = append(r.rules, ruleDir)
+		r.append(ruleDir)
 	}
 	return
 }
@@ -222,7 +223,7 @@ func (r *Rules) addRuleSetRepository(ruleset *api.RuleSet) (err error) {
 		return
 	}
 	ruleDir := path.Join(rootDir, ruleset.Repository.Path)
-	r.rules = append(r.rules, ruleDir)
+	r.append(ruleDir)
 	return
 }
 
@@ -254,7 +255,7 @@ func (r *Rules) addRepository() (err error) {
 		return
 	}
 	ruleDir := path.Join(rootDir, r.Repository.Path)
-	r.rules = append(r.rules, ruleDir)
+	r.append(ruleDir)
 	return
 }
 
@@ -288,11 +289,26 @@ func (r *Rules) convert() (err error) {
 		return
 	}
 	if len(converted) > 0 {
-		r.rules = append(r.rules, output)
+		r.append(output)
 	}
 	return
 }
 
+// append path.
+func (r *Rules) append(p string) {
+	for i := range r.rules {
+		if r.rules[i] == p {
+			return
+		}
+	}
+	switch strings.ToUpper(path.Ext(p)) {
+	case "",
+		".YAML",
+		".YML":
+		r.rules = append(r.rules, p)
+	}
+}
+
 // Labels collection.
 type Labels struct {
 	Included []string `json:"included,omitempty"`

cmd/scope.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/konveyor/tackle2-addon/command"
 	"strings"
+
+	"github.com/konveyor/tackle2-addon/command"
 )
 
 // Scope settings.
@@ -28,7 +29,6 @@ func (r *Scope) AddOptions(options *command.Options) (err error) {
 	return
 }
 
-//
 // incidentSelector returns an incident selector.
 // The injected `!package` matches incidents without a package variable.
 func (r *Scope) incidentSelector() (selector string) {

cmd/settings.go

@@ -2,15 +2,16 @@ package main
 
 import (
 	"errors"
-	"github.com/konveyor/analyzer-lsp/provider"
-	hub "github.com/konveyor/tackle2-hub/addon"
-	"github.com/konveyor/tackle2-hub/api"
-	"gopkg.in/yaml.v2"
 	"io"
 	"os"
 	"path"
 	"strconv"
 	"strings"
+
+	"github.com/konveyor/analyzer-lsp/provider"
+	hub "github.com/konveyor/tackle2-hub/addon"
+	"github.com/konveyor/tackle2-hub/api"
+	"gopkg.in/yaml.v2"
 )
 
 // Settings - provider settings file.

cmd/tagger.go

@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/konveyor/tackle2-addon/command"
-	"github.com/konveyor/tackle2-hub/api"
 	"math/rand"
 	"regexp"
+
+	"github.com/konveyor/tackle2-addon/command"
+	"github.com/konveyor/tackle2-hub/api"
 )
 
 var TagExp = regexp.MustCompile("(.+)(=)(.+)")