Merge pull request #15 from spiegel-im-spiegel/refactoring-and-testing

Fix warning of lint S1017

Author: spiegel-im-spiegel

.github/workflows/codeql-analysis.yml

@@ -36,18 +36,13 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.16
+          go-version: ^1.17
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -21,4 +21,4 @@ jobs:
           # Optional: golangci-lint command line arguments.
           args: --enable gosec
       - name: testing
-        run: go test ./...
+        run: go test -shuffle on ./...

.github/workflows/vulns.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.16
+          go-version: ^1.17
       - name: WriteGoList
         run: go list -json -m all > go.list
       - name: Nancy

.gitignore

@@ -1,24 +1,18 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
+# Binaries for programs and plugins
 *.exe
-*.test
-*.prof
+*.exe~
+*.dll
+*.so
+*.dylib
 
-# Folders
-_obj
-_test
-vendor/
+# Test binary, built with `go test -c`
+*.test
 
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
 
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
+# Dependency directories (remove the comment below to include it)
+# vendor/
 
-_testmain.go
+# Other directories and files
+.task/

Taskfile.yml

@@ -0,0 +1,22 @@
+version: '3'
+
+tasks:
+  default:
+    cmds:
+      - task: clean
+      - task: test
+
+  test:
+    desc: Test and lint.
+    cmds:
+      - go mod verify
+      - go test -shuffle on ./...
+      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.42.0 golangci-lint run --enable gosec --timeout 3m0s ./...
+    sources:
+      - ./go.mod
+      - '**/*.go'
+
+  clean:
+    desc: Initialize module and build cache, and remake go.sum file.
+    cmds:
+      - go mod tidy -v -go=1.17

clean-all.sh

@@ -145,9 +145,7 @@ func getRoots(rootDir string) []string {
 	if len(rootDir) == 0 {
 		return []string{""}
 	}
-	if strings.HasSuffix(rootDir, "/") {
-		rootDir = rootDir[:len(rootDir)-1]
-	}
+	rootDir = strings.TrimSuffix(rootDir, "/")
 	roots := []string{}
 	if paths, err := filepath.Glob(rootDir); err == nil {
 		for _, path := range paths {

file/glob.go

@@ -1,3 +1,3 @@
 module github.com/spiegel-im-spiegel/gocli
 
-go 1.16
+go 1.17