Commit 7fee507d authored by Yann Garcia's avatar Yann Garcia
Browse files

Lint errors fixed in CAPIF

parent ab324488

charts/meep-dai/templates/onboardedapp-pv.yaml

+2 −0
Original line number Diff line number Diff line 
{{- if .Values.onboardedapp.enabled}}

kind: PersistentVolume

apiVersion: v1

metadata:
@@ -31,3 +32,4 @@ spec: 
  resources:

    requests:

      storage: 100Mi

{{- end}}

go-apps/meep-app-enablement/server/capif-mgmt/convert.go

+37 −33
Original line number Diff line number Diff line
@@ -40,14 +40,15 @@ func convertServiceInfoToJson_1(obj *ServiceApiDescription) string { 
	return string(jsonInfo)

}



func convertServiceInfoToJson_2(obj *ServiceApiDescriptionPatch) string {

	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}

	return string(jsonInfo)

}

// FSCOM Unsused

// func convertServiceInfoToJson_2(obj *ServiceApiDescriptionPatch) string {

// 	jsonInfo, err := json.Marshal(*obj)

// 	if err != nil {

// 		log.Error(err.Error())

// 		return ""

// 	}

// 	return string(jsonInfo)

// }



func convertJsonToServiceInfo(jsonInfo string) *ServiceInfo {

	var obj ServiceInfo
@@ -59,14 +60,15 @@ func convertJsonToServiceInfo(jsonInfo string) *ServiceInfo { 
	return &obj

}



func convertSerAvailabilityNotifSubToJson(obj *SerAvailabilityNotificationSubscription) string {

	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}

	return string(jsonInfo)

}

// FSCOM Unsused

// func convertSerAvailabilityNotifSubToJson(obj *SerAvailabilityNotificationSubscription) string {

// 	jsonInfo, err := json.Marshal(*obj)

// 	if err != nil {

// 		log.Error(err.Error())

// 		return ""

// 	}

// 	return string(jsonInfo)

// }



func convertSerAvailabilityNotifSubToJson_1(obj *EventSubscription) string {

	jsonInfo, err := json.Marshal(*obj)
@@ -77,15 +79,16 @@ func convertSerAvailabilityNotifSubToJson_1(obj *EventSubscription) string { 
	return string(jsonInfo)

}



func convertJsonToSerAvailabilityNotifSub(jsonData string) *SerAvailabilityNotificationSubscription {

	var obj SerAvailabilityNotificationSubscription

	err := json.Unmarshal([]byte(jsonData), &obj)

	if err != nil {

		log.Error(err.Error())

		return nil

	}

	return &obj

}

// FSCOM Unsused

// func convertJsonToSerAvailabilityNotifSub(jsonData string) *SerAvailabilityNotificationSubscription {

// 	var obj SerAvailabilityNotificationSubscription

// 	err := json.Unmarshal([]byte(jsonData), &obj)

// 	if err != nil {

// 		log.Error(err.Error())

// 		return nil

// 	}

// 	return &obj

// }



// Convert []string back to []CapifEventFilter

func convertStringsToEventFilters(stringFilters []string) []CapifEventFilter {
@@ -134,14 +137,15 @@ func convertJsonToSerAvailabilityNotifSub_1(jsonData string) *EventSubscription 
	return &obj

}



func convertServiceAvailabilityNotifToJson(obj *ServiceAvailabilityNotification) string {

	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}

	return string(jsonInfo)

}

// FSCOM Unsused

// func convertServiceAvailabilityNotifToJson(obj *ServiceAvailabilityNotification) string {

// 	jsonInfo, err := json.Marshal(*obj)

// 	if err != nil {

// 		log.Error(err.Error())

// 		return ""

// 	}

// 	return string(jsonInfo)

// }



func convertServiceAvailabilityNotifToJson_1(obj *EventNotification) string {

	jsonInfo, err := json.Marshal(*obj)

go-apps/meep-app-enablement/server/capif-mgmt/model_mec_transport_info_capif_ext.go

+16 −17
Original line number Diff line number Diff line
@@ -26,4 +26,3 @@ package server 
	// Additional implementation specific details of the transport

	ImplSpecificInfo string `json:"implSpecificInfo,omitempty"`

}
 
 
 No newline at end of file

go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go

+15 −14
Original line number Diff line number Diff line
@@ -2252,20 +2252,21 @@ func validateCategoryRef(categoryRef *CategoryRef) string { 
	return ""

}



func newSerAvailabilityNotifSubCfg(sub *SerAvailabilityNotificationSubscription, subId string, appId string) *subs.SubscriptionCfg {

	subCfg := &subs.SubscriptionCfg{

		Id:                  subId,

		AppId:               appId,

		Type:                SER_AVAILABILITY_NOTIF_SUB_TYPE,

		Self:                sub.Links.Self.Href,

		NotifyUrl:           sub.CallbackReference,

		ExpiryTime:          nil,

		PeriodicInterval:    0,

		RequestTestNotif:    false,

		RequestWebsocketUri: false,

	}

	return subCfg

}

// FSCOM Unsused

// func newSerAvailabilityNotifSubCfg(sub *SerAvailabilityNotificationSubscription, subId string, appId string) *subs.SubscriptionCfg {

// 	subCfg := &subs.SubscriptionCfg{

// 		Id:                  subId,

// 		AppId:               appId,

// 		Type:                SER_AVAILABILITY_NOTIF_SUB_TYPE,

// 		Self:                sub.Links.Self.Href,

// 		NotifyUrl:           sub.CallbackReference,

// 		ExpiryTime:          nil,

// 		PeriodicInterval:    0,

// 		RequestTestNotif:    false,

// 		RequestWebsocketUri: false,

// 	}

// 	return subCfg

// }



func newSerAvailabilityNotifSubCfg_1(sub *EventSubscription, subId string, appId string) *subs.SubscriptionCfg {

	var eventFilters []string