Refactor and remove test dependency which is not exported (#147)

Author: jastBytes

.github/workflows/snyk.yml

@@ -23,6 +23,6 @@ jobs:
         with:
           args: --sarif-file-output=snyk.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: snyk.sarif

pkg/grpc/connection.go

@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/finleap-connect/monoskope/pkg/domain/errors"
-	test_grpc "github.com/finleap-connect/monoskope/test/grpc"
 	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 	"golang.org/x/oauth2"
 	"google.golang.org/grpc"
@@ -122,8 +121,8 @@ func NewClientWithAuthForward[T any](ctx context.Context, addr string, requireTr
 // NewClientWithInsecureAuth (USE ONLY IF SECURED BY SERVICE MESH OR SIMILAR) creates a new gRPC client which sends the auth token without TLS
 func NewClientWithInsecureAuth[T any](ctx context.Context, addr, authToken string, clientFactory func(cc grpc.ClientConnInterface) T) (*grpc.ClientConn, T, error) {
 	conn, err := NewGrpcConnectionFactory(addr).
-		WithPerRPCCredentials(test_grpc.NewOauthAccessWithoutTransportSecurity(&oauth2.Token{AccessToken: authToken})).
 		WithInsecure().
+		WithPerRPCCredentials(NewOauthAccessWithoutTransportSecurity(&oauth2.Token{AccessToken: authToken})).
 		WithBlock().
 		ConnectWithTimeout(ctx, 10*time.Second)
 	if err != nil {

pkg/grpc/auth_token.go pkg/grpc/forwarded_auth_token.gopkg/grpc/auth_token.go renamed to pkg/grpc/forwarded_auth_token.go

@@ -22,17 +22,17 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
-// oauthAccess supplies PerRPCCredentials from a given token.
-type oauthAccess struct {
+// forwardedOAuthAccess supplies PerRPCCredentials from a given token.
+type forwardedOAuthAccess struct {
 	requireTransportSecurity bool
 }
 
 // NewForwardedOauthAccess constructs the PerRPCCredentials which forwards the authorization from header
 func NewForwardedOauthAccess(requireTransportSecurity bool) credentials.PerRPCCredentials {
-	return oauthAccess{requireTransportSecurity}
+	return forwardedOAuthAccess{requireTransportSecurity}
 }
 
-func (oa oauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
+func (oa forwardedOAuthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
 	// Forward authorization header
 	token, err := grpc_auth.AuthFromMD(ctx, auth.AuthScheme)
 	if err != nil {
@@ -44,6 +44,6 @@ func (oa oauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (ma
 	}, nil
 }
 
-func (oa oauthAccess) RequireTransportSecurity() bool {
+func (oa forwardedOAuthAccess) RequireTransportSecurity() bool {
 	return oa.requireTransportSecurity
 }

pkg/grpc/insecure_auth_token.go

@@ -0,0 +1,42 @@
+// Copyright 2022 Monoskope Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package grpc
+
+import (
+	"context"
+
+	"golang.org/x/oauth2"
+	"google.golang.org/grpc/credentials"
+)
+
+// insecureOauthAccess supplies PerRPCCredentials from a given token.
+type insecureOauthAccess struct {
+	token oauth2.Token
+}
+
+// NewOauthAccessWithoutTransportSecurity constructs the PerRPCCredentials using a given token for test purposes where no TLS necessary.
+func NewOauthAccessWithoutTransportSecurity(token *oauth2.Token) credentials.PerRPCCredentials {
+	return insecureOauthAccess{token: *token}
+}
+
+func (oa insecureOauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
+	return map[string]string{
+		"authorization": oa.token.Type() + " " + oa.token.AccessToken,
+	}, nil
+}
+
+func (oa insecureOauthAccess) RequireTransportSecurity() bool {
+	return false
+}