Commit 157ffdc2 authored by Simon Pastor's avatar Simon Pastor
Browse files

merge app-support and svc-mgmt

parent d31dcaf6

.meepctl-repocfg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ repo: 
    # platform ingress configuration

    ingress:

      # host name

      host: my-platform-fqdn

      host: 10.190.115.20

      # enable https only (redirect http requests to https port)

      https-only: false

      # bind to host ports (true) or node ports (false)

config/permissions-open.yaml

+14 −0
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ default: 
#         roles:

#           admin: 'allow'

#           user: 'allow'

#       - name: 'GetDistanceGeoDataByName'

#         path: '/geodata/{assetName}/distanceTo'

#         method: 'POST'

#         mode: 'verify'

#         roles:

#           admin: 'allow'

#           user: 'allow'

#       - name: 'GetGeoDataByName'

#         path: '/geodata/{assetName}'

#         method: 'GET'
@@ -195,6 +202,13 @@ default: 
#         roles:

#           admin: 'allow'

#           user: 'allow'

#       - name: 'GetWithinRangeByName'

#         path: '/geodata/{assetName}/withinRange'

#         method: 'POST'

#         mode: 'verify'

#         roles:

#           admin: 'allow'

#           user: 'allow'

#       - name: 'UpdateGeoDataByName'

#         path: '/geodata/{assetName}'

#         method: 'POST'

go-apps/meep-app-enablement/go.mod

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ module github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement 
go 1.12



require (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-key-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-data-model v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-cache v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger v0.0.0
@@ -11,7 +11,7 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-metrics v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/antihax/optional v1.0.0 // indirect

	github.com/gorilla/handlers v1.4.0

	github.com/gorilla/mux v1.8.0

go-apps/meep-app-enablement/server/app-enablement.go

+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ import ( 
	"os"

	"strings"



	appSupport "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-support"

	servMgmt "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/service-mgmt"



	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)
@@ -30,6 +33,7 @@ const serviceName = "Edge Platform Application Enablement Service" 
var hostUrl *url.URL

var sandboxName string



//var influxAddr string = "http://meep-influxdb.default.svc.cluster.local:8086"

// Init - EPAE Service initialization

func Init() (err error) {
@@ -56,6 +60,18 @@ func Init() (err error) { 
	}

	log.Info("resource URL: ", hostUrl)



	err = servMgmt.Init()

	if err != nil {

		log.Info("SIMON1")

		return err

	}



	err = appSupport.Init()

	if err != nil {

		log.Info("SIMON2")

		return err

	}



	reInit()



	return nil

go-apps/meep-app-enablement/server/app-support/api_app_confirm_ready.go

+1 −2
Original line number Diff line number Diff line
@@ -28,6 +28,5 @@ import ( 
)



func ApplicationsConfirmReadyPOST(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=UTF-8")

	w.WriteHeader(http.StatusOK)

	applicationsConfirmReadyPOST(w, r)

}