split up common pkg + move interceptor to grpc

Author: tomabraham

common/autologger/autologger.go grpc/common/autologger/autologger.go

@@ -3,6 +3,7 @@ package common
 import (
 	"context"
 
+	httpcommon "github.com/Azure/aks-middleware/http/common"
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
 	"google.golang.org/grpc/metadata"
 )
@@ -22,10 +23,10 @@ func getMetadata(ctx context.Context) map[string]string {
 		return headersFromMD
 	}
 	for _, key := range []string{
-		RequestIDMetadataHeader,
-		CorrelationIDKey,
-		OperationIDKey,
-		ARMClientRequestIDKey,
+		httpcommon.RequestIDMetadataHeader,
+		httpcommon.CorrelationIDKey,
+		httpcommon.OperationIDKey,
+		httpcommon.ARMClientRequestIDKey,
 	} {
 		if vals := md.Get(key); len(vals) > 0 {
 			headersFromMD[key] = vals[0]

common/autologger/autologger_suite_test.go grpc/common/autologger/autologger_suite_test.go

@@ -4,12 +4,13 @@ import (
 	"io"
 	"os"
 
-	"github.com/Azure/aks-middleware/common"
-	"github.com/Azure/aks-middleware/common/autologger"
 	"github.com/Azure/aks-middleware/grpc/client/mdforward"
+	"github.com/Azure/aks-middleware/grpc/common"
+	"github.com/Azure/aks-middleware/grpc/common/autologger"
 	"github.com/Azure/aks-middleware/grpc/server/ctxlogger"
 	"github.com/Azure/aks-middleware/grpc/server/requestid"
 	"github.com/Azure/aks-middleware/grpc/server/responseheader"
+	httpcommon "github.com/Azure/aks-middleware/http/common"
 
 	log "log/slog"
 	"strings"
@@ -144,7 +145,7 @@ func DefaultServerInterceptors(options ServerInterceptorLogOptions) []grpc.Unary
 			logging.WithLogOnEvents(logging.FinishCall),
 			logging.WithFieldsFromContext(common.GetFields),
 		),
-		responseheader.UnaryServerInterceptor(common.MetadataToHeader),
+		responseheader.UnaryServerInterceptor(httpcommon.MetadataToHeader),
 		recovery.UnaryServerInterceptor(common.GetRecoveryOpts()...),
 	}
 }

common/common_suite_test.go grpc/common/common_suite_test.go

@@ -8,7 +8,7 @@ import (
 	log "log/slog"
 
 	loggable "buf.build/gen/go/service-hub/loggable/protocolbuffers/go/proto"
-	"github.com/Azure/aks-middleware/common"
+	"github.com/Azure/aks-middleware/grpc/common"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"

common/helpers.go grpc/common/helpers.go

@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"io"
 
-	"github.com/Azure/aks-middleware/common"
+	"github.com/Azure/aks-middleware/http/common"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )

common/recoveryOpts.go grpc/common/recoveryOpts.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Azure/aks-middleware/common/logging"
+	"github.com/Azure/aks-middleware/http/common/logging"
 	armPolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/policy"
 	azcorePolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"google.golang.org/grpc/codes"

common/recoveryOpts_test.go grpc/common/recoveryOpts_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Azure/aks-middleware/common/logging"
+	"github.com/Azure/aks-middleware/http/common/logging"
 )
 
 type LoggingRoundTripper struct {

common/retryOpts.go grpc/common/retryOpts.go

@@ -0,0 +1,13 @@
+package common_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestCommon(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Common Suite")
+}

interceptor/interceptor.go grpc/interceptor/interceptor.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/aks-middleware/common"
+	"github.com/Azure/aks-middleware/http/common"
 	azcorePolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 )
 

interceptor/interceptor_suite_test.go grpc/interceptor/interceptor_suite_test.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/Azure/aks-middleware/common/logging"
+	"github.com/Azure/aks-middleware/http/common/logging"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"