feat(nocgo): enable to build with CGO_ENABLED=0 (#1080)

GNUmakefile

@@ -20,19 +20,23 @@ BUILDTIME := $(shell date "+%Y%m%d_%H%M%S")
 LDFLAGS := -X 'github.com/future-architect/vuls/config.Version=$(VERSION)' \
     -X 'github.com/future-architect/vuls/config.Revision=build-$(BUILDTIME)_$(REVISION)'
 GO := GO111MODULE=on go
+CGO_UNABLED := CGO_ENABLED=0 go
 GO_OFF := GO111MODULE=off go
 
 
 all: build
 
-build: main.go pretest fmt
-	$(GO) build -a -ldflags "$(LDFLAGS)" -o vuls $<
+build: ./cmd/vuls/main.go pretest fmt
+	$(GO) build -a -ldflags "$(LDFLAGS)" -o vuls ./cmd/vuls
 
-b: 	main.go pretest fmt
-	$(GO) build -ldflags "$(LDFLAGS)" -o vuls $<
+install: ./cmd/vuls/main.go pretest fmt
+	$(GO) install -ldflags "$(LDFLAGS)" ./cmd/vuls
 
-install: main.go pretest
-	$(GO) install -ldflags "$(LDFLAGS)"
+build-scanner: ./cmd/scanner/main.go pretest fmt
+	$(CGO_UNABLED) build -tags=scanner -a -ldflags "$(LDFLAGS)" -o vuls ./cmd/scanner
+
+install-scanner: ./cmd/scanner/main.go pretest fmt
+	$(CGO_UNABLED) install -tags=scanner -ldflags "$(LDFLAGS)" ./cmd/scanner
 
 lint:
 	$(GO_OFF) get -u golang.org/x/lint/golint

cmd/scanner/main.go

@@ -7,8 +7,8 @@ import (
 
 	"context"
 
-	"github.com/future-architect/vuls/commands"
 	"github.com/future-architect/vuls/config"
+	commands "github.com/future-architect/vuls/subcmds"
 	"github.com/google/subcommands"
 )
 
@@ -17,12 +17,9 @@ func main() {
 	subcommands.Register(subcommands.FlagsCommand(), "")
 	subcommands.Register(subcommands.CommandsCommand(), "")
 	subcommands.Register(&commands.DiscoverCmd{}, "discover")
-	subcommands.Register(&commands.TuiCmd{}, "tui")
 	subcommands.Register(&commands.ScanCmd{}, "scan")
 	subcommands.Register(&commands.HistoryCmd{}, "history")
-	subcommands.Register(&commands.ReportCmd{}, "report")
 	subcommands.Register(&commands.ConfigtestCmd{}, "configtest")
-	subcommands.Register(&commands.ServerCmd{}, "server")
 
 	var v = flag.Bool("v", false, "Show version")
 

exploit/exploit.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package exploit
 
 import (

gost/base.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package gost
 
 import (

gost/debian.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package gost
 
 import (

gost/gost.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package gost
 
 import (

gost/microsoft.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package gost
 
 import (

gost/pseudo.go

@@ -1,8 +1,8 @@
+// +build !scanner
+
 package gost
 
 import (
-	"strings"
-
 	"github.com/future-architect/vuls/models"
 	"github.com/knqyf263/gost/db"
 )
@@ -16,7 +16,3 @@ type Pseudo struct {
 func (pse Pseudo) DetectUnfixed(driver db.DB, r *models.ScanResult, _ bool) (int, error) {
 	return 0, nil
 }
-
-func major(osVer string) (majorVersion string) {
-	return strings.Split(osVer, ".")[0]
-}

gost/redhat.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package gost
 
 import (

gost/util.go

@@ -2,6 +2,7 @@ package gost
 
 import (
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/cenkalti/backoff"
@@ -181,3 +182,7 @@ func httpGet(url string, req request, resChan chan<- response, errChan chan<- er
 		json:    body,
 	}
 }
+
+func major(osVer string) (majorVersion string) {
+	return strings.Split(osVer, ".")[0]
+}

models/utils.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package models
 
 import (

msf/empty.go

@@ -0,0 +1 @@
+package msf

msf/msf.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package msf
 
 import (

oval/alpine.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/debian.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/debian_test.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/empty.go

@@ -0,0 +1 @@
+package oval

oval/oval.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/redhat.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/redhat_test.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/suse.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/util.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

oval/util_test.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package oval
 
 import (

report/cve_client.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package report
 
 import (

report/db_client.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package report
 
 import (

report/report.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package report
 
 import (
@@ -36,11 +38,6 @@ import (
 	"golang.org/x/xerrors"
 )
 
-const (
-	vulsOpenTag  = "<vulsreport>"
-	vulsCloseTag = "</vulsreport>"
-)
-
 // FillCveInfos fills CVE Detailed Information
 func FillCveInfos(dbclient DBClient, rs []models.ScanResult, dir string) ([]models.ScanResult, error) {
 

report/util.go

@@ -22,7 +22,11 @@ import (
 	"golang.org/x/xerrors"
 )
 
-const maxColWidth = 100
+const (
+	vulsOpenTag  = "<vulsreport>"
+	vulsCloseTag = "</vulsreport>"
+	maxColWidth  = 100
+)
 
 func formatScanSummary(rs ...models.ScanResult) string {
 	table := uitable.New()
@@ -555,7 +559,7 @@ func getDiffCves(previous, current models.ScanResult) models.VulnInfos {
 
 				// TODO commented out because  a bug of diff logic when multiple oval defs found for a certain CVE-ID and same updated_at
 				// if these OVAL defs have different affected packages, this logic detects as updated.
-				// This logic will be uncomented after integration with ghost https://github.com/knqyf263/gost
+				// This logic will be uncomented after integration with gost https://github.com/knqyf263/gost
 				// } else if isCveFixed(v, previous) {
 				// updated[v.CveID] = v
 				// util.Log.Debugf("fixed: %s", v.CveID)

server/empty.go

@@ -0,0 +1 @@
+package server

server/server.go

@@ -1,3 +1,5 @@
+// +build !scanner
+
 package server
 
 import (

subcmds/configtest.go

@@ -1,4 +1,4 @@
-package commands
+package subcmds
 
 import (
 	"context"

subcmds/discover.go

@@ -1,4 +1,4 @@
-package commands
+package subcmds
 
 import (
 	"context"

subcmds/history.go

@@ -1,4 +1,4 @@
-package commands
+package subcmds
 
 import (
 	"context"

subcmds/report.go

@@ -1,4 +1,6 @@
-package commands
+// +build !scanner
+
+package subcmds
 
 import (
 	"context"

subcmds/scan.go

@@ -1,4 +1,4 @@
-package commands
+package subcmds
 
 import (
 	"context"

subcmds/server.go

@@ -1,4 +1,6 @@
-package commands
+// +build !scanner
+
+package subcmds
 
 import (
 	"context"

subcmds/tui.go

@@ -1,4 +1,6 @@
-package commands
+// +build !scanner
+
+package subcmds
 
 import (
 	"context"

subcmds/util.go

@@ -1,4 +1,4 @@
-package commands
+package subcmds
 
 import (
 	"fmt"