diff --git a/pkg/environments/options.go b/pkg/environments/options.go index 8d5e3b01bcb00aa48190d6d7975378f038f39c2a..02f1a1fea3229ccfe702401c2dfa06e5094d9671 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 3be8cb3ce871c1953c45e02d5c77b30f41e8a260..cd0a37f449819a4b92239f8d8b38a3a0036ec8d8 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 88634fd539186f6025468764cbd002b538e2caca..96094fda943e407d0264a8abc738fd5c3afe440e 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 2cc1f903ac1e20560eb99f4ed3cb7adf602680e1..34e0fa4db1cf8149475dde562b3179091089f70f 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 ba66abc9c3702dbf1a0bcc4c6382f548cdd46497..6411216cd4f54cedd9bf2a3c61ff77b98d70cc35 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 2a1838362294ddc5c5039f81a7e2e25522dd4abc..1389d32692eaf27f5068073d330696d1ad221bd3 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 {