chore: rename package name

cmd/config/check.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	pkg "github.com/jkaninda/goma-gateway/internal"
+	"github.com/jkaninda/goma-gateway/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +34,7 @@ var CheckConfigCmd = &cobra.Command{
 			fmt.Println("no config file specified")
 			os.Exit(1)
 		}
-		err := pkg.CheckConfig(configFile)
+		err := internal.CheckConfig(configFile)
 		if err != nil {
 			fmt.Printf(" Error checking config file: %s\n", err)
 			os.Exit(1)

cmd/config/init.go

@@ -17,9 +17,9 @@ limitations under the License.
 */
 import (
 	"fmt"
+	"github.com/jkaninda/goma-gateway/internal"
 	"os"
 
-	pkg "github.com/jkaninda/goma-gateway/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -41,7 +41,7 @@ var InitConfigCmd = &cobra.Command{
 					os.Exit(1)
 				}
 			}
-			err := pkg.InitConfig(configFile)
+			err := internal.InitConfig(configFile)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)

cmd/server.go

@@ -33,10 +33,10 @@ var ServerCmd = &cobra.Command{
 		intro()
 		configFile, _ := cmd.Flags().GetString("config")
 		if configFile == "" {
-			configFile = pkg.GetConfigPaths()
+			configFile = internal.GetConfigPaths()
 		}
 		ctx := context.Background()
-		g := pkg.GatewayServer{}
+		g := internal.GatewayServer{}
 		gs, err := g.Config(configFile, ctx)
 		if err != nil {
 			fmt.Printf("Could not load configuration: %v\n", err)

go.sum

@@ -28,6 +28,7 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jedib0t/go-pretty/v6 v6.6.3 h1:nGqgS0tgIO1Hto47HSaaK4ac/I/Bu7usmdD3qvs0WvM=
 github.com/jedib0t/go-pretty/v6 v6.6.3/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

internal/check_config.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"

internal/config.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/cors_type.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 type Cors struct {
 	// Cors Allowed origins,

internal/extra_config.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"

internal/gateway_type.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Gateway contains Goma Proxy Gateway's configs
 type Gateway struct {

internal/handler.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/healthcheck.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/helpers.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"context"

internal/jwt.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"github.com/golang-jwt/jwt"

internal/middleware.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"errors"

internal/middleware_test.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/middleware_type.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Middleware defined the route middlewares
 type Middleware struct {

internal/proxy.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/redis.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"github.com/jkaninda/goma-gateway/internal/middlewares"

internal/route_config.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"

internal/route_type.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 // Route defines gateway route
 type Route struct {

internal/routes.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/routes_test.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"fmt"

internal/server.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 /*
 Copyright 2024 Jonas Kaninda

internal/server_test.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 import (
 	"context"

internal/tls.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"crypto/tls"

internal/types.go

@@ -15,7 +15,7 @@
  *
  */
 
-package pkg
+package internal
 
 import (
 	"context"

internal/var.go

@@ -1,4 +1,4 @@
-package pkg
+package internal
 
 const ConfigDir = "/etc/goma/" // Default configuration file
 const ExtraDir = ConfigDir + "extra"