Fix: fix linter error

free5gc · Jan 17, 2024 · 03c992c · 03c992c
1 parent 2216604
commit 03c992c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -44,10 +44,11 @@ func Init() {
 }
 
 type NFContext interface {
-	var _ NFContext = &NSSFContext{}
 	AuthorizationCheck(token, serviceName string) error
 }
 
+var _ NFContext = &NSSFContext{}
+
 type NSSFContext struct {
 	NfId         string
 	Name         string

diff --git a/internal/sbi/consumer/nf_management.go b/internal/sbi/consumer/nf_management.go
@@ -8,11 +8,12 @@ package consumer
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"net/http"
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
+
 	nssf_context "github.com/free5gc/nssf/internal/context"
 	"github.com/free5gc/nssf/internal/logger"
 	"github.com/free5gc/openapi"

diff --git a/internal/sbi/nssaiavailability/routers.go b/internal/sbi/nssaiavailability/routers.go
@@ -10,14 +10,14 @@
 package nssaiavailability
 
 import (
-	nssf_context "github.com/free5gc/nssf/internal/context"
-	"github.com/free5gc/nssf/internal/util"
 	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 
+	nssf_context "github.com/free5gc/nssf/internal/context"
 	"github.com/free5gc/nssf/internal/logger"
+	"github.com/free5gc/nssf/internal/util"
 	"github.com/free5gc/nssf/pkg/factory"
 	logger_util "github.com/free5gc/util/logger"
 )

diff --git a/internal/sbi/nsselection/routers.go b/internal/sbi/nsselection/routers.go
@@ -10,14 +10,14 @@
 package nsselection
 
 import (
-	nssf_context "github.com/free5gc/nssf/internal/context"
-	"github.com/free5gc/nssf/internal/util"
 	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 
+	nssf_context "github.com/free5gc/nssf/internal/context"
 	"github.com/free5gc/nssf/internal/logger"
+	"github.com/free5gc/nssf/internal/util"
 	"github.com/free5gc/nssf/pkg/factory"
 	logger_util "github.com/free5gc/util/logger"
 )

diff --git a/internal/util/router_auth_check.go b/internal/util/router_auth_check.go
@@ -1,10 +1,12 @@
 package util
 
 import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+
 	nssf_context "github.com/free5gc/nssf/internal/context"
 	"github.com/free5gc/nssf/internal/logger"
-	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 type RouterAuthorizationCheck struct {
@@ -20,7 +22,6 @@ func NewRouterAuthorizationCheck(serviceName string) *RouterAuthorizationCheck {
 func (rac *RouterAuthorizationCheck) Check(c *gin.Context, nssfContext nssf_context.NFContext) {
 	token := c.Request.Header.Get("Authorization")
 	err := nssfContext.AuthorizationCheck(token, rac.serviceName)
-
 	if err != nil {
 		logger.UtilLog.Debugf("RouterAuthorizationCheck: Check Unauthorized: %s", err)
 		c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()})

diff --git a/internal/util/router_auth_check_test.go b/internal/util/router_auth_check_test.go
@@ -1,11 +1,12 @@
 package util
 
 import (
-	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -31,7 +32,12 @@ func TestRouterAuthorizationCheck_Check(t *testing.T) {
 	// Mock gin.Context
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
-	c.Request, _ = http.NewRequest("GET", "/", nil)
+
+	var err error
+	c.Request, err = http.NewRequest("GET", "/", nil)
+	if err != nil {
+		t.Errorf("error on http request: %+v", err)
+	}
 
 	type Args struct {
 		token string
@@ -69,7 +75,10 @@ func TestRouterAuthorizationCheck_Check(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			w = httptest.NewRecorder()
 			c, _ = gin.CreateTestContext(w)
-			c.Request, _ = http.NewRequest("GET", "/", nil)
+			c.Request, err = http.NewRequest("GET", "/", nil)
+			if err != nil {
+				t.Errorf("error on http request: %+v", err)
+			}
 			c.Request.Header.Set("Authorization", tt.args.token)
 
 			rac := NewRouterAuthorizationCheck("testService")