Skip to content

Commit

Permalink
chore: bump to v2
Browse files Browse the repository at this point in the history
Signed-off-by: Neko Ayaka <neko@ayaka.moe>
  • Loading branch information
nekomeowww committed Nov 4, 2024
1 parent 37333cb commit ab3905a
Show file tree
Hide file tree
Showing 32 changed files with 78 additions and 77 deletions.
7 changes: 4 additions & 3 deletions apis/factorioapi/v1/command.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/factorioapi/v1/command.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package apis.factorioapi.v1;
import "google/api/annotations.proto";
import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1";
option go_package = "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1";

message CommandRawRequest {
string input = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {example: "\"/c game.player.zoom=0.1\""}]; // The input for the command. For example, it will be formatted and executed with `/c game.player.zoom=0.1`.
Expand Down
8 changes: 4 additions & 4 deletions apis/factorioapi/v1/v1.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/factorioapi/v1/v1.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package apis.factorioapi.v1;

import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1";
option go_package = "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1";
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: {
title: "Factorio RCON API";
Expand Down
10 changes: 5 additions & 5 deletions apis/factorioapi/v2/command.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/factorioapi/v2/command.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package apis.factorioapi.v2;
import "google/api/annotations.proto";
import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2";
option go_package = "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2";

message CommandRawRequest {
string input = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {example: "\"/c game.player.zoom=0.1\""}]; // The input for the command. For example, it will be formatted and executed with `/c game.player.zoom=0.1`.
Expand Down
10 changes: 5 additions & 5 deletions apis/factorioapi/v2/v2.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/factorioapi/v2/v2.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package apis.factorioapi.v2;

import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2";
option go_package = "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2";
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: {
title: "Factorio RCON API";
Expand Down
6 changes: 3 additions & 3 deletions apis/jsonapi/jsonapi.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/jsonapi/jsonapi.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package apis.jsonapi;
import "google/protobuf/any.proto";
import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/nekomeowww/factorio-rcon-api/apis/jsonapi";
option go_package = "github.com/nekomeowww/factorio-rcon-api/v2/apis/jsonapi";

// Where specified, a links member can be used to represent links.
message Links {
Expand Down
12 changes: 6 additions & 6 deletions cmd/api-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (

"go.uber.org/fx"

"github.com/nekomeowww/factorio-rcon-api/internal/configs"
grpcservers "github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers"
apiserver "github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers/factorioapi/apiserver"
grpcservices "github.com/nekomeowww/factorio-rcon-api/internal/grpc/services"
"github.com/nekomeowww/factorio-rcon-api/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/internal/rcon"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/configs"
grpcservers "github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers"
apiserver "github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers/factorioapi/apiserver"
grpcservices "github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/services"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/rcon"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nekomeowww/factorio-rcon-api
module github.com/nekomeowww/factorio-rcon-api/v2

go 1.23

Expand Down
2 changes: 1 addition & 1 deletion internal/configs/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/mitchellh/mapstructure"
"github.com/nekomeowww/factorio-rcon-api/internal/meta"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/meta"
"github.com/nekomeowww/xo"
"github.com/samber/lo"
"github.com/spf13/viper"
Expand Down
14 changes: 7 additions & 7 deletions internal/grpc/servers/factorioapi/apiserver/grpc_gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/nekomeowww/factorio-rcon-api/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers/interceptors"
"github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers/middlewares"
"github.com/nekomeowww/factorio-rcon-api/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/internal/rcon"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/pkg/grpc"
httppkg "github.com/nekomeowww/factorio-rcon-api/pkg/http"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers/interceptors"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers/middlewares"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/rcon"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/v2/pkg/grpc"
httppkg "github.com/nekomeowww/factorio-rcon-api/v2/pkg/http"
)

type NewGatewayServerParams struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/grpc/servers/factorioapi/apiserver/grpc_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"go.uber.org/zap"
"google.golang.org/grpc"

"github.com/nekomeowww/factorio-rcon-api/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers/interceptors"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/pkg/grpc"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers/interceptors"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/v2/pkg/grpc"
)

type NewGRPCServerParams struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/servers/interceptors/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"net/http"

"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"google.golang.org/grpc/metadata"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/servers/interceptors/cookie.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"strings"

"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/nekomeowww/fo"
"google.golang.org/grpc/metadata"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/servers/interceptors/error_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"

"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/nekomeowww/factorio-rcon-api/apis/jsonapi"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/apis/jsonapi"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/nekomeowww/xo/logger"
"go.uber.org/zap"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/servers/interceptors/panic.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"runtime/debug"

"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/nekomeowww/xo/logger"
"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/servers/middlewares/route_not_found.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/labstack/echo/v4"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
)

func NotFound(c echo.Context) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/servers/middlewares/scalar.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/MarceloPetrucio/go-scalar-api-reference"
"github.com/labstack/echo/v4"
v1 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
v1 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
)

