rubypitaya 2.18.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d15208a32190c01690735d3d8433bb0f8cc9b6f71a64f7897ba668c21e4e97
-  data.tar.gz: 7396c21b202d611ea5945fd9838b68323b4751777d3e154b20b31557ee470b7a
+  metadata.gz: 29e44f8dac6ea62a79303ae177f79515dc38309175c0e30b54fd95c0a7a7237e
+  data.tar.gz: cd1a3663b60d5dbd62e521d7590560dad861f6eb857033001cef259ada067149
 SHA512:
-  metadata.gz: 6b70755f160f42aa9a145bf55c0709bb82ec92f1f2105874127439bdc286ea124e7f2093cdae34a377d595bb54e21e75af244d34cbd9c30f8feac08849db7d9a
-  data.tar.gz: 50df16ee2575fd5840b0af30cfa3aedb9a7e4b35d27291a3a484ac2233b09b41700618ef9a1d8b2223cc1dba3e0cc0d8c7fc42a168971e548bd0301e34b77e7d
+  metadata.gz: baee0fc660cb49a6f68ef705ea371b29e1f6dbb7da0db714d88d25ffc593fd8b94155a296ae8341454a9b79e33a3251a471b19256dd9c1bcf49ee84182692ea4
+  data.tar.gz: adf400ab74394136cfdfe99688368996f39ddc4cbd9f57671d386ea2fa7bbf1074927fdb4a51da9239b8998e546a8db2aacb73a16aea78ee682f474b3072039b

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.18.0'
+gem 'rubypitaya', '2.19.0'
 
 group :development do
   gem 'pry', '0.14.0'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -50,11 +50,11 @@ GEM
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    ffi (1.14.2)
-    google-protobuf (3.15.3-x86_64-linux)
+    ffi (1.15.0)
+    google-protobuf (3.15.5)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
-    grpc (1.36.0-x86_64-linux)
+    grpc (1.36.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.0)
     i18n (1.8.9)
@@ -108,7 +108,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.4)
-    rubypitaya (2.18.0)
+    rubypitaya (2.19.0)
       activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -149,7 +149,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.18.0)
+  rubypitaya (= 2.19.0)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -41,7 +41,7 @@ test-cucumber:
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
 	@rm -f Gemfile.lock
-	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2-slim bundle install
 
 ## + Improve metagame
 

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -69,9 +69,13 @@ services:
       ETCD_LEASE_SECONDS: '60'
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
+      DATABASE_PORT: 5432
       DATABASE_USER: 'postgres'
       DATABASE_PASSWORD: 'postgres'
       DATABASE_NAME: 'ruby_pitaya'
+      HTTP_AUTH_ENABLED: 'false'
+      HTTP_AUTH_USER: 'user'
+      HTTP_AUTH_PASS: 'pass'
 
   rubypitaya-console:
     <<: *rubypitaya

data/lib/rubypitaya/app-template/docker/dev/Dockerfile

@@ -1,19 +1,23 @@
-FROM ruby:2.7.2
+FROM ruby:2.7.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt update && \
     apt install -y --no-install-recommends \
