Migrate dep to go modules (#69)

* Migrating from dep to Go modules

* Playing with code coverage Github workflow

* Still playing with Github workflow

* Added removed GOPATH

* Adding debug job to Github workflow

* replaced GOPATH with actual path to go.

* Moved GOPATH env to the code coverage job

* Added a comment to code coverage workflow

* Updated build workflow

* Replaced gometalinter with golangci-lint

* Added working-directory under golangci-lint

* Fixed issue raised by golangci linter.

* Added GOPATH to sonar cloud job

* Added checkout action after setup.

* Adding checkout step above SonarCloud scan

* Added projectBaseDir under SonarCloud job. Updated action/checkout to v4. Remvoed Gopkg.lock and Gopkg.toml.

* Included Go 1.16.

* Added 1.15 and 1.6 for testing as some merchants are using it.

* Remove 1.16, 1.15, 1.16 from workflow.

* Removed 1.16 from v1-ci.yml

* Added -v option in test command to show details of the tests.

* Updated FixtureBasePath and removed unused dependency from go.mod.

* Remove annoying cache error message in Github workflow

---------

Co-authored-by: Aashish <aashish@omise.co>

.github/scripts/code-coverage.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 GOPATH=`go env GOPATH 2>/dev/null`
-go test ./...  -coverprofile cover.out
+go test -v ./...  -coverprofile cover.out

.github/scripts/setup.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-go get github.com/alecthomas/gometalinter && gometalinter --install
 go generate . ./operations
 go install . ./operations

.github/scripts/test.sh

@@ -37,9 +37,7 @@ perform() {
 }
 
 check go                       "needs go from http://golang.org"
-check $GOPATH/bin/gometalinter "needs gometalinter from https://github.com/alecthomas/gometalinter"
 
-perform linters    gometalinter --fast --aggregate
-perform tests      go test ./...
+perform tests      go test -v ./...
 
 echo "\x1B[38;5;2msuccess.\x1B[0m"

.github/workflows/code-coverage.yml

@@ -10,21 +10,29 @@ jobs:
     env:
       GOPATH: ${{ github.workspace }}
       WORKDIR: src/github.com/${{ github.repository }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
 
+    strategy:
+      matrix:
+        go: [ '1.21', '1.20', '1.19', '1.18', '1.17' ]
+    steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v4
         with:
-          go-version: "1.15" # Old Go version needed to run "go test"
+          go-version: ${{ matrix.go }}
+          cache: false
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           path: ${{ env.WORKDIR }}
 
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.54
+          working-directory: ${{ env.WORKDIR }}
+
       - name: Build
         working-directory: ${{ env.WORKDIR }}
         run: .github/scripts/setup.sh
@@ -38,6 +46,8 @@ jobs:
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
+        with:
+          projectBaseDir: ${{ env.WORKDIR }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/v1-ci.yml

@@ -11,32 +11,39 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     env:
-      GOPATH: ${{ github.workspace }}
       WORKDIR: src/github.com/${{ github.repository }}
 
     strategy:
       matrix:
-        go: [ '1.15', '1.14', '1.13', '1.12' ]
+        go: [ '1.21', '1.20', '1.19', '1.18', '1.17' ]
 
     steps:
-
-    - name: Set up Go ${{ matrix.go }}
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go }}
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-      with:
-        path: ${{ env.WORKDIR }}
-
-    - name: Build
-      working-directory: ${{ env.WORKDIR }}
-      run: .github/scripts/setup.sh
-
-    - name: Test
-      working-directory: ${{ env.WORKDIR }}
-      env:
-        OMISE_PKEY: pkey_test_xxx
-        OMISE_SKEY: skey_test_xxx
-      run: .github/scripts/test.sh
+      - name: Set up Go ${{ matrix.go }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go }}
+          cache: false
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          path: ${{ env.WORKDIR }}
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.54
+          working-directory: ${{ env.WORKDIR }}
+
+      - name: Build
+        working-directory: ${{ env.WORKDIR }}
+        run: .github/scripts/setup.sh
+
+      - name: Test
+        working-directory: ${{ env.WORKDIR }}
+        env:
+          OMISE_PKEY: pkey_test_xxx
+          OMISE_SKEY: skey_test_xxx
+          GOPATH: ${{ github.workspace }}
+        run: .github/scripts/test.sh

client.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"go/build"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 
@@ -178,7 +178,7 @@ func (c *Client) Do(result interface{}, operation internal.Operation) error {
 		return err
 	}
 
-	buffer, err := ioutil.ReadAll(resp.Body)
+	buffer, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return &ErrTransport{err, buffer}
 	}

client_test.go

@@ -14,16 +14,6 @@ import (
 	r "github.com/stretchr/testify/require"
 )
 
