Experimental support for injecting custom arbitrary endpoints into ye…

…lb-ui and yelb-appserver

deployments/localdevelopment/setupdevenv.sh

@@ -4,7 +4,7 @@
 # workstation requirements: git, Docker, Ruby (with proper libraries/gems), angular@CLI 
 
 docker run --name redis -p 6379:6379 -d redis:4.0.2
-docker run --name postgres -p 5432:5432 -d mreferre/yelb-db:0.2
+docker run --name postgres -p 5432:5432 -d mreferre/yelb-db:0.3
 
 cd ./yelb/yelb-appserver
 export RACK_ENV=development 
@@ -24,7 +24,7 @@ cp ../clarity-seed-newfiles/src/styles.css src/styles.css
 cp ../clarity-seed-newfiles/src/app/app* src/app
 cp ../clarity-seed-newfiles/src/environments/env* src/environments
 cp ../clarity-seed-newfiles/package.json package.json
-cp ../clarity-seed-newfiles/angular-cli.json angular-cli.json
+cp ../clarity-seed-newfiles/angular-cli.json .angular-cli.json
 rm -r src/app/home
 rm -r src/app/about
 

deployments/localtest/README.md

@@ -7,9 +7,9 @@ Move to the directory where you want to work and clone the repo:
 ```
 docker network create yelb-network 
 docker run --name redis-server -p 6379:6379 --network=yelb-network -d redis:4.0.2
-docker run --name yelb-db -p 5432:5432 --network=yelb-network -d mreferre/yelb-db:0.2
-docker run --name yelb-appserver --network=yelb-network -d -p 4567:4567 -e RACK_ENV=test mreferre/yelb-appserver:0.2
-docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.2
+docker run --name yelb-db -p 5432:5432 --network=yelb-network -d mreferre/yelb-db:0.3
+docker run --name yelb-appserver --network=yelb-network -d -p 4567:4567 -e RACK_ENV=test mreferre/yelb-appserver:0.3
+docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.3
 ```
 You should now be able to see the application running by connecting your browser to: http://localhost:8080
 

deployments/localtest/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: "2.1"
 services:
   yelb-ui:
-    image: mreferre/yelb-ui:0.2
+    image: mreferre/yelb-ui:0.3
     depends_on:
       - yelb-appserver
     ports:
@@ -11,7 +11,7 @@ services:
       - UI_ENV=test # dev | test | prod 
 
   yelb-appserver:
-    image: mreferre/yelb-appserver:0.2
+    image: mreferre/yelb-appserver:0.3
     depends_on:
       - redis-server
       - yelb-db
@@ -26,6 +26,6 @@ services:
       - 6379:6379
 
   yelb-db:
-    image: mreferre/yelb-db:0.2
+    image: mreferre/yelb-db:0.3
     ports:
       - 5432:5432

deployments/platformdeployment/Docker/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: "2.1"
 services:
   yelb-ui:
-    image: mreferre/yelb-ui:0.2
+    image: mreferre/yelb-ui:0.3
     depends_on:
       - yelb-appserver
     ports:
@@ -11,7 +11,7 @@ services:
       - yelb-network
 
   yelb-appserver:
-    image: mreferre/yelb-appserver:0.2
+    image: mreferre/yelb-appserver:0.3
     depends_on:
       - redis-server
       - yelb-db
@@ -27,7 +27,7 @@ services:
     # - redisdata:/data
 
   yelb-db:
-    image: mreferre/yelb-db:0.2
+    image: mreferre/yelb-db:0.3
     networks:
       - yelb-network
     # uncomment the following lines if you want to persist postgres data across deployments

deployments/platformdeployment/Docker/stack-deploy.yaml

@@ -2,7 +2,7 @@
 version: "3"
 services:
   yelb-ui:
-    image: mreferre/yelb-ui:0.2
+    image: mreferre/yelb-ui:0.3
     depends_on:
       - yelb-appserver
     ports:
@@ -15,7 +15,7 @@ services:
         condition: on-failure
 
   yelb-appserver:
-    image: mreferre/yelb-appserver:0.2
+    image: mreferre/yelb-appserver:0.3
     depends_on:
       - redis-server
       - yelb-db
@@ -39,7 +39,7 @@ services:
         condition: on-failure
 
   yelb-db:
-    image: mreferre/yelb-db:0.2
+    image: mreferre/yelb-db:0.3
     networks:
       - yelb-network
     # uncomment the following lines if you want to persist postgres data across deployments

deployments/platformdeployment/Kubernetes/cnawebapp-loadbalancer.yaml

@@ -75,7 +75,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.2
+        image:  mreferre/yelb-ui:0.3
         ports:
         - containerPort: 80
 ---
@@ -111,7 +111,7 @@ spec:
     spec:
       containers:
       - name: yelb-db
-        image:  mreferre/yelb-db:0.2
+        image:  mreferre/yelb-db:0.3
         ports:
         - containerPort: 5432
 ---
@@ -129,6 +129,8 @@ spec:
     spec:
       containers:
       - name: yelb-appserver
-        image:  mreferre/yelb-appserver:0.2
+        image:  mreferre/yelb-appserver:0.3
         ports:
         - containerPort: 4567
+
+

deployments/platformdeployment/Kubernetes/cnawebapp-minikube-hostport.yaml

@@ -61,7 +61,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.2
+        image: mreferre/yelb-ui:0.3
         ports:
         - containerPort: 80
           hostPort: 32777 # depending on the minikube driver you use you may be able to even use 80. But something above 32000 seems safer 
@@ -98,7 +98,7 @@ spec:
     spec:
       containers:
       - name: yelb-db
-        image: mreferre/yelb-db:0.2
+        image: mreferre/yelb-db:0.3
         ports:
         - containerPort: 5432
 ---
@@ -116,7 +116,7 @@ spec:
     spec:
       containers:
       - name: yelb-appserver
-        image: mreferre/yelb-appserver:0.2
+        image: mreferre/yelb-appserver:0.3
         ports:
         - containerPort: 4567
 

deployments/platformdeployment/Kubernetes/cnawebapp-minikube-ingress.yaml

@@ -87,7 +87,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.2
+        image: mreferre/yelb-ui:0.3
         ports:
         - containerPort: 80
 ---
@@ -123,7 +123,7 @@ spec:
     spec:
       containers:
       - name: yelb-db
-        image: mreferre/yelb-db:0.2
+        image: mreferre/yelb-db:0.3
         ports:
         - containerPort: 5432
 ---
@@ -141,7 +141,7 @@ spec:
     spec:
       containers:
       - name: yelb-appserver
-        image: mreferre/yelb-appserver:0.2
+        image: mreferre/yelb-appserver:0.3
         ports:
         - containerPort: 4567
 

deployments/platformdeployment/Kubernetes/cnawebapp-minikube-nodeport.yaml

@@ -76,7 +76,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.2
+        image: mreferre/yelb-ui:0.3
         ports:
         - containerPort: 80
 ---
@@ -112,7 +112,7 @@ spec:
     spec:
       containers:
       - name: yelb-db
-        image: mreferre/yelb-db:0.2
+        image: mreferre/yelb-db:0.3
         ports:
         - containerPort: 5432
 ---
@@ -130,7 +130,7 @@ spec:
     spec:
       containers:
       - name: yelb-appserver
-        image: mreferre/yelb-appserver:0.2
+        image: mreferre/yelb-appserver:0.3
         ports:
         - containerPort: 4567
 

yelb-appserver/yelb-appserver.rb

@@ -18,7 +18,8 @@
 # without this option, the angular application will spit a `forbidden` error message
 disable :protection
 
-# the system variable RACK_ENV controls which environment you are enabling 
+# the system variable RACK_ENV controls which environment you are enabling
+# if you choose 'custom' with RACK_ENV, all systems variables in the section need to be set before launching the yelb-appserver application
 configure :production do
   set :redishost, "redis-server"
   set :port, 4567
@@ -37,6 +38,12 @@
   set :yelbdbhost => "localhost"
   set :yelbdbport => 5432
 end
+configure :custom do
+  set :redishost, ENV['REDIS_SERVER_ENDPOINT']
+  set :port, 4567
+  set :yelbdbhost => ENV['YELB_DB_SERVER_ENDPOINT']
+  set :yelbdbport => 5432
+end
 
 options "*" do
   response.headers["Allow"] = "HEAD,GET,PUT,DELETE,OPTIONS"
@@ -69,7 +76,6 @@ def restaurantsdbupdate(restaurant)
 end 
 
 get '/api/pageviews' do
-
     headers 'Access-Control-Allow-Origin' => '*'
     headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With'
     headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
@@ -82,7 +88,6 @@ def restaurantsdbupdate(restaurant)
 end #get /api/pageviews
 
 get '/api/hostname' do
-
     headers 'Access-Control-Allow-Origin' => '*'
     headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With'
     headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
@@ -92,7 +97,6 @@ def restaurantsdbupdate(restaurant)
 end #get /api/hostname
 
 get '/api/getstats' do
-
     headers 'Access-Control-Allow-Origin' => '*'
     headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With'
     headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
@@ -155,4 +159,3 @@ def restaurantsdbupdate(restaurant)
     restaurantsdbupdate("bucadibeppo")
     @bucadibeppo = restaurantsdbread("bucadibeppo")
 end #get /api/bucadibeppo 
-

yelb-ui/Dockerfile

@@ -16,7 +16,7 @@ RUN cp /clarity-seed-newfiles/src/styles.css /clarity-seed/src/styles.css
 RUN cp /clarity-seed-newfiles/src/app/app* /clarity-seed/src/app
 RUN cp /clarity-seed-newfiles/src/environments/env* /clarity-seed/src/environments
 RUN cp /clarity-seed-newfiles/package.json /clarity-seed/package.json
-RUN cp /clarity-seed-newfiles/angular-cli.json /clarity-seed/angular-cli.json
+RUN cp /clarity-seed-newfiles/angular-cli.json /clarity-seed/.angular-cli.json
 RUN rm -r /clarity-seed/src/app/home
 RUN rm -r /clarity-seed/src/app/about
 

yelb-ui/clarity-seed-newfiles/angular-cli.json

@@ -33,7 +33,8 @@
             "environments": {
                 "dev": "environments/environment.ts",
                 "test": "environments/environment.test.ts",
-                "prod": "environments/environment.prod.ts"
+                "prod": "environments/environment.prod.ts",
+                "custom": "environments/environment.custom.ts"
             }
         }
     ],

yelb-ui/clarity-seed-newfiles/src/environments/environment.custom.ts

@@ -0,0 +1,5 @@
+export const environment = {
+  production: true,
+  envName: 'custom',
+  appserver_env: 'http://' + 'YELB_APPSERVER_ENDPOINT'
+};