func ScalarDocumentation(title string) echo.HandlerFunc {
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/servers/servers.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package servers

import (
"github.com/nekomeowww/factorio-rcon-api/internal/grpc/servers/factorioapi/apiserver"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/servers/factorioapi/apiserver"
"go.uber.org/fx"
)

Expand Down
10 changes: 5 additions & 5 deletions internal/grpc/services/factorioapi/factorioapi.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package factorioapi

import (
factorioapiv1 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1"
factorioapiv2 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2"
consolev1 "github.com/nekomeowww/factorio-rcon-api/internal/grpc/services/factorioapi/v1/console"
consolev2 "github.com/nekomeowww/factorio-rcon-api/internal/grpc/services/factorioapi/v2/console"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/pkg/grpc"
factorioapiv1 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1"
factorioapiv2 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2"
consolev1 "github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/services/factorioapi/v1/console"
consolev2 "github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/services/factorioapi/v2/console"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/v2/pkg/grpc"
"go.uber.org/fx"
"google.golang.org/grpc/reflection"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/grpc/services/factorioapi/v1/console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strconv"
"strings"

v1 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1"
"github.com/nekomeowww/factorio-rcon-api/internal/rcon"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/pkg/utils"
v1 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/rcon"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/utils"
"github.com/nekomeowww/xo/logger"
"github.com/samber/lo"
"go.uber.org/fx"
Expand Down
8 changes: 4 additions & 4 deletions internal/grpc/services/factorioapi/v2/console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strconv"
"strings"

v2 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/internal/rcon"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/pkg/utils"
v2 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/rcon"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/utils"
"github.com/nekomeowww/xo/logger"
"github.com/samber/lo"
"go.uber.org/fx"
Expand Down
6 changes: 3 additions & 3 deletions internal/grpc/services/factorioapi/v2/console/console_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"testing"

v2 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/internal/rcon/fake"
v2 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/libs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/rcon/fake"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc/status"
Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/services/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"go.uber.org/fx"
"google.golang.org/grpc/reflection"

"github.com/nekomeowww/factorio-rcon-api/internal/grpc/services/factorioapi"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/pkg/grpc"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/grpc/services/factorioapi"
grpcpkg "github.com/nekomeowww/factorio-rcon-api/v2/pkg/grpc"
)

func Modules() fx.Option {
Expand Down
2 changes: 1 addition & 1 deletion internal/libs/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"go.uber.org/fx"
"go.uber.org/zap"

"github.com/nekomeowww/factorio-rcon-api/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/configs"
"github.com/nekomeowww/xo/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/rcon/fake/rcon.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/rcon/rcon.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/cenkalti/backoff/v4"
"github.com/gorcon/rcon"
"github.com/nekomeowww/factorio-rcon-api/internal/configs"
"github.com/nekomeowww/factorio-rcon-api/v2/internal/configs"
"github.com/nekomeowww/fo"
"github.com/nekomeowww/xo/logger"
"github.com/samber/lo"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apierrors/apierrors.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/bufbuild/protovalidate-go"
"github.com/labstack/echo/v4"
"github.com/nekomeowww/factorio-rcon-api/apis/jsonapi"
"github.com/nekomeowww/factorio-rcon-api/v2/apis/jsonapi"
"github.com/samber/lo"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
6 changes: 3 additions & 3 deletions pkg/utils/factorio.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strings"
"time"

v1 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v1"
v2 "github.com/nekomeowww/factorio-rcon-api/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
v1 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v1"
v2 "github.com/nekomeowww/factorio-rcon-api/v2/apis/factorioapi/v2"
"github.com/nekomeowww/factorio-rcon-api/v2/pkg/apierrors"
"github.com/samber/lo"
)

Expand Down

0 comments on commit ab3905a

Please sign in to comment.