From c563d3ee8fd6e6bd5f1e7bbf54f4958f3270ad4b Mon Sep 17 00:00:00 2001 From: ubuntu Date: Wed, 15 May 2024 11:25:14 +0000 Subject: [PATCH] fix: fix lint error --- internal/sbi/api_eventexposure.go | 1 - internal/sbi/consumer/nrf_service.go | 9 ++-- internal/sbi/consumer/udm_service.go | 9 +++- internal/sbi/consumer/udr_service.go | 53 +++++++++++++++---- .../api_create_ee_subscription.go | 2 +- ...nd_mobility_subscription_data_retrieval.go | 4 +- ..._gpp_access_registration_info_retrieval.go | 5 +- ..._gpp_access_registration_info_retrieval.go | 5 +- .../amf_registration_for3_gpp_access.go | 3 +- .../amf_registration_for_non3_gpp_access.go | 4 +- internal/sbi/processor/ee_subscription.go | 2 - .../sbi/processor/gpsi_to_supi_translation.go | 2 +- ...in_the_amf_registration_for3_gpp_access.go | 4 +- ...he_amf_registration_for_non3_gpp_access.go | 4 +- .../retrieval_of_multiple_data_sets.go | 3 +- .../sbi/processor/retrieval_of_shared_data.go | 3 +- ..._management_subscription_data_retrieval.go | 4 +- ...e_selection_subscription_data_retrieval.go | 4 +- internal/sbi/processor/smf_deregistration.go | 5 +- internal/sbi/processor/smf_registration.go | 10 ++-- ...f_selection_subscription_data_retrieval.go | 4 +- .../sbi/processor/subscription_creation.go | 3 +- .../subscription_creation_for_shared_data.go | 6 +-- .../sbi/processor/subscription_deletion.go | 4 +- .../subscription_deletion_for_shared_data.go | 4 +- .../processor/subscription_modification.go | 4 +- .../trace_configuration_data_retrieval.go | 4 +- .../ue_context_in_smf_data_retrieval.go | 5 +- internal/sbi/router.go | 2 - internal/sbi/server.go | 46 ++-------------- pkg/factory/config.go | 1 + pkg/service/init.go | 1 - 32 files changed, 113 insertions(+), 107 deletions(-) diff --git a/internal/sbi/api_eventexposure.go b/internal/sbi/api_eventexposure.go index b3cdefa..f4d2a4b 100644 --- a/internal/sbi/api_eventexposure.go +++ b/internal/sbi/api_eventexposure.go @@ -34,5 +34,4 @@ func (s *Server) getEventExposureRoutes() []Route { s.Processor().HandleUpdateEeSubscription, }, } - } diff --git a/internal/sbi/consumer/nrf_service.go b/internal/sbi/consumer/nrf_service.go index 1371bf0..79f0117 100644 --- a/internal/sbi/consumer/nrf_service.go +++ b/internal/sbi/consumer/nrf_service.go @@ -8,13 +8,14 @@ import ( "sync" "time" + "github.com/pkg/errors" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/Nnrf_NFDiscovery" "github.com/free5gc/openapi/Nnrf_NFManagement" "github.com/free5gc/openapi/models" udm_context "github.com/free5gc/udm/internal/context" "github.com/free5gc/udm/internal/logger" - "github.com/pkg/errors" ) type nnrfService struct { @@ -73,7 +74,8 @@ func (s *nnrfService) getNFDiscClient(uri string) *Nnrf_NFDiscovery.APIClient { func (s *nnrfService) SendSearchNFInstances( nrfUri string, targetNfType, requestNfType models.NfType, param Nnrf_NFDiscovery.SearchNFInstancesParamOpts) ( - *models.SearchResult, error) { + *models.SearchResult, error, +) { // Set client and set url chfContext := s.consumer.Context() @@ -134,7 +136,8 @@ func (s *nnrfService) SendDeregisterNFInstance() (problemDetails *models.Problem } func (s *nnrfService) RegisterNFInstance(ctx context.Context) ( - resouceNrfUri string, retrieveNfInstanceID string, err error) { + resouceNrfUri string, retrieveNfInstanceID string, err error, +) { udmContext := s.consumer.Context() client := s.getNFManagementClient(udmContext.NrfUri) nfProfile, err := s.buildNfProfile(udmContext) diff --git a/internal/sbi/consumer/udm_service.go b/internal/sbi/consumer/udm_service.go index 6359af4..e347c8e 100644 --- a/internal/sbi/consumer/udm_service.go +++ b/internal/sbi/consumer/udm_service.go @@ -101,7 +101,9 @@ func (s *nudmService) SubscribeToSharedDataProcedure(sdmSubscription *models.Sdm if res.StatusCode == http.StatusCreated { header = make(http.Header) udm_context.GetSelf().CreateSubstoNotifSharedData(sdmSubscriptionResp.SubscriptionId, &sdmSubscriptionResp) - reourceUri := udm_context.GetSelf().GetSDMUri() + "//shared-data-subscriptions/" + sdmSubscriptionResp.SubscriptionId + reourceUri := udm_context.GetSelf(). + GetSDMUri() + + "//shared-data-subscriptions/" + sdmSubscriptionResp.SubscriptionId header.Set("Location", reourceUri) return header, &sdmSubscriptionResp, nil } else if res.StatusCode == http.StatusNotFound { @@ -163,7 +165,10 @@ func (s *nudmService) UnsubscribeForSharedDataProcedure(subscriptionID string) * } } -func (s *nudmService) DataChangeNotificationProcedure(notifyItems []models.NotifyItem, supi string) *models.ProblemDetails { +func (s *nudmService) DataChangeNotificationProcedure( + notifyItems []models.NotifyItem, + supi string, +) *models.ProblemDetails { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDM_SDM, models.NfType_UDM) if err != nil { return pd diff --git a/internal/sbi/consumer/udr_service.go b/internal/sbi/consumer/udr_service.go index 14919bf..2a52bdf 100644 --- a/internal/sbi/consumer/udr_service.go +++ b/internal/sbi/consumer/udr_service.go @@ -14,6 +14,7 @@ import ( "time" "github.com/antihax/optional" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/Nudr_DataRepository" "github.com/free5gc/openapi/models" @@ -366,7 +367,10 @@ func (s *nudrService) UpdateEeSubscriptionProcedure(ueIdentity string, subscript } } -func (s *nudrService) ConfirmAuthDataProcedure(authEvent models.AuthEvent, supi string) (problemDetails *models.ProblemDetails) { +func (s *nudrService) ConfirmAuthDataProcedure( + authEvent models.AuthEvent, + supi string, +) (problemDetails *models.ProblemDetails) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) if err != nil { return pd @@ -411,7 +415,7 @@ func (s *nudrService) GenerateAuthDataProcedure(authInfoRequest models.Authentic logger.UeauLog.Traceln("In GenerateAuthDataProcedure") response = &models.AuthenticationInfoResult{} - rand.Seed(time.Now().UnixNano()) + rand.New(rand.NewSource(time.Now().UnixNano())) supi, err := suci.ToSupi(supiOrSuci, udm_context.GetSelf().SuciProfiles) if err != nil { problemDetails = &models.ProblemDetails{ @@ -839,7 +843,10 @@ func (s *nudrService) GenerateAuthDataProcedure(authInfoRequest models.Authentic return response, nil } -func (s *nudrService) UpdateProcedure(updateRequest models.PpData, gpsi string) (problemDetails *models.ProblemDetails) { +func (s *nudrService) UpdateProcedure( + updateRequest models.PpData, + gpsi string, +) (problemDetails *models.ProblemDetails) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) if err != nil { return pd @@ -1315,7 +1322,13 @@ func (s *nudrService) GetSharedDataProcedure(sharedDataIds []string, supportedFe } } -func (s *nudrService) GetSmDataProcedure(supi string, plmnID string, Dnn string, Snssai string, supportedFeatures string) ( +func (s *nudrService) GetSmDataProcedure( + supi string, + plmnID string, + Dnn string, + Snssai string, + supportedFeatures string, +) ( response interface{}, problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) @@ -1616,7 +1629,11 @@ func (s *nudrService) UnsubscribeProcedure(supi string, subscriptionID string) * } } -func (s *nudrService) ModifyProcedure(sdmSubsModification *models.SdmSubsModification, supi string, subscriptionID string) ( +func (s *nudrService) ModifyProcedure( + sdmSubsModification *models.SdmSubsModification, + supi string, + subscriptionID string, +) ( response *models.SdmSubscription, problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) @@ -1873,7 +1890,10 @@ func (s *nudrService) GetAmfNon3gppAccessProcedure(queryAmfContextNon3gppParamOp return &amfNon3GppAccessRegistration, nil } -func (s *nudrService) RegistrationAmf3gppAccessProcedure(registerRequest models.Amf3GppAccessRegistration, ueID string) ( +func (s *nudrService) RegistrationAmf3gppAccessProcedure( + registerRequest models.Amf3GppAccessRegistration, + ueID string, +) ( header http.Header, response *models.Amf3GppAccessRegistration, problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) @@ -1951,7 +1971,10 @@ func (s *nudrService) RegistrationAmf3gppAccessProcedure(registerRequest models. } } -func (s *nudrService) RegisterAmfNon3gppAccessProcedure(registerRequest models.AmfNon3GppAccessRegistration, ueID string) ( +func (s *nudrService) RegisterAmfNon3gppAccessProcedure( + registerRequest models.AmfNon3GppAccessRegistration, + ueID string, +) ( header http.Header, response *models.AmfNon3GppAccessRegistration, problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) @@ -2112,7 +2135,10 @@ func (s *nudrService) UpdateAmf3gppAccessProcedure(request models.Amf3GppAccessR return nil } -func (s *nudrService) UpdateAmfNon3gppAccessProcedure(request models.AmfNon3GppAccessRegistrationModification, ueID string) ( +func (s *nudrService) UpdateAmfNon3gppAccessProcedure( + request models.AmfNon3GppAccessRegistrationModification, + ueID string, +) ( problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) @@ -2206,7 +2232,10 @@ func (s *nudrService) UpdateAmfNon3gppAccessProcedure(request models.AmfNon3GppA return problemDetails } -func (s *nudrService) DeregistrationSmfRegistrationsProcedure(ueID string, pduSessionID string) (problemDetails *models.ProblemDetails) { +func (s *nudrService) DeregistrationSmfRegistrationsProcedure( + ueID string, + pduSessionID string, +) (problemDetails *models.ProblemDetails) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) if err != nil { return pd @@ -2234,7 +2263,11 @@ func (s *nudrService) DeregistrationSmfRegistrationsProcedure(ueID string, pduSe return nil } -func (s *nudrService) RegistrationSmfRegistrationsProcedure(request *models.SmfRegistration, ueID string, pduSessionID string) ( +func (s *nudrService) RegistrationSmfRegistrationsProcedure( + request *models.SmfRegistration, + ueID string, + pduSessionID string, +) ( header http.Header, response *models.SmfRegistration, problemDetails *models.ProblemDetails, ) { ctx, pd, err := udm_context.GetSelf().GetTokenCtx(models.ServiceName_NUDR_DR, models.NfType_UDR) diff --git a/internal/sbi/eventexposure/api_create_ee_subscription.go b/internal/sbi/eventexposure/api_create_ee_subscription.go index 10b2828..2e11a38 100644 --- a/internal/sbi/eventexposure/api_create_ee_subscription.go +++ b/internal/sbi/eventexposure/api_create_ee_subscription.go @@ -37,7 +37,7 @@ func HTTPCreateEeSubscription(c *gin.Context) { return } - //err = openapi.Deserialize(&eeSubscription, requestBody, "application/json") + // err = openapi.Deserialize(&eeSubscription, requestBody, "application/json") err = openapi.Deserialize(nil, requestBody, "application/json") if err != nil { problemDetail := "[Request Body] " + err.Error() diff --git a/internal/sbi/processor/access_and_mobility_subscription_data_retrieval.go b/internal/sbi/processor/access_and_mobility_subscription_data_retrieval.go index b4e1e21..31fed99 100644 --- a/internal/sbi/processor/access_and_mobility_subscription_data_retrieval.go +++ b/internal/sbi/processor/access_and_mobility_subscription_data_retrieval.go @@ -52,7 +52,9 @@ func (p *Processor) HandleGetAmData(c *gin.Context) { } } -func (p *Processor) getPlmnIDStruct(queryParameters url.Values) (plmnIDStruct *models.PlmnId, problemDetails *models.ProblemDetails) { +func (p *Processor) getPlmnIDStruct( + queryParameters url.Values, +) (plmnIDStruct *models.PlmnId, problemDetails *models.ProblemDetails) { if queryParameters["plmn-id"] != nil { plmnIDJson := queryParameters["plmn-id"][0] plmnIDStruct := &models.PlmnId{} diff --git a/internal/sbi/processor/amf3_gpp_access_registration_info_retrieval.go b/internal/sbi/processor/amf3_gpp_access_registration_info_retrieval.go index 9704536..61a4fbd 100644 --- a/internal/sbi/processor/amf3_gpp_access_registration_info_retrieval.go +++ b/internal/sbi/processor/amf3_gpp_access_registration_info_retrieval.go @@ -3,14 +3,14 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetAmf3gppAccess - retrieve the AMF registration for 3GPP access information func (p *Processor) HandleGetAmf3gppAccess(c *gin.Context) { - // step 1: log logger.UecmLog.Infof("Handle HandleGetAmf3gppAccessRequest") @@ -37,5 +37,4 @@ func (p *Processor) HandleGetAmf3gppAccess(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/amf_non3_gpp_access_registration_info_retrieval.go b/internal/sbi/processor/amf_non3_gpp_access_registration_info_retrieval.go index 640882e..bf04668 100644 --- a/internal/sbi/processor/amf_non3_gpp_access_registration_info_retrieval.go +++ b/internal/sbi/processor/amf_non3_gpp_access_registration_info_retrieval.go @@ -4,15 +4,15 @@ import ( "net/http" "github.com/antihax/optional" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/Nudr_DataRepository" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetAmfNon3gppAccess - retrieve the AMF registration for non-3GPP access information func (p *Processor) HandleGetAmfNon3gppAccess(c *gin.Context) { - // step 1: log logger.UecmLog.Infoln("Handle GetAmfNon3gppAccessRequest") @@ -42,5 +42,4 @@ func (p *Processor) HandleGetAmfNon3gppAccess(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/amf_registration_for3_gpp_access.go b/internal/sbi/processor/amf_registration_for3_gpp_access.go index bca1894..2e65a09 100644 --- a/internal/sbi/processor/amf_registration_for3_gpp_access.go +++ b/internal/sbi/processor/amf_registration_for3_gpp_access.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // RegistrationAmf3gppAccess - register as AMF for 3GPP access diff --git a/internal/sbi/processor/amf_registration_for_non3_gpp_access.go b/internal/sbi/processor/amf_registration_for_non3_gpp_access.go index 95ad707..45dd8c2 100644 --- a/internal/sbi/processor/amf_registration_for_non3_gpp_access.go +++ b/internal/sbi/processor/amf_registration_for_non3_gpp_access.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // Register - register as AMF for non-3GPP access @@ -64,5 +65,4 @@ func (p *Processor) HandleRegistrationAmfNon3gppAccess(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/ee_subscription.go b/internal/sbi/processor/ee_subscription.go index c5249f0..10a7d8e 100644 --- a/internal/sbi/processor/ee_subscription.go +++ b/internal/sbi/processor/ee_subscription.go @@ -72,7 +72,6 @@ func (p *Processor) HandleCreateEeSubscription(c *gin.Context) { } func (p *Processor) HandleDeleteEeSubscription(c *gin.Context) { - ueIdentity := c.Params.ByName("ueIdentity") subscriptionID := c.Params.ByName("subscriptionId") @@ -124,5 +123,4 @@ func (p *Processor) HandleUpdateEeSubscription(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/gpsi_to_supi_translation.go b/internal/sbi/processor/gpsi_to_supi_translation.go index 5649f6a..bda7afd 100644 --- a/internal/sbi/processor/gpsi_to_supi_translation.go +++ b/internal/sbi/processor/gpsi_to_supi_translation.go @@ -11,7 +11,7 @@ import ( // GetIdTranslationResult - retrieve a UE's SUPI func (p *Processor) HandleGetIdTranslationResult(c *gin.Context) { - //req.Query.Set("SupportedFeatures", c.Query("supported-features")) + // req.Query.Set("SupportedFeatures", c.Query("supported-features")) // step 1: log logger.SdmLog.Infof("Handle GetIdTranslationResultRequest") diff --git a/internal/sbi/processor/parameter_update_in_the_amf_registration_for3_gpp_access.go b/internal/sbi/processor/parameter_update_in_the_amf_registration_for3_gpp_access.go index 4b6508c..06b07e5 100644 --- a/internal/sbi/processor/parameter_update_in_the_amf_registration_for3_gpp_access.go +++ b/internal/sbi/processor/parameter_update_in_the_amf_registration_for3_gpp_access.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // UpdateAmf3gppAccess - Update a parameter in the AMF registration for 3GPP access @@ -58,5 +59,4 @@ func (p *Processor) HandleUpdateAmf3gppAccess(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/parameter_update_in_the_amf_registration_for_non3_gpp_access.go b/internal/sbi/processor/parameter_update_in_the_amf_registration_for_non3_gpp_access.go index db28db9..9fddc79 100644 --- a/internal/sbi/processor/parameter_update_in_the_amf_registration_for_non3_gpp_access.go +++ b/internal/sbi/processor/parameter_update_in_the_amf_registration_for_non3_gpp_access.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // UpdateAmfNon3gppAccess - update a parameter in the AMF registration for non-3GPP access @@ -57,5 +58,4 @@ func (p *Processor) HandleUpdateAmfNon3gppAccess(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/retrieval_of_multiple_data_sets.go b/internal/sbi/processor/retrieval_of_multiple_data_sets.go index 280e696..7497837 100644 --- a/internal/sbi/processor/retrieval_of_multiple_data_sets.go +++ b/internal/sbi/processor/retrieval_of_multiple_data_sets.go @@ -5,9 +5,10 @@ import ( "net/url" "strings" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetSupi - retrieve multiple data sets diff --git a/internal/sbi/processor/retrieval_of_shared_data.go b/internal/sbi/processor/retrieval_of_shared_data.go index da91f9d..314b9e8 100644 --- a/internal/sbi/processor/retrieval_of_shared_data.go +++ b/internal/sbi/processor/retrieval_of_shared_data.go @@ -3,9 +3,10 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetSharedData - retrieve shared data diff --git a/internal/sbi/processor/session_management_subscription_data_retrieval.go b/internal/sbi/processor/session_management_subscription_data_retrieval.go index fb77adb..de3a147 100644 --- a/internal/sbi/processor/session_management_subscription_data_retrieval.go +++ b/internal/sbi/processor/session_management_subscription_data_retrieval.go @@ -4,9 +4,10 @@ import ( "net/http" "net/url" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetSmData - retrieve a UE's Session Management Subscription Data @@ -51,5 +52,4 @@ func (p *Processor) HandleGetSmData(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/slice_selection_subscription_data_retrieval.go b/internal/sbi/processor/slice_selection_subscription_data_retrieval.go index 6254334..8b66fbe 100644 --- a/internal/sbi/processor/slice_selection_subscription_data_retrieval.go +++ b/internal/sbi/processor/slice_selection_subscription_data_retrieval.go @@ -4,9 +4,10 @@ import ( "net/http" "net/url" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetNssai - retrieve a UE's subscribed NSSAI @@ -47,5 +48,4 @@ func (p *Processor) HandleGetNssai(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/smf_deregistration.go b/internal/sbi/processor/smf_deregistration.go index a4e70e2..c5e6dda 100644 --- a/internal/sbi/processor/smf_deregistration.go +++ b/internal/sbi/processor/smf_deregistration.go @@ -3,13 +3,13 @@ package processor import ( "net/http" - "github.com/free5gc/udm/internal/logger" "github.com/gin-gonic/gin" + + "github.com/free5gc/udm/internal/logger" ) // DeregistrationSmfRegistrations - delete an SMF registration func (p *Processor) HandleDeregistrationSmfRegistrations(c *gin.Context) { - // step 1: log logger.UecmLog.Infof("Handle DeregistrationSmfRegistrations") @@ -28,5 +28,4 @@ func (p *Processor) HandleDeregistrationSmfRegistrations(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/smf_registration.go b/internal/sbi/processor/smf_registration.go index 0561001..ce8038f 100644 --- a/internal/sbi/processor/smf_registration.go +++ b/internal/sbi/processor/smf_registration.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // RegistrationSmfRegistrations - register as SMF @@ -49,7 +50,11 @@ func (p *Processor) HandleRegistrationSmfRegistrations(c *gin.Context) { pduSessionID := c.Params.ByName("pduSessionId") // step 3: handle the message - header, response, problemDetails := p.consumer.RegistrationSmfRegistrationsProcedure(&smfRegistration, ueID, pduSessionID) + header, response, problemDetails := p.consumer.RegistrationSmfRegistrationsProcedure( + &smfRegistration, + ueID, + pduSessionID, + ) // step 4: process the return value from step 3 if response != nil { @@ -67,5 +72,4 @@ func (p *Processor) HandleRegistrationSmfRegistrations(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/smf_selection_subscription_data_retrieval.go b/internal/sbi/processor/smf_selection_subscription_data_retrieval.go index c262dc2..3b2b16f 100644 --- a/internal/sbi/processor/smf_selection_subscription_data_retrieval.go +++ b/internal/sbi/processor/smf_selection_subscription_data_retrieval.go @@ -4,9 +4,10 @@ import ( "net/http" "net/url" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetSmfSelectData - retrieve a UE's SMF Selection Subscription Data @@ -47,5 +48,4 @@ func (p *Processor) HandleGetSmfSelectData(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/subscription_creation.go b/internal/sbi/processor/subscription_creation.go index 578accf..bc40cd9 100644 --- a/internal/sbi/processor/subscription_creation.go +++ b/internal/sbi/processor/subscription_creation.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // Subscribe - subscribe to notifications diff --git a/internal/sbi/processor/subscription_creation_for_shared_data.go b/internal/sbi/processor/subscription_creation_for_shared_data.go index 232b9ef..45ac439 100644 --- a/internal/sbi/processor/subscription_creation_for_shared_data.go +++ b/internal/sbi/processor/subscription_creation_for_shared_data.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // SubscribeToSharedData - subscribe to notifications for shared data @@ -48,7 +49,7 @@ func (p *Processor) HandleSubscribeToSharedData(c *gin.Context) { // step 3: handle the message header, response, problemDetails := p.consumer.SubscribeToSharedDataProcedure(&sharedDataSubsReq) - //var rsp *httpwrapper.Response + // var rsp *httpwrapper.Response // step 4: process the return value from step 3 if response != nil { // status code is based on SPEC, and option headers @@ -70,5 +71,4 @@ func (p *Processor) HandleSubscribeToSharedData(c *gin.Context) { c.JSON(http.StatusInternalServerError, problemDetails) return } - } diff --git a/internal/sbi/processor/subscription_deletion.go b/internal/sbi/processor/subscription_deletion.go index b06373e..71553e5 100644 --- a/internal/sbi/processor/subscription_deletion.go +++ b/internal/sbi/processor/subscription_deletion.go @@ -3,13 +3,13 @@ package processor import ( "net/http" - "github.com/free5gc/udm/internal/logger" "github.com/gin-gonic/gin" + + "github.com/free5gc/udm/internal/logger" ) // Unsubscribe - unsubscribe from notifications func (p *Processor) HandleUnsubscribe(c *gin.Context) { - logger.SdmLog.Infof("Handle Unsubscribe") // step 2: retrieve request diff --git a/internal/sbi/processor/subscription_deletion_for_shared_data.go b/internal/sbi/processor/subscription_deletion_for_shared_data.go index 70e2d9e..3a6d5ce 100644 --- a/internal/sbi/processor/subscription_deletion_for_shared_data.go +++ b/internal/sbi/processor/subscription_deletion_for_shared_data.go @@ -3,8 +3,9 @@ package processor import ( "net/http" - "github.com/free5gc/udm/internal/logger" "github.com/gin-gonic/gin" + + "github.com/free5gc/udm/internal/logger" ) // UnsubscribeForSharedData - unsubscribe from notifications for shared data @@ -24,5 +25,4 @@ func (p *Processor) HandleUnsubscribeForSharedData(c *gin.Context) { c.Status(http.StatusNoContent) return } - } diff --git a/internal/sbi/processor/subscription_modification.go b/internal/sbi/processor/subscription_modification.go index 8c44732..29eaac7 100644 --- a/internal/sbi/processor/subscription_modification.go +++ b/internal/sbi/processor/subscription_modification.go @@ -3,10 +3,11 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi" "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // Modify - modify the subscription @@ -59,7 +60,6 @@ func (p *Processor) HandleModify(c *gin.Context) { c.JSON(int(problemDetails.Status), problemDetails) return } else { - problemDetails = &models.ProblemDetails{ Status: http.StatusForbidden, Cause: "UNSPECIFIED", diff --git a/internal/sbi/processor/trace_configuration_data_retrieval.go b/internal/sbi/processor/trace_configuration_data_retrieval.go index 9617e71..92672a6 100644 --- a/internal/sbi/processor/trace_configuration_data_retrieval.go +++ b/internal/sbi/processor/trace_configuration_data_retrieval.go @@ -3,9 +3,10 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetTraceData - retrieve a UE's Trace Configuration Data @@ -36,5 +37,4 @@ func (p *Processor) HandleGetTraceData(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/processor/ue_context_in_smf_data_retrieval.go b/internal/sbi/processor/ue_context_in_smf_data_retrieval.go index eef77d2..1a6e50f 100644 --- a/internal/sbi/processor/ue_context_in_smf_data_retrieval.go +++ b/internal/sbi/processor/ue_context_in_smf_data_retrieval.go @@ -3,14 +3,14 @@ package processor import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/free5gc/openapi/models" "github.com/free5gc/udm/internal/logger" - "github.com/gin-gonic/gin" ) // GetUeContextInSmfData - retrieve a UE's UE Context In SMF Data func (p *Processor) HandleGetUeContextInSmfData(c *gin.Context) { - // step 1: log logger.SdmLog.Infof("Handle GetUeContextInSmfData") @@ -37,5 +37,4 @@ func (p *Processor) HandleGetUeContextInSmfData(c *gin.Context) { c.JSON(http.StatusForbidden, problemDetails) return } - } diff --git a/internal/sbi/router.go b/internal/sbi/router.go index 604c834..4be6bdf 100644 --- a/internal/sbi/router.go +++ b/internal/sbi/router.go @@ -35,7 +35,6 @@ func AddService(group *gin.RouterGroup, routes []Route) { group.PATCH(route.Pattern, route.HandlerFunc) } } - } func AddSDMService(group *gin.RouterGroup, routes []Route) { @@ -70,5 +69,4 @@ func AddUEAUService(group *gin.RouterGroup, routes []Route) { group.PATCH(route.Pattern, route.HandlerFunc) } } - } diff --git a/internal/sbi/server.go b/internal/sbi/server.go index ca0d3e2..ba5755e 100644 --- a/internal/sbi/server.go +++ b/internal/sbi/server.go @@ -9,29 +9,21 @@ import ( "sync" "time" - "github.com/free5gc/openapi/models" - "github.com/free5gc/udm/pkg/app" - "github.com/free5gc/udm/pkg/factory" - "github.com/free5gc/util/httpwrapper" + "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" + "github.com/free5gc/openapi/models" udm_context "github.com/free5gc/udm/internal/context" "github.com/free5gc/udm/internal/logger" "github.com/free5gc/udm/internal/sbi/consumer" "github.com/free5gc/udm/internal/sbi/processor" "github.com/free5gc/udm/internal/util" + "github.com/free5gc/udm/pkg/app" + "github.com/free5gc/udm/pkg/factory" + "github.com/free5gc/util/httpwrapper" logger_util "github.com/free5gc/util/logger" - "github.com/gin-gonic/gin" ) -type udm interface { - Config() *factory.Config - Context() *udm_context.UdmNFContext - CancelContext() context.Context - //Consumer() *consumer.Consumer - // Processor() *processor.Processor -} - type ServerUdm interface { app.App @@ -71,7 +63,6 @@ func NewServer(udm ServerUdm, tlsKeyLogPath string) (*Server, error) { }*/ return s, err - } func (s *Server) Run(traceCtx context.Context, wg *sync.WaitGroup) error { @@ -163,13 +154,6 @@ func (s *Server) shutdownHttpServer() { } } -func bindRouter(cfg *factory.Config, router *gin.Engine, tlsKeyLogPath string) (*http.Server, error) { - sbiConfig := cfg.Configuration.Sbi - bindAddr := fmt.Sprintf("%s:%d", sbiConfig.BindingIPv4, sbiConfig.Port) - - return httpwrapper.NewHttp2Server(bindAddr, tlsKeyLogPath, router) -} - func newRouter(s *Server) *gin.Engine { router := logger_util.NewGinWithLogrus(logger.GinLog) @@ -237,23 +221,3 @@ func newRouter(s *Server) *gin.Engine { return router } - -func (s *Server) unsecureServe() error { - return s.httpServer.ListenAndServe() -} - -func (s *Server) secureServe() error { - sbiConfig := s.Config().Configuration.Sbi - - pemPath := sbiConfig.Tls.Pem - if pemPath == "" { - pemPath = factory.UdmConfig.GetCertKeyPath() - } - - keyPath := sbiConfig.Tls.Key - if keyPath == "" { - keyPath = factory.UdmConfig.GetCertKeyPath() - } - - return s.httpServer.ListenAndServeTLS(pemPath, keyPath) -} diff --git a/pkg/factory/config.go b/pkg/factory/config.go index f1f7675..3aeb89a 100644 --- a/pkg/factory/config.go +++ b/pkg/factory/config.go @@ -124,6 +124,7 @@ func (c *Configuration) validate() (bool, error) { result, err := govalidator.ValidateStruct(c) return result, err } + func (c *Config) GetCertPemPath() string { c.RLock() defer c.RUnlock() diff --git a/pkg/service/init.go b/pkg/service/init.go index 64eba23..8283b81 100644 --- a/pkg/service/init.go +++ b/pkg/service/init.go @@ -1,7 +1,6 @@ package service import ( - "context" "io" "os"