Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove deprecated endpoints #436

Merged
merged 7 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export VITE_WASM_BASE_URL=/wasm
.PHONY:run
run:
@GOROOT=$(GOROOT) APP_SKIP_MOD_CLEANUP=true $(GO) run $(PKG) \
-f ./data/packages.json \
-static-dir="$(UI)/build" \
-gtag-id="$(GTAG)" \
-debug=$(DEBUG) \
Expand Down
2 changes: 0 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,11 @@ ENV APP_CLEAN_INTERVAL=10m
ENV APP_DEBUG=false
ENV APP_PLAYGROUND_URL='https://go.dev/_'
ENV APP_GTAG_ID=''
COPY data ./data
COPY --from=ui-build /tmp/web/build ./public
COPY --from=build /tmp/playground/server .
COPY --from=build /tmp/playground/*.wasm ./public/wasm/
COPY --from=build /tmp/playground/*.js ./public/wasm/
COPY --from=build /tmp/playground/data ./public/data
EXPOSE 8000
ENTRYPOINT /opt/playground/server \
-f='/opt/playground/data/packages.json' \
-addr=:8000
2 changes: 0 additions & 2 deletions build/release.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ ENV APP_CLEAN_INTERVAL=10m
ENV APP_DEBUG=false
ENV APP_PLAYGROUND_URL='https://go.dev/_'
ENV APP_GTAG_ID=''
COPY data ./data
COPY web/build ./public
COPY --from=build /tmp/playground/server .
EXPOSE 8000
ENTRYPOINT /opt/playground/server \
-f='/opt/playground/data/packages.json' \
-addr=:8000
19 changes: 3 additions & 16 deletions cmd/playground/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

"github.com/gorilla/mux"
"github.com/x1unix/foundation/app"
"github.com/x1unix/go-playground/internal/analyzer"
"github.com/x1unix/go-playground/internal/builder"
"github.com/x1unix/go-playground/internal/builder/storage"
"github.com/x1unix/go-playground/internal/config"
Expand All @@ -37,33 +36,21 @@ func main() {
cmdutil.FatalOnError(err)
}
zap.ReplaceGlobals(logger)
analyzer.SetLogger(logger)
defer logger.Sync() //nolint:errcheck

if err := cfg.Validate(); err != nil {
logger.Fatal("invalid server configuration", zap.Error(err))
}

goRoot, err := builder.GOROOT()
if err != nil {
logger.Fatal("Failed to find GOROOT environment variable value", zap.Error(err))
}

if err := start(goRoot, logger, cfg); err != nil {
if err := start(logger, cfg); err != nil {
logger.Fatal("Failed to start application", zap.Error(err))
}
}

func start(goRoot string, logger *zap.Logger, cfg *config.Config) error {
func start(logger *zap.Logger, cfg *config.Config) error {
logger.Info("Starting service",
zap.String("version", Version), zap.Any("config", cfg))

analyzer.SetRoot(goRoot)
packages, err := analyzer.ReadPackagesFile(cfg.Build.PackagesFile)
if err != nil {
return fmt.Errorf("failed to read packages file %q: %s", cfg.Build.PackagesFile, err)
}

store, err := storage.NewLocalStorage(logger, cfg.Build.BuildDir)
if err != nil {
return err
Expand Down Expand Up @@ -93,7 +80,7 @@ func start(goRoot string, logger *zap.Logger, cfg *config.Config) error {
r := mux.NewRouter()
apiRouter := r.PathPrefix("/api").Subrouter()
svcCfg := server.ServiceConfig{Version: Version}
server.NewAPIv1Handler(svcCfg, playgroundClient, packages, buildSvc).
server.NewAPIv1Handler(svcCfg, playgroundClient, buildSvc).
Mount(apiRouter)

apiv2Router := apiRouter.PathPrefix("/v2").Subrouter()
Expand Down
1,292 changes: 0 additions & 1,292 deletions data/packages.json

This file was deleted.

83 changes: 0 additions & 83 deletions internal/analyzer/analyzer.go

This file was deleted.

124 changes: 0 additions & 124 deletions internal/analyzer/analyzer_test.go

This file was deleted.

4 changes: 3 additions & 1 deletion internal/analyzer/check/check.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package check

import (
"errors"
"go/parser"
"go/scanner"
"go/token"
Expand All @@ -14,7 +15,8 @@ func Check(src string) (*Result, error) {
return &Result{HasErrors: false}, nil
}

if errList, ok := err.(scanner.ErrorList); ok {
var errList scanner.ErrorList
if errors.As(err, &errList) {
return &Result{HasErrors: true, Markers: errorsListToMarkers(errList)}, nil
}

Expand Down
15 changes: 15 additions & 0 deletions internal/analyzer/check/check_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package check

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestCheck(t *testing.T) {
got, err := Check("testdata/bad.txt")
require.NoError(t, err)
require.NotNil(t, got)
require.True(t, got.HasErrors)
require.NotEmpty(t, got.Markers)
}
43 changes: 8 additions & 35 deletions internal/analyzer/check/marker.go
Original file line number Diff line number Diff line change
@@ -1,44 +1,17 @@
// Package check checks provided Go code and reports syntax errors
package check

import "go/scanner"
import (
"go/scanner"

// MarkerSeverity is equivalent for MarkerSeverity type in monaco-editor
type MarkerSeverity = int

const (
// Hint is marker severity from monaco-editor
Hint = MarkerSeverity(1)
// Info is marker severity from monaco-editor
Info = MarkerSeverity(2)
// Warning is marker severity from monaco-editor
Warning = MarkerSeverity(3)
// Error is marker severity from monaco-editor
Error = MarkerSeverity(8)
"github.com/x1unix/go-playground/pkg/monaco"
)

// MarkerData is a structure defining a problem/warning/etc.
// Equivalent to IMarkerData in 'monaco-editor'
type MarkerData struct {
// Severity is marker severity
Severity MarkerSeverity `json:"severity"`
// StartLineNumber is start line number
StartLineNumber int `json:"startLineNumber"`
// StartColumn is start column
StartColumn int `json:"startColumn"`
// EndLineNumber is end line number
EndLineNumber int `json:"endLineNumber"`
// EndColumn is end column
EndColumn int `json:"endColumn"`
// Message is marker message
Message string `json:"message"`
}

func errorsListToMarkers(errList scanner.ErrorList) []MarkerData {
markers := make([]MarkerData, 0, len(errList))
func errorsListToMarkers(errList scanner.ErrorList) []monaco.MarkerData {
markers := make([]monaco.MarkerData, 0, len(errList))
for _, err := range errList {
markers = append(markers, MarkerData{
Severity: Error,
markers = append(markers, monaco.MarkerData{
Severity: monaco.Error,
Message: err.Msg,
StartLineNumber: err.Pos.Line,
EndLineNumber: err.Pos.Line,
Expand All @@ -56,5 +29,5 @@ type Result struct {
HasErrors bool `json:"hasErrors"`

// Markers is list of marker data
Markers []MarkerData `json:"markers"`
Markers []monaco.MarkerData `json:"markers"`
}
3 changes: 3 additions & 0 deletions internal/analyzer/check/testdata/bad.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package main

func foo() {
Loading