Skip to content

Commit

Permalink
refactor: rename config folder
Browse files Browse the repository at this point in the history
  • Loading branch information
pinglin committed May 21, 2022
1 parent 20fd5c7 commit e9790af
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /pipeline-backend
COPY --from=build /go/src/internal/db/migration ./internal/db/migration
COPY --from=build /pipeline-backend-migrate ./

COPY --from=build /go/src/configs ./configs
COPY --from=build /go/src/config ./config
COPY --from=build /pipeline-backend ./

ENTRYPOINT ["./pipeline-backend"]
20 changes: 10 additions & 10 deletions cmd/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"

"github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
"github.com/instill-ai/pipeline-backend/internal/external"
"github.com/instill-ai/pipeline-backend/internal/logger"
"github.com/instill-ai/pipeline-backend/internal/temporal"
Expand Down Expand Up @@ -53,7 +53,7 @@ func main() {
defer logger.Sync() //nolint
grpc_zap.ReplaceGrpcLoggerV2(logger)

if err := configs.Init(); err != nil {
if err := config.Init(); err != nil {
logger.Fatal(err.Error())
}

Expand All @@ -69,8 +69,8 @@ func main() {
// Create tls based credential.
var creds credentials.TransportCredentials
var err error
if configs.Config.Server.HTTPS.Cert != "" && configs.Config.Server.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(configs.Config.Server.HTTPS.Cert, configs.Config.Server.HTTPS.Key)
if config.Config.Server.HTTPS.Cert != "" && config.Config.Server.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(config.Config.Server.HTTPS.Cert, config.Config.Server.HTTPS.Key)
if err != nil {
logger.Fatal(fmt.Sprintf("failed to create credentials: %v", err))
}
Expand Down Expand Up @@ -102,7 +102,7 @@ func main() {
grpc_recovery.UnaryServerInterceptor(recoveryInterceptorOpt()),
)),
}
if configs.Config.Server.HTTPS.Cert != "" && configs.Config.Server.HTTPS.Key != "" {
if config.Config.Server.HTTPS.Cert != "" && config.Config.Server.HTTPS.Key != "" {
grpcServerOpts = append(grpcServerOpts, grpc.Creds(creds))
}

Expand Down Expand Up @@ -142,27 +142,27 @@ func main() {
}

var dialOpts []grpc.DialOption
if configs.Config.Server.HTTPS.Cert != "" && configs.Config.Server.HTTPS.Key != "" {
if config.Config.Server.HTTPS.Cert != "" && config.Config.Server.HTTPS.Key != "" {
dialOpts = []grpc.DialOption{grpc.WithTransportCredentials(creds)}
} else {
dialOpts = []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
}

if err := pipelinePB.RegisterPipelineServiceHandlerFromEndpoint(ctx, gwS, fmt.Sprintf(":%v", configs.Config.Server.Port), dialOpts); err != nil {
if err := pipelinePB.RegisterPipelineServiceHandlerFromEndpoint(ctx, gwS, fmt.Sprintf(":%v", config.Config.Server.Port), dialOpts); err != nil {
logger.Fatal(err.Error())
}

httpServer := &http.Server{
Addr: fmt.Sprintf(":%v", configs.Config.Server.Port),
Addr: fmt.Sprintf(":%v", config.Config.Server.Port),
Handler: grpcHandlerFunc(grpcS, gwS),
}

// Wait for interrupt signal to gracefully shutdown the server with a timeout of 5 seconds.
quitSig := make(chan os.Signal, 1)
errSig := make(chan error)
if configs.Config.Server.HTTPS.Cert != "" && configs.Config.Server.HTTPS.Key != "" {
if config.Config.Server.HTTPS.Cert != "" && config.Config.Server.HTTPS.Key != "" {
go func() {
if err := httpServer.ListenAndServeTLS(configs.Config.Server.HTTPS.Cert, configs.Config.Server.HTTPS.Key); err != nil {
if err := httpServer.ListenAndServeTLS(config.Config.Server.HTTPS.Cert, config.Config.Server.HTTPS.Key); err != nil {
errSig <- err
}
}()
Expand Down
8 changes: 4 additions & 4 deletions cmd/migration/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
_ "github.com/golang-migrate/migrate/v4/database/postgres"
_ "github.com/golang-migrate/migrate/v4/source/file"

"github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
)

func checkExist(databaseConfig configs.DatabaseConfig) error {
func checkExist(databaseConfig config.DatabaseConfig) error {
db, err := sql.Open(
"postgres",
fmt.Sprintf("host=%s user=%s password=%s dbname=postgres port=%d sslmode=disable TimeZone=%s",
Expand Down Expand Up @@ -75,11 +75,11 @@ func checkExist(databaseConfig configs.DatabaseConfig) error {
func main() {
migrateFolder, _ := os.Getwd()

if err := configs.Init(); err != nil {
if err := config.Init(); err != nil {
panic(err)
}

databaseConfig := configs.Config.Database
databaseConfig := config.Config.Database

if err := checkExist(databaseConfig); err != nil {
panic(err)
Expand Down
4 changes: 2 additions & 2 deletions configs/configs.go → config/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package configs
package config

import (
"flag"
Expand Down Expand Up @@ -109,7 +109,7 @@ func Init() error {
parser := yaml.Parser()

fs := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
fileRelativePath := fs.String("file", "configs/config.yaml", "configuration file")
fileRelativePath := fs.String("file", "config/config.yaml", "configuration file")
flag.Parse()

if err := k.Load(file.Provider(*fileRelativePath), parser); err != nil {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft-07/schema",
"$id": "https://github.com/instill-ai/pipeline-backend/blob/main/configs/models/pipeline.json",
"$id": "https://github.com/instill-ai/pipeline-backend/blob/main/config/models/pipeline.json",
"title": "Pipeline",
"description": "End-to-end data pipeline",
"type": "object",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
CFG_DATABASE_USERNAME: postgres
CFG_DATABASE_PASSWORD: password
volumes:
- ./configs:/pipeline-backend/configs
- ./config:/pipeline-backend/config
entrypoint: ./pipeline-backend-migrate
depends_on:
pg_sql:
Expand All @@ -96,7 +96,7 @@ services:
ports:
- 8081:8081
volumes:
- ./configs:/pipeline-backend/configs
- ./config:/pipeline-backend/config
depends_on:
- pipeline_backend_migrate
- mgmt_backend
Expand Down
4 changes: 2 additions & 2 deletions internal/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package cache
import (
"github.com/go-redis/redis/v8"

"github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
)

var Redis *redis.Client

func Init() {
Redis = redis.NewClient(&configs.Config.Cache.Redis.RedisOptions)
Redis = redis.NewClient(&config.Config.Cache.Redis.RedisOptions)
}

func Close() {
Expand Down
4 changes: 2 additions & 2 deletions internal/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/schema"

configs "github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
)

var db *gorm.DB
var once sync.Once

func GetConnection() *gorm.DB {
once.Do(func() {
databaseConfig := configs.Config.Database
databaseConfig := config.Config.Database
dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=%s",
databaseConfig.Host,
databaseConfig.Username,
Expand Down
20 changes: 10 additions & 10 deletions internal/external/external.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
"github.com/instill-ai/pipeline-backend/internal/logger"

connectorPB "github.com/instill-ai/protogen-go/connector/v1alpha"
Expand All @@ -22,8 +22,8 @@ func InitUserServiceClient() mgmtPB.UserServiceClient {
var clientDialOpts grpc.DialOption
var creds credentials.TransportCredentials
var err error
if configs.Config.MgmtBackend.HTTPS.Cert != "" && configs.Config.MgmtBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(configs.Config.MgmtBackend.HTTPS.Cert, configs.Config.MgmtBackend.HTTPS.Key)
if config.Config.MgmtBackend.HTTPS.Cert != "" && config.Config.MgmtBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(config.Config.MgmtBackend.HTTPS.Cert, config.Config.MgmtBackend.HTTPS.Key)
if err != nil {
logger.Fatal(err.Error())
}
Expand All @@ -32,7 +32,7 @@ func InitUserServiceClient() mgmtPB.UserServiceClient {
clientDialOpts = grpc.WithTransportCredentials(insecure.NewCredentials())
}

clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", configs.Config.MgmtBackend.Host, configs.Config.MgmtBackend.Port), clientDialOpts)
clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", config.Config.MgmtBackend.Host, config.Config.MgmtBackend.Port), clientDialOpts)
if err != nil {
logger.Fatal(err.Error())
}
Expand All @@ -47,8 +47,8 @@ func InitConnectorServiceClient() connectorPB.ConnectorServiceClient {
var clientDialOpts grpc.DialOption
var creds credentials.TransportCredentials
var err error
if configs.Config.ConnectorBackend.HTTPS.Cert != "" && configs.Config.ConnectorBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(configs.Config.ConnectorBackend.HTTPS.Cert, configs.Config.ConnectorBackend.HTTPS.Key)
if config.Config.ConnectorBackend.HTTPS.Cert != "" && config.Config.ConnectorBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(config.Config.ConnectorBackend.HTTPS.Cert, config.Config.ConnectorBackend.HTTPS.Key)
if err != nil {
logger.Fatal(err.Error())
}
Expand All @@ -57,7 +57,7 @@ func InitConnectorServiceClient() connectorPB.ConnectorServiceClient {
clientDialOpts = grpc.WithTransportCredentials(insecure.NewCredentials())
}

clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", configs.Config.ConnectorBackend.Host, configs.Config.ConnectorBackend.Port), clientDialOpts)
clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", config.Config.ConnectorBackend.Host, config.Config.ConnectorBackend.Port), clientDialOpts)
if err != nil {
logger.Fatal(err.Error())
}
Expand All @@ -72,8 +72,8 @@ func InitModelServiceClient() modelPB.ModelServiceClient {
var clientDialOpts grpc.DialOption
var creds credentials.TransportCredentials
var err error
if configs.Config.ModelBackend.HTTPS.Cert != "" && configs.Config.ModelBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(configs.Config.ModelBackend.HTTPS.Cert, configs.Config.ModelBackend.HTTPS.Key)
if config.Config.ModelBackend.HTTPS.Cert != "" && config.Config.ModelBackend.HTTPS.Key != "" {
creds, err = credentials.NewServerTLSFromFile(config.Config.ModelBackend.HTTPS.Cert, config.Config.ModelBackend.HTTPS.Key)
if err != nil {
logger.Fatal(err.Error())
}
Expand All @@ -82,7 +82,7 @@ func InitModelServiceClient() modelPB.ModelServiceClient {
clientDialOpts = grpc.WithTransportCredentials(insecure.NewCredentials())
}

clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", configs.Config.ModelBackend.Host, configs.Config.ModelBackend.Port), clientDialOpts)
clientConn, err := grpc.Dial(fmt.Sprintf("%v:%v", config.Config.ModelBackend.Host, config.Config.ModelBackend.Port), clientDialOpts)
if err != nil {
logger.Fatal(err.Error())
}
Expand Down
4 changes: 2 additions & 2 deletions internal/temporal/temporal.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"go.temporal.io/sdk/client"

"github.com/instill-ai/pipeline-backend/configs"
"github.com/instill-ai/pipeline-backend/config"
"github.com/instill-ai/pipeline-backend/internal/logger"
"github.com/instill-ai/pipeline-backend/pkg/datamodel"
"github.com/instill-ai/x/zapadapter"
Expand All @@ -23,7 +23,7 @@ func Init() {
// The client is a heavyweight object that should be created once per process.
var err error

clientOpts := configs.Config.Temporal.ClientOptions
clientOpts := config.Config.Temporal.ClientOptions
clientOpts.Logger = zapadapter.NewZapAdapter(logger)

c, err = client.NewClient(clientOpts)
Expand Down
2 changes: 1 addition & 1 deletion pkg/datamodel/jsonschema.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func InitJSONSchema() {
logger, _ := logger.GetZapLogger()

var err error
PipelineJSONSchema, err = jsonschema.Compile("configs/models/pipeline.json")
PipelineJSONSchema, err = jsonschema.Compile("config/models/pipeline.json")
if err != nil {
logger.Fatal(fmt.Sprintf("%#v\n", err.Error()))
}
Expand Down

0 comments on commit e9790af

Please sign in to comment.