Merge branch 'master' into TELCO-864-fix-non-functional-linting-warnings

.golangci.yml

@@ -218,28 +218,28 @@ linters-settings:
 
 linters:
   enable:
-    - gofmt
+    # - gofmt
     - govet
     - errcheck
-    - staticcheck
-    - unused
-    - gosimple
-    - ineffassign
+    # - staticcheck
+    # - unused
+    # - gosimple
+    # - ineffassign
     - typecheck
     # Additional
-    - lll
+    # - lll
     - godox
     #- gomnd
     #- goconst
     # - gocognit
     # - maligned
     # - nestif
     # - gomodguard
-    - nakedret
-    - gci
+    # - nakedret
+    # - gci
     - misspell
-    - gofumpt
-    - whitespace
+    # - gofumpt
+    # - whitespace
     - unconvert
     - predeclared
     - noctx

Dockerfile

@@ -7,7 +7,6 @@ FROM golang:1.21.3-bookworm AS builder
 
 LABEL maintainer="ONF <[email protected]>"
 
-#RUN apt remove cmdtest yarn
 RUN apt-get update && apt-get -y install apt-transport-https ca-certificates
 RUN apt-get update
 RUN apt-get -y install gcc cmake autoconf libtool pkg-config libmnl-dev libyaml-dev

producer/subscriber_data_management.go

@@ -154,11 +154,9 @@ func getIdTranslationResultProcedure(gpsi string) (response *models.IdTranslatio
 	}()
 
 	if res.StatusCode == http.StatusOK {
-		idList := udm_context.UDM_Self().GpsiSupiList
-		idList = idTranslationResultResp
-		if idList.SupiList != nil {
+		if idTranslationResultResp.SupiList != nil {
 			// GetCorrespondingSupi get corresponding Supi(here IMSI) matching the given Gpsi from the queried SUPI list from UDR
-			idTranslationResult.Supi = udm_context.GetCorrespondingSupi(idList)
+			idTranslationResult.Supi = udm_context.GetCorrespondingSupi(idTranslationResultResp)
 			idTranslationResult.Gpsi = gpsi
 
 			return &idTranslationResult, nil

producer/ue_context_management.go

@@ -503,6 +503,7 @@ func UpdateAmfNon3gppAccessProcedure(request models.AmfNon3GppAccessRegistration
 				Status: http.StatusForbidden,
 				Cause:  "INVALID_GUAMI",
 			}
+			return problemDetails
 		}
 
 		var patchItemTmp models.PatchItem