From 4ac27b9c4d77e79c184841ecd06a4116dca8c30a Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Thu, 13 Apr 2023 17:49:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B?=
=?UTF-8?q?.=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D0=BD=D0=B5=D0=BD?=
=?UTF-8?q?=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC?=
=?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
=?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/environments/options.go | 18 ------------------
pkg/environments/service.go | 15 +--------------
pkg/environments/transport/client.microgen.go | 11 +++++------
.../transport/grpc/client.microgen.go | 12 +++++-------
.../protobuf_endpoint_converters.microgen.go | 11 +++++------
.../transport/grpc/server.microgen.go | 12 +++++-------
6 files changed, 21 insertions(+), 58 deletions(-)
diff --git a/pkg/environments/options.go b/pkg/environments/options.go
index 8d5e3b01..02f1a1fe 100644
--- a/pkg/environments/options.go
+++ b/pkg/environments/options.go
@@ -16,24 +16,6 @@ func MergeMigrateOptions(opts ...*MigrateOptions) *MigrateOptions {
return o
}
-//type SetStateOptions struct {
-//
-// // Состояние будет обновлено только в том случае, если выполняется указанное условие
-// Cond string
-//
-// // Состояние будет обновлено только в том случае, если текущее состояние равно одному из
-// // перечисленных в PrevState
-// PrevState []State
-//}
-//
-//func MergeSetStateOptions(opts ...*SetStateOptions) *SetStateOptions {
-// o := &SetStateOptions{}
-// for _, opt := range opts {
-// o.PrevState = append(o.PrevState, opt.PrevState...)
-// }
-// return o
-//}
-
type UpdateOptions struct {
// Состояние будет обновлено только в том случае, если выполняется указанное условие
diff --git a/pkg/environments/service.go b/pkg/environments/service.go
index 3be8cb3c..cd0a37f4 100644
--- a/pkg/environments/service.go
+++ b/pkg/environments/service.go
@@ -1,33 +1,20 @@
package environments
-//go:generate gowrap gen -i Environments -t ../../templates/middleware/middleware -o service/middleware.go
-//go:generate gowrap gen -i Environments -t ../../templates/middleware/error_log -o service/error_logging_middleware.go
-//go:generate gowrap gen -i Environments -t ../../templates/middleware/access_log -o service/logging_middleware.go
-//go:generate gowrap gen -i Environments -t ../../templates/middleware/recovery -o service/recovering_middleware.go
-//go:generate gowrap gen -i Environments -t ../../templates/middleware/telemetry -o service/telemetry_middleware.go
-
import (
"context"
)
// Environments
// @microgen grpc
-// @protobuf git.perx.ru/perxis/perxis/proto/environments
+// @protobuf git.perx.ru/perxis/perxis-go/proto/environments
// @grpc-addr content.environments.Environments
type Environments interface {
Create(ctx context.Context, env *Environment) (created *Environment, err error)
-
Get(ctx context.Context, spaceId, envId string) (env *Environment, err error)
-
List(ctx context.Context, spaceId string) (envs []*Environment, err error)
-
Update(ctx context.Context, env *Environment) (err error)
-
Delete(ctx context.Context, spaceId, envId string) (err error)
-
SetAlias(ctx context.Context, spaceId, envId, alias string) (err error)
-
RemoveAlias(ctx context.Context, spaceId, envId, alias string) (err error)
-
Migrate(ctx context.Context, spaceId, envId string, options ...*MigrateOptions) (err error)
}
diff --git a/pkg/environments/transport/client.microgen.go b/pkg/environments/transport/client.microgen.go
index 88634fd5..96094fda 100644
--- a/pkg/environments/transport/client.microgen.go
+++ b/pkg/environments/transport/client.microgen.go
@@ -3,13 +3,12 @@
package transport
import (
+ "context"
+ "errors"
-"context"
-"errors"
-
-environments "git.perx.ru/perxis/perxis-go/pkg/environments"
-codes "google.golang.org/grpc/codes"
-status "google.golang.org/grpc/status"
+ environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ codes "google.golang.org/grpc/codes"
+ status "google.golang.org/grpc/status"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *environments.Environment) (res0 *environments.Environment, res1 error) {
diff --git a/pkg/environments/transport/grpc/client.microgen.go b/pkg/environments/transport/grpc/client.microgen.go
index 2cc1f903..34e0fa4d 100644
--- a/pkg/environments/transport/grpc/client.microgen.go
+++ b/pkg/environments/transport/grpc/client.microgen.go
@@ -3,13 +3,11 @@
package transportgrpc
import (
-
-transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
-
-pb "git.perx.ru/perxis/perxis-go/proto/environments"
-grpckit "github.com/go-kit/kit/transport/grpc"
-empty "github.com/golang/protobuf/ptypes/empty"
-grpc "google.golang.org/grpc"
+ transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ pb "git.perx.ru/perxis/perxis-go/proto/environments"
+ grpckit "github.com/go-kit/kit/transport/grpc"
+ empty "github.com/golang/protobuf/ptypes/empty"
+ grpc "google.golang.org/grpc"
)
func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
index ba66abc9..6411216c 100644
--- a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -4,13 +4,12 @@
package transportgrpc
import (
+ "context"
+ "errors"
-"context"
-"errors"
-transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
-
-pb "git.perx.ru/perxis/perxis-go/proto/environments"
-empty "github.com/golang/protobuf/ptypes/empty"
+ transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ pb "git.perx.ru/perxis/perxis-go/proto/environments"
+ empty "github.com/golang/protobuf/ptypes/empty"
)
func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/environments/transport/grpc/server.microgen.go b/pkg/environments/transport/grpc/server.microgen.go
index 2a183836..1389d326 100644
--- a/pkg/environments/transport/grpc/server.microgen.go
+++ b/pkg/environments/transport/grpc/server.microgen.go
@@ -4,13 +4,11 @@
package transportgrpc
import (
-
-transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
-
-pb "git.perx.ru/perxis/perxis-go/proto/environments"
-grpc "github.com/go-kit/kit/transport/grpc"
-empty "github.com/golang/protobuf/ptypes/empty"
-context "golang.org/x/net/context"
+ transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ pb "git.perx.ru/perxis/perxis-go/proto/environments"
+ grpc "github.com/go-kit/kit/transport/grpc"
+ empty "github.com/golang/protobuf/ptypes/empty"
+ context "golang.org/x/net/context"
)
type environmentsServer struct {
--
GitLab