-var createTokenOp = &operations.CreateToken{
-	Name:            "Chakrit Wichian",
-	Number:          "4242424242424242",
-	ExpirationMonth: 2,
-	ExpirationYear:  2018,
-	SecurityCode:    "123",
-	City:            "Bangkok",
-	PostalCode:      "10210",
-}
-
 func TestNewClient(t *testing.T) {
 	pkey, skey := testutil.Keys()
 

go.mod

@@ -0,0 +1,5 @@
+module github.com/omise/omise-go
+
+go 1.16
+
+require github.com/stretchr/testify v1.8.4

go.sum

@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/endpoint.go

@@ -4,5 +4,5 @@ type Endpoint string
 
 const (
 	API   Endpoint = "https://api.omise.co"
-	Vault          = "https://vault.omise.co"
+	Vault Endpoint = "https://vault.omise.co"
 )

internal/testutil/fixtures_path.go

@@ -1,26 +1,26 @@
 package testutil
 
 import (
-	"go/build"
 	"net/http"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 )
 
-var FixtureBasePath = filepath.Join(
-	build.Default.GOPATH,
-	"src",
-	"github.com/omise/omise-go",
-	"testdata/fixtures",
-)
+func FixtureBasePath() string {
+	_, b, _, _ := runtime.Caller(0)
+	parentDir := strings.Replace(filepath.Dir(b), "internal/testutil", "", -1)
+	return filepath.Join(parentDir, "testdata/fixtures")
+}
 
 func FixturePath(req *http.Request) (int, string, error) {
 	fixpath := req.URL.Host + "/" +
 		req.URL.Path[1:] + "-" + strings.ToLower(req.Method) + ".json"
 
 	// resolve exact fixture filename
-	filename := filepath.Join(FixtureBasePath, fixpath)
+	filename := filepath.Join(FixtureBasePath(), fixpath)
+
 	if _, err := os.Lstat(filename); err != nil {
 		if !os.IsNotExist(err) {
 			return 500, "", err

internal/testutil/fixtures_transport.go

@@ -12,7 +12,7 @@ type FixturesTransport struct {
 }
 
 func NewFixturesTransport() (*FixturesTransport, error) {
-	backing := http.NewFileTransport(http.Dir(FixtureBasePath))
+	backing := http.NewFileTransport(http.Dir(FixtureBasePath()))
 	return &FixturesTransport{backing}, nil
 }
 

internal/testutil/fixtures_transport_test.go

@@ -1,8 +1,9 @@
 package testutil
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -39,10 +40,10 @@ func (test *fixturesHTTPTest) Test(t *testing.T) {
 	r.Equal(t, test.statusCode, resp.StatusCode)
 
 	defer resp.Body.Close()
-	respBytes, err := ioutil.ReadAll(resp.Body)
+	respBytes, err := io.ReadAll(resp.Body)
 	r.NoError(t, err)
 
-	fixBytes, err := ioutil.ReadFile(filepath.Join(FixtureBasePath, test.filename))
+	fixBytes, err := os.ReadFile(filepath.Join(FixtureBasePath(), test.filename))
 	r.NoError(t, err)
 	r.Equal(t, string(fixBytes), string(respBytes))
 }

internal/testutil/recorder_transport.go

@@ -3,7 +3,6 @@ package testutil
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -29,20 +28,20 @@ func (transport *RecorderTransport) RoundTrip(req *http.Request) (*http.Response
 		return resp, err
 	}
 
-	file, err := os.Create(filepath.Join(FixtureBasePath, fixpath))
+	file, err := os.Create(filepath.Join(FixtureBasePath(), fixpath))
 	if err != nil {
 		return resp, err
 	}
 
 	reader := resp.Body
 	defer reader.Close()
 
-	buffer, err := ioutil.ReadAll(reader)
+	buffer, err := io.ReadAll(reader)
 	if err != nil {
 		return resp, err
 	}
 
-	resp.Body = ioutil.NopCloser(bytes.NewBuffer(buffer))
+	resp.Body = io.NopCloser(bytes.NewBuffer(buffer))
 	if _, err := io.Copy(file, bytes.NewBuffer(buffer)); err != nil {
 		return resp, err
 	}

internal/testutil/testutil.go

@@ -28,7 +28,7 @@ func Main(m *testing.M) {
 }
 
 func LogObj(t *testing.T, obj interface{}) {
-	t.Log(fmt.Sprintf("%#v", obj))
+	t.Logf(fmt.Sprintf("%#v", obj))
 }
 
 func Require(t *testing.T, env string) {

json_test.go

@@ -2,7 +2,7 @@ package omise_test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"reflect"
 	"testing"
 
@@ -37,7 +37,7 @@ type JSONRoundtripTest struct {
 func (test JSONRoundtripTest) Test(t *testing.T) {
 	t.Log(reflect.ValueOf(test.value).Elem().Type().Name())
 
-	inbytes, err := ioutil.ReadFile("testdata/objects/" + test.srcFile)
+	inbytes, err := os.ReadFile("testdata/objects/" + test.srcFile)
 	r.NoError(t, err)
 
 	err = json.Unmarshal(inbytes, test.value)