Merge pull request #24 from Azure/toma/refactorMW

Refactor directories to make them less flat

Author: toma3233

README.md

@@ -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]

mdforward/mdforward.go grpc/client/mdforward/mdforward.go

@@ -1,4 +1,4 @@
-package interceptor
+package common
 
 import (
 	"fmt"

mdforward/mdforward_suite_test.go grpc/client/mdforward/mdforward_suite_test.go

@@ -1,7 +1,6 @@
-package interceptor_test
+package common
 
 import (
-	"github.com/Azure/aks-middleware/interceptor"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -57,7 +56,7 @@ var _ = Describe("Recovery test", func() {
 					/root/go/pkg/mod/google.golang.org/[email protected]/server.go:998 +0x98
 				created by google.golang.org/grpc.(*Server).serveStreams.func1
 					/root/go/pkg/mod/google.golang.org/[email protected]/server.go:996 +0x18c`
-			file, line := interceptor.ParseStack(trace)
+			file, line := ParseStack(trace)
 			Expect(file).To(ContainSubstring("api.go"))
 			Expect(line).To(Equal("34"))
 		})

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

@@ -1,4 +1,4 @@
-package interceptor
+package common
 
 import (
 	"time"

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

@@ -4,12 +4,13 @@ import (
 	"io"
 	"os"
 
-	"github.com/Azure/aks-middleware/autologger"
-	"github.com/Azure/aks-middleware/common"
-	"github.com/Azure/aks-middleware/ctxlogger"
-	"github.com/Azure/aks-middleware/mdforward"
-	"github.com/Azure/aks-middleware/requestid"
-	"github.com/Azure/aks-middleware/responseheader"
+	"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"
@@ -75,7 +76,7 @@ func DefaultClientInterceptors(options ClientInterceptorLogOptions) []grpc.Unary
 
 	apiRequestLogger := log.New(apiHandler).With("source", "ApiRequestLog")
 	return []grpc.UnaryClientInterceptor{
-		retry.UnaryClientInterceptor(GetRetryOptions()...),
+		retry.UnaryClientInterceptor(common.GetRetryOptions()...),
 		mdforward.UnaryClientInterceptor(),
 		logging.UnaryClientInterceptor(
 			autologger.InterceptorLogger(apiRequestLogger),
@@ -144,7 +145,7 @@ func DefaultServerInterceptors(options ServerInterceptorLogOptions) []grpc.Unary
 			logging.WithLogOnEvents(logging.FinishCall),
 			logging.WithFieldsFromContext(common.GetFields),
 		),
-		responseheader.UnaryServerInterceptor(common.MetadataToHeader),
-		recovery.UnaryServerInterceptor(GetRecoveryOpts()...),
+		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

@@ -1,7 +1,7 @@
 package ctxlogger_test
 
 import (
-	"github.com/Azure/aks-middleware/ctxlogger"
+	"github.com/Azure/aks-middleware/grpc/server/ctxlogger"
 	pb "github.com/Azure/aks-middleware/test/api/v1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

interceptor/recoveryOpts.go grpc/common/recoveryOpts.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"
 )

interceptor/interceptor_test.go grpc/common/recoveryOpts_test.go

@@ -1,9 +1,10 @@
-package responseheader
+package responseheader_test
 
 import (
 	"context"
 	"net"
 
+	"github.com/Azure/aks-middleware/grpc/server/responseheader"
 	pb "github.com/Azure/aks-middleware/test/api/v1"
 	"github.com/Azure/aks-middleware/test/server"
 	. "github.com/onsi/ginkgo/v2"
@@ -33,7 +34,7 @@ var _ = Describe("ResponseHeader Interceptor Integration", func() {
 			"empty-metadata-key": "",
 		}
 		grpcServer = grpc.NewServer(
-			grpc.UnaryInterceptor(UnaryServerInterceptor(metadataToHeader)),
+			grpc.UnaryInterceptor(responseheader.UnaryServerInterceptor(metadataToHeader)),
 		)
 		testSrv = &server.TestServer{}
 		pb.RegisterMyGreeterServer(grpcServer, testSrv)

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

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Azure/aks-middleware/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"

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

@@ -8,7 +8,7 @@ import (
 
 	log "log/slog"
 
-	serviceHubPolicy "github.com/Azure/aks-middleware/policy"
+	serviceHubPolicy "github.com/Azure/aks-middleware/http/client/azuresdk/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 	. "github.com/onsi/ginkgo/v2"

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

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

ctxlogger/ctxlogger.go grpc/server/ctxlogger/ctxlogger.go

@@ -7,7 +7,7 @@ import (
 
 	log "log/slog"
 
-	"github.com/Azure/aks-middleware/restlogger"
+	"github.com/Azure/aks-middleware/http/client/direct/restlogger"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

ctxlogger/ctxlogger_suite_test.go grpc/server/ctxlogger/ctxlogger_suite_test.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")
+}

ctxlogger/ctxlogger_test.go grpc/server/ctxlogger/ctxlogger_test.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"
 )
 

requestid/requestid.go grpc/server/requestid/requestid.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/Azure/aks-middleware/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"

requestid/requestid_suite_test.go grpc/server/requestid/requestid_suite_test.go

@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"time"
 
-	"github.com/Azure/aks-middleware/httpmw/requestid"
+	"github.com/Azure/aks-middleware/http/server/requestid"
 	"github.com/gorilla/mux"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

responseheader/responseheader.go grpc/server/responseheader/responseheader.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 
-	"github.com/Azure/aks-middleware/responseheader"
+	"github.com/Azure/aks-middleware/grpc/server/responseheader"
 	pb "github.com/Azure/aks-middleware/test/api/v1"
 	testServer "github.com/Azure/aks-middleware/test/server"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"

responseheader/responseheader_integration_test.go grpc/server/responseheader/responseheader_integration_test.go

@@ -4,7 +4,7 @@ import (
 	"log/slog"
 	"net/http"
 
-	"github.com/Azure/aks-middleware/httpmw/logging"
+	"github.com/Azure/aks-middleware/http/server/logging"
 	"github.com/gorilla/mux"
 )
 

responseheader/responseheader_suite_test.go grpc/server/responseheader/responseheader_suite_test.go

@@ -14,8 +14,8 @@ deps:
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
-    commit: a48fcebcf8f140dd9d09359b9bb185a4
-    digest: shake256:a926173f0ec3e1a929462c350acda846e546134b5ce2bb83fe44f02f9330a42b1c9b292f64b951b06a4d2c47e2ce4d477d6a2cb31502a15637ada35ecedefcf6
+    commit: 4c5ba75caaf84e928b7137ae5c18c26a
+    digest: shake256:e174ad9408f3e608f6157907153ffec8d310783ee354f821f57178ffbeeb8faa6bb70b41b61099c1783c82fe16210ebd1279bc9c9ee6da5cffba9f0e675b8b99
   - remote: buf.build
     owner: service-hub
     repository: loggable