Merge pull request #5 from kenzo0107/feature/adjust_directories

Feature/adjust directories

.github/workflows/static.yml

@@ -0,0 +1,70 @@
+name: static check
+on: push
+
+jobs:
+  imports:
+    name: Imports
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: imports
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  errcheck:
+    name: Errcheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: errcheck
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: lint
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  shadow:
+    name: Shadow
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: shadow
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  staticcheck:
+    name: StaticCheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: staticcheck
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  sec:
+    name: Sec
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: check
+      uses: grandcolline/golang-github-actions@v1.1.0
+      with:
+        run: sec
+        token: ${{ secrets.GITHUB_TOKEN }}
+        flags: "-exclude=G106"

.github/workflows/go.yml → .github/workflows/test.yml

@@ -1,11 +1,11 @@
-on: [push, pull_request]
 name: Test
+on: [push]
 jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.12.x, 1.13.x]
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        go-version: [1.13.x]
+        platform: [macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
@@ -15,4 +15,4 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v1
     - name: Test
-      run: go vet ./...
+      run: go test -v -count=1 -cover ./...

.gitignore

@@ -1,4 +1,5 @@
 .envrc
 cmd/omssh/omssh
 bin/*
+cover.out
 dist

Makefile

@@ -11,22 +11,35 @@ deps:
 	go get -v -d
 
 ## Setup
-.PHONY: deps
+.PHONY: devel-deps
 devel-deps: deps
 	GO111MODULE=off go get \
-		github.com/golang/lint/golint \
+		golang.org/x/lint/golint \
+		honnef.co/go/tools/staticcheck \
+		github.com/kisielk/errcheck \
+		golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow \
+		github.com/securego/gosec/cmd/gosec \
 		github.com/motemen/gobump/cmd/gobump \
 		github.com/Songmu/make2help/cmd/make2help
 
 ## Run tests
 .PHONY: test
 test: deps
-	go test ./...
+	go test -v -count=1 -cover ./...
+
+.PHONY: cov
+cov:
+	go test -coverprofile=cover.out ./...
+	go tool cover -html=cover.out
 
 ## Lint
 .PHONY: lint
 lint: devel-deps
 	go vet ./...
+	staticcheck ./...
+	errcheck ./...
+	# exclude G106: Audit the use of ssh.InsecureIgnoreHostKey
+	gosec -quiet -exclude=G106 ./... 
 	golint -set_exit_status ./...
 
 ## build binaries ex. make bin/omssh
@@ -50,10 +63,10 @@ help:
 .PHONY: clean
 clean:
 	rm -f bin/${NAME}
-	rm -f pkg/*
 
 .PHONY: release
 release:
 	@git tag v$(VERSION)
 	@git push --tags
 	goreleaser --rm-dist
+