Merge pull request #2 from jsightapi/task/SERV-83

Make gogetable

Author: add2

.gitignore

@@ -2,4 +2,3 @@
 *.iml
 .env
 /jsight-server
-

.golangci.yml

@@ -36,7 +36,7 @@ linters-settings:
   gocyclo:
     min-complexity: 15
   goimports:
-    local-prefixes: github.com/golangci/golangci-lint
+    local-prefixes: github.com/jsightapi/jsight-server
   gomnd:
     # List of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
     checks:
@@ -98,7 +98,7 @@ linters:
     - gocritic
     - gocyclo
     - gofmt
-#    - goimports
+    - goimports
     - gomnd
     - goprintffuncname
     - gosec
@@ -156,4 +156,4 @@ run:
     - test/testdata_etc
     - internal/cache
     - internal/renameio
-    - internal/robustio
+    - internal/robustio

Dockerfile

@@ -1,34 +1,14 @@
 FROM golang:1.17-alpine as builder
 
-RUN apk add --no-cache git
-ARG GITHUB_TOKEN
-# Install jschema library dependency
-ARG JSCHEMA_BRANCH
-WORKDIR /go/src/j/schema
-RUN git clone -b ${JSCHEMA_BRANCH} --depth 1 \
-          https://${GITHUB_TOKEN}@github.com/jsightapi/jsight-schema-go-library.git . \
-    && git branch --show-current \
-    && git show -s
-
-# Install japi library dependency
-ARG JAPI_BRANCH
-WORKDIR /go/src/j/japi
-RUN git clone -b ${JAPI_BRANCH} --depth 1 \
-          https://${GITHUB_TOKEN}@github.com/jsightapi/jsight-api-go-library.git . \
-    && git branch --show-current \
-    && git show -s
-
-# build
-WORKDIR /go/src/j/server
+WORKDIR /go/src/github.com/jsightapi/jsight-server
 COPY . .
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o jsight-server .
-
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /go/bin/jsight-server .
 
-FROM alpine
+FROM scratch
 ARG CORS
 ARG STATISTICS
 ENV JSIGHT_SERVER_CORS=$CORS
 ENV JSIGHT_SERVER_STATISTICS=$STATISTICS
-COPY --from=builder /go/src/j/server/jsight-server .
+COPY --from=builder /go/bin/jsight-server .
 EXPOSE 8080
 CMD [ "/jsight-server" ]

Makefile

@@ -9,6 +9,10 @@ fmt:
 lint:
 	golangci-lint run
 
+.PHONY: test
+test:
+	go test -cover ./...
+
 .PHONY: build
 build:
 	go build -o jsight-server .

cors.go

@@ -1,6 +1,8 @@
 package main
 
-import "net/http"
+import (
+	"net/http"
+)
 
 func cors(w http.ResponseWriter) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")

cors_test.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_cors(t *testing.T) {
+	t.Run("positive", func(t *testing.T) {
+		r := httptest.NewRecorder()
+
+		cors(r)
+
+		assert.Equal(t, http.StatusOK, r.Code)
+		assert.Len(t, r.Header(), 3)
+		assert.Equal(t, "*", r.Header().Get("Access-Control-Allow-Origin"))
+		assert.Equal(t, "POST, GET, OPTIONS, PUT, DELETE", r.Header().Get("Access-Control-Allow-Methods"))
+		assert.Equal(t, "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, X-Browser-UUID", r.Header().Get("Access-Control-Allow-Headers")) //nolint:lll
+	})
+
+	t.Run("negative", func(t *testing.T) {
+		assert.Panics(t, func() {
+			cors(nil)
+		})
+	})
+}

env_test.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_getBoolEnv(t *testing.T) {
+	const env = "JSIGHT_GET_BOOL_ENV_TEST"
+
+	cc := map[string]bool{
+		"":        false,
+		"invalid": false,
+		"false":   false,
+		"true":    true,
+		"True":    true,
+		"TRUE":    true,
+		"1":       true,
+		"t":       true,
+	}
+
+	for given, expected := range cc {
+		t.Run(given, func(t *testing.T) {
+			require.NoError(t, os.Setenv(env, given))
+
+			assert.Equal(t, expected, getBoolEnv(env))
+		})
+	}
+
+	require.NoError(t, os.Unsetenv(env))
+}

error_info.go

@@ -2,7 +2,8 @@ package main
 
 import (
 	"errors"
-	"j/japi/jerr"
+
+	"github.com/jsightapi/jsight-api-go-library/jerr"
 )
 
 type errorInfo struct {

error_info_test.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/jsightapi/jsight-api-go-library/jerr"
+	"github.com/jsightapi/jsight-schema-go-library/fs"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_newErrorInfo(t *testing.T) {
+	t.Run("positive", func(t *testing.T) {
+		cc := map[string]struct {
+			given    error
+			expected errorInfo
+		}{
+			"ordinal error": {
+				errors.New("fake error"),
+				errorInfo{
+					Status:  "Error",
+					Message: "fake error",
+				},
+			},
+
+			"JAPI error": {
+				jerr.NewJAPIError("fake error", fs.NewFile("foo", []byte("123")), 2),
+				errorInfo{
+					Status:  "Error",
+					Message: "fake error",
+					Line:    1,
+					Index:   2,
+				},
+			},
+		}
+
+		for n, c := range cc {
+			t.Run(n, func(t *testing.T) {
+				actual := newErrorInfo(c.given)
+				assert.Equal(t, c.expected, actual)
+			})
+		}
+	})
+
+	t.Run("negative", func(t *testing.T) {
+		assert.Panics(t, func() {
+			newErrorInfo(nil)
+		})
+	})
+}

go.mod

@@ -1,14 +1,16 @@
-module j/server
+module github.com/jsightapi/jsight-server
 
 go 1.17
 
-replace j/japi => ./../japi
-
-replace j/schema => ./../schema
-
-require j/japi v0.0.0-00010101000000-000000000000
+require (
+	github.com/jsightapi/jsight-api-go-library v0.3.1-0.20220427155423-7c489a57b5aa
+	github.com/jsightapi/jsight-schema-go-library v0.0.0-20220426180928-6a830af498a5
+	github.com/stretchr/testify v1.7.0
+)
 
 require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
 	github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb // indirect
-	j/schema v0.0.0-00010101000000-000000000000 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )