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

Update to nacelle v2.1.0 #1

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion Dockerfile.grpc-api
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12 AS builder
FROM golang:1.17 AS builder
WORKDIR /example
COPY . ./

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.http-api
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12 AS builder
FROM golang:1.17 AS builder
WORKDIR /example
COPY . ./

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.worker
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.12 AS builder
FROM golang:1.17 AS builder
WORKDIR /example
COPY . ./

RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
go build -o example ./cmd/worker

FROM scratch
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
# COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /example/example .
ENTRYPOINT ["/example"]
10 changes: 6 additions & 4 deletions cmd/grpc-api/main.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package main

import (
"context"
"example/internal"

"github.com/go-nacelle/grpcbase"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
)

func setup(processes nacelle.ProcessContainer, services nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithInitializerName("redis"))
processes.RegisterProcess(grpcbase.NewServer(NewServerInitializer()), nacelle.WithProcessName("grpc-server"))
func setup(ctx context.Context, processes *nacelle.ProcessContainerBuilder, services *nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithMetaName("redis"))
processes.RegisterProcess(grpcbase.NewServer(NewServerInitializer()), nacelle.WithMetaName("grpc-server"))
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/grpc-api/request_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"example/proto"

"github.com/garyburd/redigo/redis"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
5 changes: 3 additions & 2 deletions cmd/grpc-api/server_initializer.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package main

import (
"context"
"example/proto"

"github.com/garyburd/redigo/redis"
"github.com/go-nacelle/grpcbase"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
"google.golang.org/grpc"
)

Expand All @@ -18,7 +19,7 @@ func NewServerInitializer() grpcbase.ServerInitializer {
return &ServerInitializer{}
}

func (si *ServerInitializer) Init(config nacelle.Config, server *grpc.Server) error {
func (si *ServerInitializer) Init(ctx context.Context, server *grpc.Server) error {
proto.RegisterRequestServiceServer(server, NewRequestService(si.Logger, si.Redis))
return nil
}
9 changes: 5 additions & 4 deletions cmd/http-api/main.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package main

import (
"context"
"example/internal"

"github.com/go-nacelle/httpbase"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
)

func setup(processes nacelle.ProcessContainer, services nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithInitializerName("redis"))
processes.RegisterProcess(httpbase.NewServer(NewServerInitializer()), nacelle.WithProcessName("http-server"))
func setup(ctx context.Context, processes *nacelle.ProcessContainerBuilder, services *nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithMetaName("redis"))
processes.RegisterProcess(httpbase.NewServer(NewServerInitializer()), nacelle.WithMetaName("http-server"))
return nil
}

Expand Down
6 changes: 4 additions & 2 deletions cmd/http-api/server_initializer.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package main

import (
"context"
"encoding/json"
"io/ioutil"
"net/http"

"example/internal"

"github.com/garyburd/redigo/redis"
"github.com/go-nacelle/httpbase"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
)

type ServerInitializer struct {
Expand All @@ -20,7 +22,7 @@ func NewServerInitializer() httpbase.ServerInitializer {
return &ServerInitializer{}
}

func (si *ServerInitializer) Init(config nacelle.Config, server *http.Server) error {
func (si *ServerInitializer) Init(ctx context.Context, server *http.Server) error {
server.Handler = http.HandlerFunc(si.handle)
return nil
}
Expand Down
12 changes: 7 additions & 5 deletions cmd/worker/main.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package main

import (
"context"
"example/internal"
"github.com/go-nacelle/nacelle"

nacelle "github.com/go-nacelle/nacelle/v2"
"github.com/go-nacelle/workerbase"
)

func setup(processes nacelle.ProcessContainer, services nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithInitializerName("redis"))
processes.RegisterInitializer(internal.NewPubSubInitializer(), nacelle.WithInitializerName("pubsub"))
processes.RegisterProcess(workerbase.NewWorker(NewWorkerSpec()), nacelle.WithProcessName("worker"))
func setup(ctx context.Context, processes *nacelle.ProcessContainerBuilder, services *nacelle.ServiceContainer) error {
processes.RegisterInitializer(internal.NewRedisInitializer(), nacelle.WithMetaName("redis"))
processes.RegisterInitializer(internal.NewPubSubInitializer(), nacelle.WithMetaName("pubsub"))
processes.RegisterProcess(workerbase.NewWorker(NewWorkerSpec()), nacelle.WithMetaName("worker"))
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/worker/worker_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"example/internal"

"github.com/garyburd/redigo/redis"
"github.com/go-nacelle/nacelle"
nacelle "github.com/go-nacelle/nacelle/v2"
"github.com/go-nacelle/workerbase"
)

Expand All @@ -22,7 +22,7 @@ func NewWorkerSpec() workerbase.WorkerSpec {
return &WorkerSpec{}
}

func (ws *WorkerSpec) Init(config nacelle.Config) error {
func (ws *WorkerSpec) Init(ctx context.Context) error {
return nil
}

Expand Down
19 changes: 11 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
module example

go 1.12
go 1.16

require (
github.com/derision-test/go-mockgen v1.3.7 // indirect
github.com/garyburd/redigo v1.6.0
github.com/go-nacelle/grpcbase v1.0.1
github.com/go-nacelle/httpbase v1.0.1
github.com/go-nacelle/nacelle v1.0.1
github.com/go-nacelle/workerbase v1.0.1
github.com/golang/protobuf v1.3.1
github.com/google/uuid v1.1.1
google.golang.org/grpc v1.21.1
github.com/go-nacelle/grpcbase v1.0.2-0.20230501124005-2a6c96e4add2
github.com/go-nacelle/httpbase v1.0.2-0.20230501123826-2771fb8a0d33
github.com/go-nacelle/nacelle/v2 v2.1.1
github.com/go-nacelle/workerbase v1.0.3-0.20230501123936-b959b809e100
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
golang.org/x/net v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.54.0
)
Loading