Commit 8bbf1223 authored by Ikram Haq's avatar Ikram Haq
Browse files

Fix issue related handle request from multiple server(different URL's)

parent b74d9858

charts/meep-app-enablement/values-template.yaml

+8 −0
Original line number Diff line number Diff line
@@ -46,9 +46,13 @@ ingress: 
        {{- if .IsMepService }}

        - /{{.SandboxName}}/{{.MepName}}/mec_app_support

        - /{{.SandboxName}}/{{.MepName}}/mec_service_mgmt

        - /{{.SandboxName}}/{{.MepName}}/service-apis

        - /{{.SandboxName}}/{{.MepName}}/published-apis

        {{- else }}

        - /{{.SandboxName}}/mec_app_support

        - /{{.SandboxName}}/mec_service_mgmt

        - /{{.SandboxName}}/service-apis

        - /{{.SandboxName}}/published-apis

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -57,10 +61,14 @@ ingress: 
    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/mec_service_mgmt(/|$)(.*)$ /mec_service_mgmt/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/published-apis(/|$)(.*)$ /published-apis/$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;

      rewrite ^/{{ .SandboxName }}/mec_service_mgmt(/|$)(.*)$ /mec_service_mgmt/$2 break;

      rewrite ^/{{ .SandboxName }}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/published-apis(/|$)(.*)$ /published-apis/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-app-enablement&sbox={{.SandboxName}}&mep={{.MepName}}

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

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ func appServicesGET(w http.ResponseWriter, r *http.Request) { 
	log.Info("appServicesGET")

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

	vars := mux.Vars(r)

	appId := vars["appInstanceId"]

	appId := vars["apfId"]



	mutex.Lock()

	defer mutex.Unlock()

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

+11 −0
Original line number Diff line number Diff line
@@ -328,24 +328,35 @@ var routes = Routes{ 
		"/service-apis/v1/",

		Index,

	},



	Route{

		"ServicesGET",

		strings.ToUpper("Get"),

		"/service-apis/v1/allServiceAPIs",

		capifMgmt.ServicesGET,

	},



	Route{

		"Index",

		"GET",

		"/published-apis/v1/",

		Index,

	},



	Route{

		"AppServicesGET",

		strings.ToUpper("Get"),

		"/published-apis/v1/{apfId}/service-apis",

		capifMgmt.AppServicesGET,

	},



	Route{

		"AppServicesPOST",

		strings.ToUpper("Post"),

		"/published-apis/v1/{apfId}/service-apis",

		capifMgmt.AppServicesPOST,

	},



	Route{

		"Index",

		"GET",