Rename http-server -> http, grpc-server -> grpc

Signed-off-by: Chris Doherty <[email protected]>
tinkerbell · May 2, 2022 · 8902d05 · 8902d05
1 parent 25db0b5
commit 8902d05
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/cmd/hegel/root_cmd.go b/cmd/hegel/root_cmd.go
@@ -18,9 +18,9 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"github.com/tinkerbell/hegel/datamodel"
-	grpcserver "github.com/tinkerbell/hegel/grpc-server"
+	"github.com/tinkerbell/hegel/grpc"
 	"github.com/tinkerbell/hegel/hardware"
-	httpserver "github.com/tinkerbell/hegel/http-server"
+	"github.com/tinkerbell/hegel/http"
 	"github.com/tinkerbell/hegel/metrics"
 )
 
@@ -149,14 +149,14 @@ func (c *RootCommand) Run(cmd *cobra.Command, _ []string) error {
 		return errors.Errorf("create client: %v", err)
 	}
 
-	grpcServer := grpcserver.NewServer(logger, hardwareClient)
+	grpcServer := grpc.NewServer(logger, hardwareClient)
 
 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	var routines run.Group
 
 	routines.Add(
 		func() error {
-			return httpserver.Serve(
+			return http.Serve(
 				ctx,
 				logger,
 				hardwareClient,
@@ -173,7 +173,7 @@ func (c *RootCommand) Run(cmd *cobra.Command, _ []string) error {
 
 	routines.Add(
 		func() error {
-			return grpcserver.Serve(
+			return grpc.Serve(
 				ctx,
 				logger,
 				grpcServer,

diff --git a/grpc-server/grpc_helpers_test.go → grpc/helpers_test.go b/grpc-server/grpc_helpers_test.go → grpc/helpers_test.go
@@ -1,4 +1,4 @@
-package grpcserver
+package grpc
 
 import (
 	"context"

diff --git a/grpc-server/grpc_server.go → grpc/server.go b/grpc-server/grpc_server.go → grpc/server.go
@@ -1,4 +1,4 @@
-package grpcserver
+package grpc
 
 import (
 	"context"

diff --git a/grpc-server/grpc_server_test.go → grpc/server_test.go b/grpc-server/grpc_server_test.go → grpc/server_test.go
@@ -1,4 +1,4 @@
-package grpcserver
+package grpc
 
 import (
 	"context"

diff --git a/grpc-server/grpc_subscribe_test.go → grpc/subscribe_test.go b/grpc-server/grpc_subscribe_test.go → grpc/subscribe_test.go
@@ -1,4 +1,4 @@
-package grpcserver
+package grpc
 
 import (
 	"fmt"

diff --git a/http-server/http_handlers.go → http/handlers.go b/http-server/http_handlers.go → http/handlers.go
@@ -1,4 +1,4 @@
-package httpserver
+package http
 
 import (
 	"bytes"
@@ -15,7 +15,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/tinkerbell/hegel/build"
 	"github.com/tinkerbell/hegel/datamodel"
-	grpcserver "github.com/tinkerbell/hegel/grpc-server"
+	"github.com/tinkerbell/hegel/grpc"
 	"github.com/tinkerbell/hegel/hardware"
 	"github.com/tinkerbell/hegel/metrics"
 )
@@ -311,7 +311,7 @@ func jsonError(logger log.Logger, w http.ResponseWriter, status int, err error,
 // todo(chrisdoherty4) Re-write this. It violates several laws and is dangerously fragile.
 // Also, does this work for `/subscriptions`? The writeJSON call injects a function that isn't
 // handled properly by writeJSON.
-func SubscriptionsHandler(server *grpcserver.Server, logger log.Logger) http.Handler {
+func SubscriptionsHandler(server *grpc.Server, logger log.Logger) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		getid := strings.TrimPrefix(r.URL.Path, "/subscriptions/")
 		server.SubLock().RLock()

diff --git a/http-server/http_server.go → http/server.go b/http-server/http_server.go → http/server.go
@@ -1,4 +1,4 @@
-package httpserver
+package http
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/tinkerbell/hegel/datamodel"
-	grpcserver "github.com/tinkerbell/hegel/grpc-server"
+	"github.com/tinkerbell/hegel/grpc"
 	"github.com/tinkerbell/hegel/hardware"
 	"github.com/tinkerbell/hegel/xff"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
@@ -21,7 +21,7 @@ func Serve(
 	ctx context.Context,
 	logger log.Logger,
 	client hardware.Client,
-	grpcsrv *grpcserver.Server,
+	grpcsrv *grpc.Server,
 	port int,
 	start time.Time,
 	model datamodel.DataModel,

diff --git a/http-server/http_server_test.go → http/server_test.go b/http-server/http_server_test.go → http/server_test.go
@@ -1,4 +1,4 @@
-package httpserver
+package http
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 	"github.com/packethost/pkg/log"
 	"github.com/stretchr/testify/require"
 	"github.com/tinkerbell/hegel/datamodel"
-	grpcserver "github.com/tinkerbell/hegel/grpc-server"
+	"github.com/tinkerbell/hegel/grpc"
 	"github.com/tinkerbell/hegel/hardware"
 	"github.com/tinkerbell/hegel/hardware/mock"
 	_ "github.com/tinkerbell/hegel/metrics" // Initialize metrics.
@@ -892,7 +892,7 @@ func TestServe(t *testing.T) {
 	customEndpoints := `{"/metadata":".metadata.instance"}`
 
 	go func() {
-		if err := Serve(context.Background(), logger, mock.HardwareClient{}, &grpcserver.Server{}, mport, time.Now(), "", customEndpoints, ""); err != nil {
+		if err := Serve(context.Background(), logger, mock.HardwareClient{}, &grpc.Server{}, mport, time.Now(), "", customEndpoints, ""); err != nil {
 			t.Errorf("Serve() error = %v", err)
 		}
 	}()