Engine Playmon

.goreleaser.yml

@@ -11,35 +11,27 @@ builds:
     gobinary: garble
     env:
       - CGO_ENABLED=0
-    ldflags:
-      - -X 'github.com/graph-guard/ggproxy/lvs.PublicKey={{ .Env.PUB_KEY }}'
     goos:
       - linux
       - darwin
     goarch:
-      - 386
-      - amd64
-      - arm
-      - arm64
+      - "386"
+      - "amd64"
+      - "arm"
+      - "arm64"
 archives:
   - id: ggproxy
     name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
     replacements:
-      386: i386
-    files:
-      - src: assets/etc/
-        info:
-          owner: root
-          group: ggproxy
-          mode: 0664
+      "386": "i386"
 checksum:
   name_template: "{{ .ProjectName }}-{{ .Tag }}-checksums.txt"
 snapshot:
   name_template: "{{ .Tag }}"
 release:
   draft: false
   replace_existing_draft: true
-  prerelease: true
+  prerelease: "true" # Don't remove the quotes, it's supposed to be a string, not a boolean.
   mode: append
   header: |
     **[CHANGELOG.md](https://github.com/graph-guard/ggproxy/blob/ci/CHANGELOG.md#{{ .Env.COMPACT_TAG }})**

CHANGELOG.md

@@ -29,7 +29,6 @@
 ### Fix
 
 * Fix comparison of byte slices
-* Fix lvs failure on empty license
 * Reset segmented array index counter
 * Accept enum values
 * Fix broken pipe handling
@@ -77,8 +76,6 @@
 * Add 'null' support
 * Add processing of enums
 * Prepare to Beta release
-* Use LVS validation and rename 'licence' to 'license'
-* Add licence key environment variable
 * Add support for basic auth in API server
 * Add service and template statistics
 * Add ggproxy GraphQL API
@@ -107,7 +104,6 @@
 
 ### Refactor
 
-* Refactor LVS ([#4](https://github.com/graph-guard/ggproxy/issues/4))
 * Get rid of the matcher interface
 * Simplify code
 

cmd/ggproxy/main.go

@@ -4,20 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/graph-guard/ggproxy/cli"
-	"github.com/graph-guard/ggproxy/lvs"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func main() {
 	w := os.Stdout
-	switch c := cli.Parse(
-		w,
-		os.Args,
-		func(licenseToken string) error {
-			_, err := lvs.ValidateLicenseToken(licenseToken)
-			return err
-		},
-	).(type) {
+	switch c := cli.Parse(w, os.Args).(type) {
 	case cli.CommandServe:
 		serve(w, c)
 	case cli.CommandReload:

cmd/ggproxy/read_config.go

@@ -3,15 +3,18 @@ package main
 import (
 	"fmt"
 	"io"
+	"os"
+	"path/filepath"
 
-	"github.com/graph-guard/ggproxy/config"
+	"github.com/graph-guard/ggproxy/pkg/config"
 )
 
 func ReadConfig(
 	w io.Writer,
 	configPath string,
 ) *config.Config {
-	conf, err := config.New(configPath)
+	basePath, fileName := basePathAndFileName(configPath)
+	conf, err := config.Read(os.DirFS(basePath), basePath, fileName)
 	if err != nil {
 		fmt.Fprintf(w, "reading config: %s\n", err)
 		return nil
@@ -34,3 +37,7 @@ func ReadConfig(
 
 	return conf
 }
+
+func basePathAndFileName(path string) (basePath, fileName string) {
+	return filepath.Base(path), path[:len(path)-len(filepath.Base(path))]
+}

cmd/ggproxy/reload_unix.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/graph-guard/ggproxy/cli"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func reload(w io.Writer, c cli.CommandReload) {

cmd/ggproxy/reload_windows.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io"
 
-	"github.com/graph-guard/ggproxy/cli"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func reload(w io.Writer, c cli.CommandReload) {

cmd/ggproxy/serve_unix.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/graph-guard/ggproxy/cli"
-	"github.com/graph-guard/ggproxy/server"
+	"github.com/graph-guard/ggproxy/pkg/cli"
+	"github.com/graph-guard/ggproxy/pkg/server"
 	"github.com/phuslu/log"
 )
 

cmd/ggproxy/serve_windows.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io"
 
-	"github.com/graph-guard/ggproxy/cli"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func serve(w io.Writer, c cli.CommandServe) {

cmd/ggproxy/stop_unix.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/graph-guard/ggproxy/cli"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func stop(w io.Writer, c cli.CommandStop) {

cmd/ggproxy/stop_windows.go

@@ -3,7 +3,7 @@ package main
 import (
 	"io"
 
-	"github.com/graph-guard/ggproxy/cli"
+	"github.com/graph-guard/ggproxy/pkg/cli"
 )
 
 func stop(w io.Writer, c cli.CommandStop) {