Skip to content

Commit

Permalink
Renamed UI API to assets API
Browse files Browse the repository at this point in the history
UI API was a confusing term to use in training whereas the term asset was clearer
  • Loading branch information
mwinteringham committed Jun 2, 2019
1 parent cbd531e commit abc2523
Show file tree
Hide file tree
Showing 98 changed files with 135 additions and 142 deletions.
52 changes: 26 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
- message/
key: v1-dependencies-{{ .Environment.CIRCLE_SHA1 }}-message

run_ui_tests:
run_assets_tests:

docker:
- image: circleci/openjdk:8u151-jdk-node-browsers
Expand All @@ -191,8 +191,8 @@ jobs:
bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY}
- run:
command: |
if [ -f ~/tmp/ui.txt ]; then
echo "[BUILDING] UI"
if [ -f ~/tmp/assets.txt ]; then
echo "[BUILDING] Assets"
npm install
npm test
npm run build
Expand All @@ -206,15 +206,15 @@ jobs:
mvn install
fi
else
echo "[SKIPPING] UI"
echo "[SKIPPING] Assets"
fi
working_directory: ui/js
working_directory: assets/js
environment:
BROWSER: remote
- save_cache:
paths:
- ui/
key: v1-dependencies-{{ .Environment.CIRCLE_SHA1 }}-ui
- assets/
key: v1-dependencies-{{ .Environment.CIRCLE_SHA1 }}-assets

build_auth_docker_image:

Expand Down Expand Up @@ -360,29 +360,29 @@ jobs:
fi
working_directory: message

build_ui_docker_image:
build_assets_docker_image:

docker:
- image: circleci/openjdk:8u151-jdk-node-browsers

steps:
- restore_cache:
key: v1-dependencies-{{ .Environment.CIRCLE_SHA1 }}-ui
key: v1-dependencies-{{ .Environment.CIRCLE_SHA1 }}-assets

- setup_remote_docker:
docker_layer_caching: true

- run:
command: |
if [ -f ~/project/ui/api/target/restful-booker-platform-ui-*-SNAPSHOT.jar ] && [ $CIRCLE_BRANCH == "master" ]; then
echo "[BUILDING] UI"
if [ -f ~/project/assets/api/target/restful-booker-platform-assets-*-SNAPSHOT.jar ] && [ $CIRCLE_BRANCH == "master" ]; then
echo "[BUILDING] Assets"
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker build -t mwinteringham/restfulbookerplatform_ui:latest .
docker push mwinteringham/restfulbookerplatform_ui:latest
docker build -t mwinteringham/restfulbookerplatform_assets:latest .
docker push mwinteringham/restfulbookerplatform_assets:latest
else
echo "[SKIPPING] UI"
echo "[SKIPPING] Assets"
fi
working_directory: ui
working_directory: assets

deploy_auth_docker_image:

Expand Down Expand Up @@ -522,7 +522,7 @@ jobs:
echo "[SKIPPING] Message"
fi
deploy_ui_docker_image:
deploy_assets_docker_image:

docker:
- image: google/cloud-sdk
Expand All @@ -534,15 +534,15 @@ jobs:
name: Store Service Account
command: echo $GCLOUD_SERVICE_KEY > ${HOME}/gcloud-service-key.json
- run: |
if [ -f /home/circleci/tmp/ui.txt ] && [ $CIRCLE_BRANCH == "master" ]; then
echo "[DEPLOYING] UI"
if [ -f /home/circleci/tmp/assets.txt ] && [ $CIRCLE_BRANCH == "master" ]; then
echo "[DEPLOYING] Assets"
gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json
gcloud --quiet config set project ${GOOGLE_PROJECT_ID}
gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
gcloud container clusters get-credentials rbp-cluster --region europe-north1-a
kubectl delete pod $(kubectl get pods | awk '/rbp-ui/ {print $1;exit}')
kubectl delete pod $(kubectl get pods | awk '/rbp-assets/ {print $1;exit}')
else
echo "[SKIPPING] UI"
echo "[SKIPPING] Assets"
fi
run_e2e_checks:
Expand Down Expand Up @@ -592,7 +592,7 @@ workflows:
- run_message_build:
requires:
- checkout_code
- run_ui_tests:
- run_assets_tests:
requires:
- checkout_code
- build_auth_docker_image:
Expand All @@ -613,9 +613,9 @@ workflows:
- build_message_docker_image:
requires:
- run_message_build
- build_ui_docker_image:
- build_assets_docker_image:
requires:
- run_ui_tests
- run_assets_tests
- deploy_auth_docker_image:
requires:
- build_auth_docker_image
Expand All @@ -634,15 +634,15 @@ workflows:
- deploy_message_docker_image:
requires:
- build_message_docker_image
- deploy_ui_docker_image:
- deploy_assets_docker_image:
requires:
- build_ui_docker_image
- build_assets_docker_image
- run_e2e_checks:
requires:
- deploy_auth_docker_image
- deploy_booking_docker_image
- deploy_report_docker_image
- deploy_room_docker_image
- deploy_ui_docker_image
- deploy_assets_docker_image
- deploy_branding_docker_image
- deploy_message_docker_image
24 changes: 12 additions & 12 deletions .kubes/class/team1-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,20 @@ spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: rbp-ui
name: rbp-assets
spec:
selector:
matchLabels:
run: rbp-ui
run: rbp-assets
replicas: 1
template:
metadata:
labels:
run: rbp-ui
run: rbp-assets
spec:
containers:
- name: rbp-ui
image: mwinteringham/restfulbookerplatform_ui:latest
- name: rbp-assets
image: mwinteringham/restfulbookerplatform_assets:latest
imagePullPolicy: Always
ports:
- containerPort: 3003
Expand Down Expand Up @@ -327,9 +327,9 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: rbp-ui
name: rbp-assets
labels:
app: rbp-ui
app: rbp-assets
spec:
type: NodePort
ports:
Expand All @@ -338,7 +338,7 @@ spec:
nodePort: 32150
targetPort: 3003
selector:
run: rbp-ui
run: rbp-assets
---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -423,17 +423,17 @@ spec:
servicePort: 3006
- path: /
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /js/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /images/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /actuator/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
24 changes: 12 additions & 12 deletions .kubes/class/team2-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,20 @@ spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: rbp-ui
name: rbp-assets
spec:
selector:
matchLabels:
run: rbp-ui
run: rbp-assets
replicas: 1
template:
metadata:
labels:
run: rbp-ui
run: rbp-assets
spec:
containers:
- name: rbp-ui
image: mwinteringham/restfulbookerplatform_ui:latest
- name: rbp-assets
image: mwinteringham/restfulbookerplatform_assets:latest
imagePullPolicy: Always
ports:
- containerPort: 3003
Expand Down Expand Up @@ -327,9 +327,9 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: rbp-ui
name: rbp-assets
labels:
app: rbp-ui
app: rbp-assets
spec:
type: NodePort
ports:
Expand All @@ -338,7 +338,7 @@ spec:
nodePort: 32150
targetPort: 3003
selector:
run: rbp-ui
run: rbp-assets
---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -423,17 +423,17 @@ spec:
servicePort: 3006
- path: /
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /js/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /images/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /actuator/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
24 changes: 12 additions & 12 deletions .kubes/class/team3-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,20 @@ spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: rbp-ui
name: rbp-assets
spec:
selector:
matchLabels:
run: rbp-ui
run: rbp-assets
replicas: 1
template:
metadata:
labels:
run: rbp-ui
run: rbp-assets
spec:
containers:
- name: rbp-ui
image: mwinteringham/restfulbookerplatform_ui:latest
- name: rbp-assets
image: mwinteringham/restfulbookerplatform_assets:latest
imagePullPolicy: Always
ports:
- containerPort: 3003
Expand Down Expand Up @@ -327,9 +327,9 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: rbp-ui
name: rbp-assets
labels:
app: rbp-ui
app: rbp-assets
spec:
type: NodePort
ports:
Expand All @@ -338,7 +338,7 @@ spec:
nodePort: 32150
targetPort: 3003
selector:
run: rbp-ui
run: rbp-assets
---
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -423,17 +423,17 @@ spec:
servicePort: 3006
- path: /
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /js/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /images/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
- path: /actuator/*
backend:
serviceName: rbp-ui
serviceName: rbp-assets
servicePort: 3003
Loading

0 comments on commit abc2523

Please sign in to comment.