-    docker.io \
-    postgresql-client \
+    netcat \
+    libpq-dev \
+    build-essential \
     && rm -rf /var/lib/apt/lists/*
 
-COPY Gemfile Gemfile.lock ./
+WORKDIR /app/rubypitaya/
 
-RUN bundle install
+COPY Gemfile Gemfile.lock ./
 
-WORKDIR /app/rubypitaya/
+RUN bundle config --global jobs 4 && \
+    bundle config --global set clean 'true' \
+    bundle config --global git.allow_insecure true && \
+    bundle install
 
 COPY . .
 

data/lib/rubypitaya/app-template/docker/entrypoint.sh

@@ -3,10 +3,8 @@
 cmd="$@"
 
 echo "=> Waiting for postgres"
-until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -U "$DATABASE_USER" -c '\q' > /dev/null 2>&1; do
-  echo "=> Waiting for Postgres..."
-  sleep 1
-done
+
+./docker/wait_for.sh $DATABASE_HOST:$DATABASE_PORT
 
 echo "=> Postgres is ready"
 

data/lib/rubypitaya/app-template/docker/prod/Dockerfile

@@ -1,16 +1,21 @@
-FROM ruby:2.7.2 as builder
+FROM ruby:2.7.2-slim as builder
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
     curl \
+    libpq-dev \
+    build-essential \
     && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle config --local without "development test" && \
+RUN bundle config --global jobs 4 && \
+    bundle config --global set clean 'true' \
+    bundle config --global git.allow_insecure true && \
+    bundle config --global without "development test" && \
     bundle install
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+# RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 
 FROM ruby:2.7.2-slim
 
@@ -19,13 +24,17 @@ ENV LC_ALL=C.UTF-8
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
-    postgresql-client \
+    netcat \
+    libpq5 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local/bundle /usr/local/bundle
-COPY --from=builder /kubectl /usr/local/bin/kubectl
- 
-RUN chmod +x /usr/local/bin/kubectl
+RUN rm -rf /usr/local/bundle/cache
+RUN rm -rf /usr/local/bundle/build_info
+RUN rm -rf /usr/local/bundle/doc
+
+# COPY --from=builder /kubectl /usr/local/bin/kubectl
+# RUN chmod +x /usr/local/bin/kubectl
 
 WORKDIR /app/rubypitaya/
 

data/lib/rubypitaya/app-template/docker/wait_for.sh

@@ -0,0 +1,184 @@
+#!/bin/sh
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2017 Eficode Oy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+set -- "$@" -- "$TIMEOUT" "$QUIET" "$PROTOCOL" "$HOST" "$PORT" "$result"
+TIMEOUT=15
+QUIET=0
+# The protocol to make the request with, either "tcp" or "http"
+PROTOCOL="tcp"
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $cmdname host:port|url [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  case "$PROTOCOL" in
+    tcp)
+      if ! command -v nc >/dev/null; then
+        echoerr 'nc command is missing!'
+        exit 1
+      fi
+      ;;
+    wget)
+      if ! command -v wget >/dev/null; then
+        echoerr 'nc command is missing!'
+        exit 1
+      fi
+      ;;
+  esac
+
+  while :; do
+    case "$PROTOCOL" in
+      tcp) 
+        nc -z "$HOST" "$PORT" > /dev/null 2>&1
+        ;;
+      http)
+        wget --timeout=1 -q "$HOST" -O /dev/null > /dev/null 2>&1 
+        ;;
+      *)
+        echoerr "Unknown protocol '$PROTOCOL'"
+        exit 1
+        ;;
+    esac
+
+    result=$?
+        
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 7 ] ; then
+        for result in $(seq $(($# - 7))); do
+          result=$1
+          shift
+          set -- "$@" "$result"
+        done
+
+        TIMEOUT=$2 QUIET=$3 PROTOCOL=$4 HOST=$5 PORT=$6 result=$7
+        shift 7
+        exec "$@"
+      fi
+      exit 0
+    fi
+
+    if [ "$TIMEOUT" -le 0 ]; then
+      break
+    fi
+    TIMEOUT=$((TIMEOUT - 1))
+
+    sleep 1
+  done
+  echo "Operation timed out" >&2
+  exit 1
+}
+
+while :; do
+  case "$1" in
+    http://*|https://*)
+    HOST="$1"
+    PROTOCOL="http"
+    shift 1
+    ;;
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -q-*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    -q*)
+    QUIET=1
+    result=$1
+    shift 1
+    set -- -"${result#-q}" "$@"
+    ;;
+    -t | --timeout)
+    TIMEOUT="$2"
+    shift 2
+    ;;
+    -t*)
+    TIMEOUT="${1#-t}"
+    shift 1
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    -*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    *)
+    QUIET=0
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if ! [ "$TIMEOUT" -ge 0 ] 2>/dev/null; then
+  echoerr "Error: invalid timeout '$TIMEOUT'"
+  usage 3
+fi
+
+case "$PROTOCOL" in
+  tcp)
+    if [ "$HOST" = "" -o "$PORT" = "" ]; then
+      echoerr "Error: you need to provide a host and port to test."
+      usage 2
+    fi
+  ;;
+  http)
+    if [ "$HOST" = "" ]; then
+      echoerr "Error: you need to provide a host to test."
+      usage 2
+    fi
+  ;;
+esac
+
+wait_for "$@"

data/lib/rubypitaya/app-template/helm/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+description: [Game Name]
+name: [game-name]
+version: 0.0.1

data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-config
+data:
+  nginx.conf: "events {\n    worker_connections  1024;\n}\n\nstream {\n    server
+    {\n        listen  {{ .Values.gameserver.port.first }}-{{ .Values.gameserver.port.last }};\n        \n        resolver kube-dns.kube-system.svc.cluster.local
+    valid=5s;\n\n        proxy_pass  gameserver-$server_port.{{ .Values.namespace }}.svc.cluster.local:$server_port;\n
+    \   }\n}\n"

data/lib/rubypitaya/app-template/helm/templates/deployments/connector.yaml

@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: connector
+  labels:
+    app: {{ .Values.app }}
+    component: connector
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.app }}
+      component: connector
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app }}
+        component: connector
+    spec:
+      containers:
+      - name: connector
+        image: {{ .Values.connector.image.repository }}:{{ .Values.connector.image.tag }}
+        ports:
+        - containerPort: 3250
+          name: connector
+        env:
+          - name: PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT
+            value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT
+            value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_REQUESTTIMEOUT
+            value: "10s"
+          - name: PITAYA_CLUSTER_SD_ETCD_ENDPOINTS
+            value: "etcd.{{ .Values.namespace }}.svc.cluster.local:2379"
+          - name: PITAYA_CLUSTER_SD_ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: SERVER_ROUTES
+            value: "rubypitaya"

data/lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml

@@ -0,0 +1,40 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gameserver-nginx
+  labels:
+    app: gameserver
+    component: gameserver-nginx
+spec:
+  replicas: 10
+  selector:
+    matchLabels:
+      app: gameserver
+      component: gameserver-nginx
+  template:
+    metadata:
+      labels:
+        app: gameserver
+        component: gameserver-nginx
+    spec:
+      containers:
+      - name: gameserver-nginx
+        image: nginx:1.18.0
+        ports:
+        {{- $initialValue := int .Values.gameserver.port.first }}
+        {{- $finalValue := add .Values.gameserver.port.last 1 }}
+        {{- $finalValue = int $finalValue }}
+        {{- range untilStep $initialValue $finalValue 1 }}
+          {{- $port := . }}
+        - name: port-{{ $port }}
+          containerPort: {{ $port }}
+          protocol: TCP
+        {{- end }}
+        volumeMounts:
+        - name: nginx-config
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+      volumes:
+      - name: nginx-config
+        configMap:
+          name: nginx-config

data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml

@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rubypitaya
+  labels:
+    app: {{ .Values.app }}
+    component: rubypitaya
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.app }}
+      component: rubypitaya
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app }}
+        component: rubypitaya
+    spec:
+      containers:
+      - name: rubypitaya
+        image: {{ .Values.rubypitaya.image.repository }}:{{ .Values.rubypitaya.image.tag }}
+        command: ["bundle", "exec", "rubypitaya", "run"]
+        ports:
+        - containerPort: 4567
+          name: rubypitaya
+        env:
+          - name: SERVER_NAME
+            value: "rubypitaya"
+          - name: RUBYPITAYA_ENV
+            value: "production"
+          - name: NATS_URL
+            value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
+          - name: ETCD_URL
+            value: "http://etcd.{{ .Values.namespace }}.svc.cluster.local:2379"
+          - name: ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: ETCD_LEASE_SECONDS
+            value: "60"
+          - name: REDIS_URL
+            value: "redis://redis.{{ .Values.namespace }}.svc.cluster.local:6379"
+          - name: DATABASE_NAME
+            value: {{ .Values.database.name | quote }}
+          - name: DATABASE_HOST
+            value: {{ .Values.database.host | quote }}
+          - name: DATABASE_USER
+            value: {{ .Values.database.user | quote }}
+          - name: DATABASE_PASSWORD
+            value: {{ .Values.database.password | quote }}
+          - name: HTTP_AUTH_ENABLED
+            value: {{ .Values.http.enabled | quote }}
+          - name: HTTP_AUTH_USER
+            value: {{ .Values.http.user | quote }}
+          - name: HTTP_AUTH_PASS
+            value: {{ .Values.http.password | quote }}
+          - name: MATCHMAKING_CURRENTROOMBLL
+            value: kubernetes
+          - name: MATCHMAKING_ROOMBLL_KUBERNETES_NAMESPACE
+            value: {{ .Values.namespace }}
+          - name: MATCHMAKING_ROOMBLL_KUBERNETES_CONTAINERIMAGE
+            value: {{ .Values.gameserver.image.repository }}:{{ .Values.gameserver.image.tag }}
+          - name: MATCHMAKING_ROOMBLL_KUBERNETES_INITIALPORT
+            value: {{ .Values.gameserver.port.first | quote }}
+          - name: MATCHMAKING_ROOMBLL_KUBERNETES_FINALPORT
+            value: {{ .Values.gameserver.port.last | quote }}
+          - name: MATCHMAKING_ROOMBLL_KUBERNETES_SERVICEHOST
+            value: {{ .Values.gameserver.servicehost }}
+      imagePullSecrets:
+      - name: gitlab-registry
+      serviceAccount: rubypitaya
+      serviceAccountName: rubypitaya

data/lib/rubypitaya/app-template/helm/templates/role-bindings/rubypitaya.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rubypitaya
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: rubypitaya
+subjects:
+- kind: ServiceAccount
+  name: rubypitaya
+  namespace: {{ .Values.namespace }}

data/lib/rubypitaya/app-template/helm/templates/roles/rubypitaya.yaml

@@ -0,0 +1,31 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rubypitaya
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - apps
+  - extensions
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete

data/lib/rubypitaya/app-template/helm/templates/service-accounts/rubypitaya.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: rubypitaya

data/lib/rubypitaya/app-template/helm/templates/services/connector.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: connector
+spec:
+  selector:
+    app: {{ .Values.app }}
+    component: connector
+  ports:
+    - protocol: TCP
+      port: 3250
+      targetPort: 3250
+  type: LoadBalancer

data/lib/rubypitaya/app-template/helm/templates/services/etcd.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: etcd
+spec:
+  selector:
+    app: {{ .Values.app }}
+    component: etcd
+  ports:
+    - protocol: TCP
+      port: 2379
+      targetPort: 2379
+      name: etcd-2379
+    - protocol: TCP
+      port: 2380
+      targetPort: 2380
+      name: etcd-2380
+  type: ClusterIP

data/lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: gameserver-nginx
+spec:
+  selector:
+    app: gameserver
+    component: gameserver-nginx
+  ports:
+    {{- $initialValue := int .Values.gameserver.port.first }}
+    {{- $finalValue := add .Values.gameserver.port.last 1 }}
+    {{- $finalValue = int $finalValue }}
+    {{- range untilStep $initialValue $finalValue 1 }}
+      {{- $port := . }}
+    - name: port-{{ $port }}
+      port: {{ $port }}
+      targetPort: {{ $port }}
+      protocol: TCP
+    {{- end }}
+  type: LoadBalancer

data/lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml

@@ -0,0 +1,20 @@
+{{- $initialValue := int .Values.gameserver.port.first }}
+{{- $finalValue := add .Values.gameserver.port.last 1 }}
+{{- $finalValue = int $finalValue }}
+{{- range untilStep $initialValue $finalValue 1 }}
+  {{- $port := . }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: gameserver-{{ $port }}
+spec:
+  selector:
+    app: gameserver
+    component: gameserver-{{ $port }}
+  ports:
+    - protocol: TCP
+      port: {{ $port }}
+      targetPort: {{ $port }}
+  type: ClusterIP
+---
+{{- end }}

data/lib/rubypitaya/app-template/helm/templates/services/nats.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nats
+spec:
+  selector:
+    app: {{ .Values.app }}
+    component: nats
+  ports:
+    - protocol: TCP
+      port: 4222
+      targetPort: 4222
+  type: ClusterIP

data/lib/rubypitaya/app-template/helm/templates/services/redis.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  selector:
+    app: {{ .Values.app }}
+    component: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+      name: redis
+  type: ClusterIP

data/lib/rubypitaya/app-template/helm/templates/services/rubypitaya.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: rubypitaya
+spec:
+  selector:
+    app: {{ .Values.app }}
+    component: rubypitaya
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 4567
+  type: LoadBalancer

data/lib/rubypitaya/app-template/helm/templates/statefulsets/etcd.yaml

@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: etcd
+  labels:
+    app: {{ .Values.app }}
+    component: etcd
+spec:
+  serviceName: "etcd"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.app }}
+      component: etcd
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app }}
+        component: etcd
+    spec:
+      containers:
+      - name: etcd
+        image: appcelerator/etcd:3.0.15
+        ports:
+        - containerPort: 2379
+          name: etcd-2379
+        - containerPort: 2380
+          name: etcd-2380

data/lib/rubypitaya/app-template/helm/templates/statefulsets/nats.yaml

@@ -0,0 +1,26 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: nats
+  labels:
+    app: {{ .Values.app }}
+    component: nats
+spec:
+  serviceName: "nats"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.app }}
+      component: nats
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app }}
+        component: nats
+    spec:
+      containers:
+      - name: nats
+        image: nats:2.1.4
+        ports:
+        - containerPort: 4222
+          name: nats

data/lib/rubypitaya/app-template/helm/templates/statefulsets/redis.yaml

@@ -0,0 +1,26 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: redis
+  labels:
+    app: {{ .Values.app }}
+    component: redis
+spec:
+  serviceName: "redis"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.app }}
+      component: redis
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.app }}
+        component: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:6.0.5-alpine
+        ports:
+        - containerPort: 6379
+          name: redis

data/lib/rubypitaya/app-template/helm/values.yaml

@@ -0,0 +1,32 @@
+app: [app-name]
+namespace: [kubernetes-namespace]
+
+connector:
+  image:
+    repository: registry.gitlab.com/lucianopc/pitaya-connector
+    tag: 0.2.0
+
+rubypitaya:
+  image:
+    repository: [metagame-repository-link]
+    tag: latest
+
+database:
+  name: [database-name]
+  host: [database-host]
+  user: [database-user]
+  password: [database-password]
+
+http:
+  enabled: false
+  user: user
+  password: pass
+
+gameserver:
+  image:
+    repository: [gameserver-repository-link]
+    tag: latest
+  port:
+    first: 5000
+    last: 5099
+  servicehost: [gameserver-service-url]

data/lib/rubypitaya/core/config.rb

@@ -10,6 +10,7 @@ module RubyPitaya
       @has_config_core_override = false
 
       @result_cache = {}
+      @temp = {result: {}}
     end
 
     def [](key)
@@ -22,7 +23,10 @@ module RubyPitaya
         result = @config_core[key]
       end
 
-      @result_cache[key] = result.deep_symbolize_keys
+      @temp[:result] = result
+      @temp.deep_symbolize_keys!
+
+      @result_cache[key] = @temp[:result]
 
       result
     end

data/lib/rubypitaya/core/handler_base.rb

@@ -17,6 +17,17 @@ module RubyPitaya
       @postman = nil
     end
 
+    def set_attributes(bll, log, redis, setup, config, params, session, postman)
+      @bll = bll
+      @log = log
+      @redis = redis
+      @setup = setup
+      @config = config
+      @params = params
+      @session = session
+      @postman = postman
+    end
+
     def self.non_authenticated_actions(*action_names)
       self.non_authenticated_routes = action_names.map(&:to_s)
     end

data/lib/rubypitaya/core/handler_router.rb

@@ -62,8 +62,7 @@ module RubyPitaya
           msg: "Handler #{handler_name} not founded"
         }
       end
-
-      unless @handler_name_map[handler_name].methods.include?(action_name.to_sym)
+      unless @handler_name_map[handler_name].public_methods(false).include?(action_name.to_sym)
         return {
           code: StatusCodes::CODE_ACTION_NOT_FOUND,
           msg: "Handler #{handler_name} action #{action_name} not founded"
@@ -72,19 +71,12 @@ module RubyPitaya
 
       handler = @handler_name_map[handler_name]
 
-      handler.bll = bll
-      handler.log = log
-      handler.redis = redis
-      handler.setup = setup
-      handler.config = config
-      handler.params = params
-      handler.session = session
-      handler.postman = postman
-
       if !handler.class.authenticated_action_name?(action_name)
+        handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
         handler.send(action_name)
       else
         if session.authenticated?
+          handler.set_attributes(bll, log, redis, setup, config, params, session, postman)
           handler.send(action_name)
         else
           return {

data/lib/rubypitaya/core/http_routes.rb

@@ -19,10 +19,14 @@ module RubyPitaya
     before do
       content_type :json
 
+      return error_unauthorized unless authorized?(request)
+
       @bll = settings.bll
       @setup = settings.setup
       @config = settings.config
 
+      @config.clear_cache
+
       if request.content_type == 'application/json'
         request_body = request.body.read
         @params.merge!(JSON.parse(request_body)) if !request_body.blank?
@@ -30,5 +34,31 @@ module RubyPitaya
 
       @params = Parameters.new(@params)
     end
+
+    private
+
+    def error_unauthorized
+      return halt(401, 'Unauthorized')
+    end
+
+    def authorized?(request)
+      return true unless http_auth_enabled?
+
+      auth_token = request.env['HTTP_AUTHORIZATION']
+      return auth_token == get_http_auth
+    end
+
+    def http_auth_enabled?
+      return ENV.fetch("HTTP_AUTH_ENABLED") { 'false' } == 'true'
+    end
+
+    def get_http_auth
+      user = ENV.fetch("HTTP_AUTH_USER") { '' }
+      pass = ENV.fetch("HTTP_AUTH_PASS") { '' }
+
+      auth_token = ::Base64.strict_encode64("#{user}:#{pass}")
+
+      return "Basic #{auth_token}"
+    end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -152,15 +152,16 @@ module RubyPitaya
         session_id = request[:session][:id]
         session_uid = request[:session].fetch(:uid, '')
         session_data = request[:session][:data]
-        session_data = JSON.parse(session_data) if session_data.class == String
+        session_data = JSON.parse(session_data, symbolize_names: true) if session_data.class == String
         frontend_id = request[:frontendID]
         metadata = request[:metadata]
-        metadata = JSON.parse(metadata) if metadata.class == String
+        metadata = JSON.parse(metadata, symbolize_names: true) if metadata.class == String
 
         @session.update(session_id, session_uid, session_data, metadata,
                         frontend_id)
 
-        handler_name, action_name = message_route.split('.')[1..-1]
+        # TODO: Validate if handler and action names are not nil
+        handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
 
         @log.info "request  -> route: #{message_route}"
         @log.info "         -> data:  #{message_data}"

data/lib/rubypitaya/core/spec-helpers/config_spec_helper.rb

@@ -15,7 +15,7 @@ module RubyPitaya
     end
 
     def config_mock=(value)
-      @config_mock = value
+      @config_mock = value.deep_symbolize_keys.stringify_keys
     end
 
     def config_core_override=(value)
@@ -24,7 +24,7 @@ module RubyPitaya
     def add(key, value)
       keys = key.split('.')
       add_hash = undig(*keys, value)
-      @config_mock = merge_recursively(@config_mock, add_hash)
+      @config_mock = merge_recursively(@config_mock, add_hash).deep_symbolize_keys.stringify_keys
     end
 
     private

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.18.0'
+  VERSION = '2.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -150,20 +150,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 6.1.3
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -269,11 +255,31 @@ files:
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
 - "./lib/rubypitaya/app-template/docker/prod/Dockerfile"
+- "./lib/rubypitaya/app-template/docker/wait_for.sh"
 - "./lib/rubypitaya/app-template/features/hello_world.feature"
 - "./lib/rubypitaya/app-template/features/player.feature"
 - "./lib/rubypitaya/app-template/features/step_definitions/application_steps.rb"
 - "./lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb"
 - "./lib/rubypitaya/app-template/features/support/env.rb"
+- "./lib/rubypitaya/app-template/helm/Chart.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/connector.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/role-bindings/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/roles/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/service-accounts/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/connector.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/etcd.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/nats.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/redis.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/services/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/etcd.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/nats.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/statefulsets/redis.yaml"
+- "./lib/rubypitaya/app-template/helm/values.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/README.md"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml"