fix: name collision (#57)

* fixed name collision issue

---------

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

Author: vertex451

cmd/gateway.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/openmfp/golang-commons/logger"
 
-	appCfg "github.com/openmfp/crd-gql-gateway/internal/config"
-	"github.com/openmfp/crd-gql-gateway/internal/manager"
+	appCfg "github.com/openmfp/crd-gql-gateway/gateway/config"
+	"github.com/openmfp/crd-gql-gateway/gateway/manager"
 )
 
 var gatewayCmd = &cobra.Command{

cmd/start.go

@@ -8,7 +8,7 @@ import (
 	"github.com/graphql-go/handler"
 	"github.com/spf13/cobra"
 
-	"github.com/openmfp/crd-gql-gateway/gateway"
+	"github.com/openmfp/crd-gql-gateway/deprecated"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	controllerruntime "sigs.k8s.io/controller-runtime"
@@ -47,7 +47,7 @@ var startCmd = &cobra.Command{
 			panic("no cache sync")
 		}
 
-		cfg.Wrap(gateway.NewImpersonationTransport)
+		cfg.Wrap(deprecated.NewImpersonationTransport)
 
 		cl, err := client.NewWithWatch(cfg, client.Options{
 			Scheme: schema,
@@ -59,14 +59,14 @@ var startCmd = &cobra.Command{
 			return err
 		}
 
-		gqlSchema, err := gateway.New(cmd.Context(), gateway.Config{
+		gqlSchema, err := deprecated.New(cmd.Context(), deprecated.Config{
 			Client: cl,
 		})
 		if err != nil {
 			return err
 		}
 
-		http.Handle("/graphql", gateway.Handler(gateway.HandlerConfig{
+		http.Handle("/graphql", deprecated.Handler(deprecated.HandlerConfig{
 			Config: &handler.Config{
 				Schema:     &gqlSchema,
 				Pretty:     true,

definitions/root

@@ -1,4 +1,4 @@
-package gateway
+package deprecated
 
 import (
 	"context"

gateway/gateway.go renamed to deprecated/gateway.go

@@ -1,4 +1,4 @@
-package gateway
+package deprecated
 
 import (
 	"context"

gateway/resolver.go renamed to deprecated/resolver.go

@@ -5,11 +5,12 @@ import (
 )
 
 type Config struct {
-	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"`
-	HandlerCfg HandlerConfig
+	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
 }
 
 type HandlerConfig struct {

internal/config/config.go renamed to gateway/config/config.go

@@ -16,9 +16,9 @@ import (
 	"github.com/graphql-go/graphql"
 	"github.com/graphql-go/handler"
 	"github.com/kcp-dev/logicalcluster/v3"
-	appConfig "github.com/openmfp/crd-gql-gateway/internal/config"
-	"github.com/openmfp/crd-gql-gateway/internal/gateway"
-	"github.com/openmfp/crd-gql-gateway/internal/resolver"
+	appConfig "github.com/openmfp/crd-gql-gateway/gateway/config"
+	"github.com/openmfp/crd-gql-gateway/gateway/resolver"
+	"github.com/openmfp/crd-gql-gateway/gateway/schema"
 	"github.com/openmfp/golang-commons/logger"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -141,7 +141,7 @@ func (s *Service) handleEvent(event fsnotify.Event) {
 func (s *Service) OnFileChanged(filename string) {
 	schema, err := s.loadSchemaFromFile(filename)
 	if err != nil {
-		s.log.Error().Err(err).Str("file", filename).Msg("Error loading example:alpha from file")
+		s.log.Error().Err(err).Str("file", filename).Msg("Error loading schema from file")
 		return
 	}
 
@@ -165,7 +165,7 @@ func (s *Service) loadSchemaFromFile(filename string) (*graphql.Schema, error) {
 		return nil, err
 	}
 
-	g, err := gateway.New(s.log, definitions, s.resolver)
+	g, err := schema.New(s.log, definitions, s.resolver)
 	if err != nil {
 		return nil, err
 	}
@@ -210,7 +210,7 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	token := r.Header.Get("Authorization")
-	if token == "" {
+	if !s.appCfg.LocalDevelopment && token == "" {
 		http.Error(w, "Authorization header is required", http.StatusUnauthorized)
 		return
 	}