Unverified Commit 339153b7 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #318 from dilallkx/kd_sp41_websocket 

Subscriptions package + Websocket support
parents dd5a54a3 0a11cfce

.meepctl-repocfg.yaml

+6 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specifications
@@ -1023,6 +1023,11 @@ repo: 
        src: go-packages/meep-sessions

        # supports linting

        lint: true

      meep-subscriptions:

        # location of source code

        src: go-packages/meep-subscriptions

        # supports linting

        lint: true

      meep-users:

        # location of source code

        src: go-packages/meep-users

charts/meep-wais/values-template.yaml

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ ingress: 
        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx

    nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"

    nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"

    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

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

config/permissions-open.yaml

+3 −0
Original line number Diff line number Diff line
@@ -805,6 +805,9 @@ default: 
#       - name: 'UserApi'

#         path: '/user-api'

#         mode: 'allow'

#       - name: 'Websocket'

#         path: '/ws'

#         mode: 'allow'

#     endpoints:

#       - name: 'Index'

#         path: '/'

config/permissions-secure.yaml

+4 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ services: 
      roles:

        admin: 'allow'

        user: 'allow'

    fileservers:

      - name: 'Websocket'

        path: '/ws'

        mode: 'allow'

  #------------------------------

  #  AMSI Service (Sbox)

  #------------------------------

go-apps/meep-wais/go.mod

+3 −1
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0

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

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr v0.0.0

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

	github.com/gorilla/handlers v1.4.0

	github.com/gorilla/handlers v1.5.1

	github.com/gorilla/mux v1.8.0

	github.com/prometheus/client_golang v1.9.0

)
@@ -35,5 +36,6 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis => ../../go-packages/meep-redis

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-subscriptions => ../../go-packages/meep-subscriptions

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-swagger-api-mgr => ../../go-packages/meep-swagger-api-mgr

)