fix config (#60)

Co-authored-by: Artem Shcherbatiuk <[email protected]>

Author: vertex451

Dockerfile

@@ -13,4 +13,4 @@ COPY --from=builder  /app/main .
 USER 1001:1001
 
 ENTRYPOINT ["./main"]
-CMD ["gql-gateway"]
+CMD ["gateway"]

Taskfile.yml

@@ -58,14 +58,17 @@ tasks:
     cmds:
       - task: lint
       - task: test
+        
+  # start uses deprecated gateway
   start:
     cmds:
       - go run main.go start
 
+  # new gateway
   gateway:
     cmds:
-      - go run main.go gql-gateway
+      - go run main.go gateway
 
-  listen:
+  listener:
     cmds:
-      - go run main.go listen
+      - go run main.go listener

cmd/gateway.go

@@ -19,9 +19,9 @@ import (
 )
 
 var gatewayCmd = &cobra.Command{
-	Use:     "gql-gateway",
+	Use:     "gateway",
 	Short:   "Run the GQL Gateway",
-	Example: "go run main.go start --watched-dir=./definitions",
+	Example: "go run main.go gateway",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		start := time.Now()
 

cmd/listen.go renamed to cmd/listener.go

@@ -40,8 +40,8 @@ var (
 )
 
 var listenCmd = &cobra.Command{
-	Use:     "listen",
-	Example: "KUBECONFIG=<path to kubeconfig file> go run . listen",
+	Use:     "listener",
+	Example: "KUBECONFIG=<path to kubeconfig file> go run . listener",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
@@ -110,7 +110,7 @@ var listenCmd = &cobra.Command{
 		reconcilerOpts := kcp.ReconcilerOpts{
 			Scheme:                 scheme,
 			Config:                 cfg,
-			OpenAPIDefinitionsPath: opFlags.OpenAPIdefinitionsPath,
+			OpenAPIDefinitionsPath: opFlags.OpenApiDefinitionsPath,
 		}
 
 		newReconcilerFunc := kcp.ReconcilerFactory(opFlags)

cmd/start.go renamed to cmd/start_deprecated.go

@@ -5,10 +5,13 @@ import (
 )
 
 type Config struct {
+	// common with listener
+	OpenApiDefinitionsPath string `envconfig:"default=./bin/definitions"`
+	EnableKcp              bool   `envconfig:"default=true,optional"`
+
+	// for gateway
 	Port             string `envconfig:"default=8080,optional"`
 	LogLevel         string `envconfig:"default=INFO,optional"`
-	WatchedDir       string `envconfig:"default=bin/definitions,required"`
-	EnableKCP        bool   `envconfig:"default=true,optional"`
 	LocalDevelopment bool   `envconfig:"default=false,optional"`
 	HandlerCfg       HandlerConfig
 }

gateway/config/config.go

@@ -82,12 +82,12 @@ func NewManager(log *logger.Logger, cfg *rest.Config, appCfg appConfig.Config) (
 		watcher:  watcher,
 	}
 
-	err = m.watcher.Add(appCfg.WatchedDir)
+	err = m.watcher.Add(appCfg.OpenApiDefinitionsPath)
 	if err != nil {
 		return nil, err
 	}
 
-	files, err := filepath.Glob(filepath.Join(appCfg.WatchedDir, "*"))
+	files, err := filepath.Glob(filepath.Join(appCfg.OpenApiDefinitionsPath, "*"))
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +160,7 @@ func (s *Service) OnFileDeleted(filename string) {
 }
 
 func (s *Service) loadSchemaFromFile(filename string) (*graphql.Schema, error) {
-	definitions, err := readDefinitionFromFile(filepath.Join(s.appCfg.WatchedDir, filename))
+	definitions, err := readDefinitionFromFile(filepath.Join(s.appCfg.OpenApiDefinitionsPath, filename))
 	if err != nil {
 		return nil, err
 	}
@@ -215,7 +215,7 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if s.appCfg.EnableKCP {
+	if s.appCfg.EnableKcp {
 		r = r.WithContext(kontext.WithCluster(r.Context(), logicalcluster.Name(workspace)))
 	}
 

gateway/manager/manager.go

@@ -5,13 +5,16 @@ import (
 )
 
 type Flags struct {
-	MetricsAddr            string `envconfig:"default=0,optional"`
-	EnableLeaderElection   bool   `envconfig:"default=false,optional"`
-	ProbeAddr              string `envconfig:"default=:8081,optional"`
-	SecureMetrics          bool   `envconfig:"default=true,optional"`
-	EnableHTTP2            bool   `envconfig:"default=false,optional"`
-	OpenAPIdefinitionsPath string `envconfig:"OPEN_API_DEFINITIONS_PATH,default=./bin/definitions"`
+	// common with gateway
+	OpenApiDefinitionsPath string `envconfig:"default=./bin/definitions"`
 	EnableKcp              bool   `envconfig:"default=true,optional"`
+
+	// for listener
+	MetricsAddr          string `envconfig:"default=0,optional"`
+	EnableLeaderElection bool   `envconfig:"default=false,optional"`
+	ProbeAddr            string `envconfig:"default=:8081,optional"`
+	SecureMetrics        bool   `envconfig:"default=true,optional"`
+	EnableHTTP2          bool   `envconfig:"default=false,optional"`
 }
 
 func NewFromEnv() (*Flags, error) {

listener/flags/operator_flags.go

@@ -146,7 +146,7 @@ func (suite *CommonTestSuite) TestWorkspaceRemove() {
 	require.NoError(suite.T(), err)
 	require.Equal(suite.T(), http.StatusOK, statusCode, "Expected status code 200")
 
-	err = os.Remove(filepath.Join(suite.appCfg.WatchedDir, workspaceName))
+	err = os.Remove(filepath.Join(suite.appCfg.OpenApiDefinitionsPath, workspaceName))
 	require.NoError(suite.T(), err)
 
 	// Wait until the handler is removed
@@ -169,7 +169,7 @@ func (suite *CommonTestSuite) TestWorkspaceRename() {
 	require.Equal(suite.T(), http.StatusOK, statusCode, "Expected status code 200")
 
 	newWorkspaceName := "myNewWorkspace"
-	err = os.Rename(filepath.Join(suite.appCfg.WatchedDir, workspaceName), filepath.Join(suite.appCfg.WatchedDir, newWorkspaceName))
+	err = os.Rename(filepath.Join(suite.appCfg.OpenApiDefinitionsPath, workspaceName), filepath.Join(suite.appCfg.OpenApiDefinitionsPath, newWorkspaceName))
 	require.NoError(suite.T(), err)
 	time.Sleep(sleepTime) // let's give some time to the manager to process the file and create a url
 

tests/service_test.go

@@ -40,7 +40,7 @@ func (suite *CommonTestSuite) SetupTest() {
 	suite.cfg, err = suite.testEnv.Start()
 	require.NoError(suite.T(), err)
 
-	suite.appCfg.WatchedDir, err = os.MkdirTemp("", "watchedDir")
+	suite.appCfg.OpenApiDefinitionsPath, err = os.MkdirTemp("", "watchedDir")
 	require.NoError(suite.T(), err)
 
 	logCfg := logger.DefaultConfig()
@@ -55,14 +55,14 @@ func (suite *CommonTestSuite) SetupTest() {
 }
 
 func (suite *CommonTestSuite) TearDownTest() {
-	require.NoError(suite.T(), os.RemoveAll(suite.appCfg.WatchedDir))
+	require.NoError(suite.T(), os.RemoveAll(suite.appCfg.OpenApiDefinitionsPath))
 	require.NoError(suite.T(), suite.testEnv.Stop())
 	suite.server.Close()
 }
 
 // writeToFile adds a new file to the watched directory which will trigger schema generation
 func (suite *CommonTestSuite) writeToFile(sourceName, dest string) {
-	specFilePath := filepath.Join(suite.appCfg.WatchedDir, dest)
+	specFilePath := filepath.Join(suite.appCfg.OpenApiDefinitionsPath, dest)
 
 	sourceSpecFilePath := filepath.Join("testdata", sourceName)