Skip to content

Commit

Permalink
Tests and coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
piyushroshan committed Feb 6, 2024
1 parent f34fb50 commit 904e421
Show file tree
Hide file tree
Showing 18 changed files with 514 additions and 105 deletions.
114 changes: 49 additions & 65 deletions .github/workflows/ci.yml → .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker Image CI
name: PR Build

on:
push:
Expand All @@ -23,8 +23,6 @@ on:
jobs:
build-context:
runs-on: ubuntu-latest
outputs:
push_image: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')) || (github.event_name == 'release' && github.event.action == 'published') }}
steps:
- name: Dump GitHub context
env:
Expand Down Expand Up @@ -84,13 +82,6 @@ jobs:
id: qemu
uses: docker/setup-qemu-action@v2

- name: Login to DockerHub
if: needs.build-context.outputs.push_image == 'true'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build crapi-identity image
uses: docker/build-push-action@v2
with:
Expand Down Expand Up @@ -185,68 +176,61 @@ jobs:
- name: Run Postman Collection
run: (newman run "./postman_collections/crAPI.postman_collection.json" -e ./postman_collections/crAPI.postman_environment.json --verbose) || true

- name: Build crapi-identity all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/identity
tags: crapi/crapi-identity:${{ env.TAG_LATEST }},crapi/crapi-identity:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=identity-service
cache-to: type=gha,mode=max,scope=identity-service
- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2

- name: Build crapi-workshop all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/workshop
tags: crapi/crapi-workshop:${{ env.TAG_LATEST }},crapi/crapi-workshop:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=workshop-service
cache-to: type=gha,mode=max,scope=workshop-service
- name: Run crAPI using built images
run: docker-compose -f deploy/docker/docker-compose.yml down --volumes --remove-orphans

- name: Build crapi-community all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/community
tags: crapi/crapi-community:${{ env.TAG_LATEST }},crapi/crapi-community:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=community-service
cache-to: type=gha,mode=max,scope=community-service

- name: Build crapi-web all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
tests:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
context: ./services/web
tags: crapi/crapi-web:${{ env.TAG_LATEST }},crapi/crapi-web:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=web-service
cache-to: type=gha,mode=max,scope=web-service
python-version: '3.10'

- name: Build gateway-service all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
- name: Setup Java
uses: actions/setup-java@v4
with:
context: ./services/gateway-service
tags: crapi/gateway-service:${{ env.TAG_LATEST }},crapi/gateway-service:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=gateway-service
cache-to: type=gha,mode=max,scope=gateway-service
distribution: 'adopt'
java-version: '11'

- name: Build mailhog all platforms and conditionally push to Docker Hub
if: steps.check_mailhog_exists.outputs.files_exists == 'true'
uses: docker/build-push-action@v2
- name: Setup Go
uses: actions/setup-go@v5
with:
context: ./services/mailhog
tags: crapi/mailhog:${{ env.TAG_LATEST }},crapi/mailhog:${{ env.TAG_NAME }}
push: ${{ needs.build-context.outputs.push_image }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=mailhog-service
cache-to: type=gha,mode=max,scope=mailhog-service
go-version: '1.21'

- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2
- name: Start the database
run: docker-compose -f services/docker-database.yml up -d

- name: Run identity tests
run: |
cd services/identity
./gradlew test
- name: Run community tests
run: |
cd services/community
go test -v ./...
- name: Run workshop tests
run: |
cd services/workshop
virtualenv venv
source venv/bin/activate
pip install -r requirements.txt
IS_TESTING=True python3 manage.py test --no-input
- name: Run workshop coverage
run: |
cd services/workshop
source venv/bin/activate
coverage run ./manage.py test crapi
coverage report
coverage xml -o coverage.xml
143 changes: 143 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
name: Publish Images

on:
push:
branches:
- 'develop'
- 'main'
tags:
- 'v*.*.*'
paths:
- 'services/**'
- 'postman_collections/**'
- 'deploy/**'
- '.github/workflows/**'
workflow_dispatch:

jobs:
build-context:
runs-on: ubuntu-latest
steps:
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
build:
needs: build-context
runs-on: ubuntu-latest
env:
PLATFORMS: "linux/amd64,linux/arm64"
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Env seen prerun
run: env

- name: Get branch name
id: branch-name
uses: tj-actions/[email protected]

- name: Current branch name
run: |
echo "Current Branch: ${{ steps.branch-name.outputs.current_branch }}"
echo "Target Branch: ${{ steps.branch-name.outputs.base_ref_branch }}"
echo "Tag if exist: ${{ steps.branch-name.outputs.tag }}"
- name: Running on a tag.
if: steps.branch-name.outputs.is_tag == 'true'
run: |
echo "TAG_NAME=${{ steps.branch-name.outputs.tag }}" >> ${GITHUB_ENV}
echo "TAG_LATEST=latest" >> ${GITHUB_ENV}
- name: Running on a branch and merge.
if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch != 'main'
run: |
echo "TAG_NAME=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
echo "TAG_LATEST=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
- name: Running on main branch.
if: steps.branch-name.outputs.is_tag != 'true' && github.event_name == 'push' && steps.branch-name.outputs.current_branch == 'main'
run: |
echo "TAG_NAME=${{ steps.branch-name.outputs.current_branch }}" >> ${GITHUB_ENV}
echo "TAG_LATEST=latest" >> ${GITHUB_ENV}
- name: Running on a branch and pull req.
if: steps.branch-name.outputs.is_tag != 'true' && github.event_name != 'push'
run: |
echo "TAG_NAME=${{ steps.branch-name.outputs.base_ref_branch }}" >> ${GITHUB_ENV}
echo "TAG_LATEST=${{ steps.branch-name.outputs.base_ref_branch }}" >> ${GITHUB_ENV}
# setup Docker build action
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build crapi-identity all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/identity
tags: crapi/crapi-identity:${{ env.TAG_LATEST }},crapi/crapi-identity:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=identity-service
cache-to: type=gha,mode=max,scope=identity-service

- name: Build crapi-workshop all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/workshop
tags: crapi/crapi-workshop:${{ env.TAG_LATEST }},crapi/crapi-workshop:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=workshop-service
cache-to: type=gha,mode=max,scope=workshop-service

- name: Build crapi-community all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/community
tags: crapi/crapi-community:${{ env.TAG_LATEST }},crapi/crapi-community:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=community-service
cache-to: type=gha,mode=max,scope=community-service

- name: Build crapi-web all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/web
tags: crapi/crapi-web:${{ env.TAG_LATEST }},crapi/crapi-web:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=web-service
cache-to: type=gha,mode=max,scope=web-service

- name: Build gateway-service all platforms and conditionally push to Docker Hub
uses: docker/build-push-action@v2
with:
context: ./services/gateway-service
tags: crapi/gateway-service:${{ env.TAG_LATEST }},crapi/gateway-service:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=gateway-service
cache-to: type=gha,mode=max,scope=gateway-service

- name: Build mailhog all platforms and conditionally push to Docker Hub
if: steps.check_mailhog_exists.outputs.files_exists == 'true'
uses: docker/build-push-action@v2
with:
context: ./services/mailhog
tags: crapi/mailhog:${{ env.TAG_LATEST }},crapi/mailhog:${{ env.TAG_NAME }}
platforms: ${{ env.PLATFORMS }}
cache-from: type=gha,scope=mailhog-service
cache-to: type=gha,mode=max,scope=mailhog-service

- name: Dump docker logs on failure
if: failure()
uses: jwalton/gh-docker-logs@v2

2 changes: 1 addition & 1 deletion deploy/docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ WORKSHOP_SERVER_PORT=8000
ENABLE_SHELL_INJECTION=false
ENABLE_LOG4J=false
LISTEN_IP="127.0.0.1"
TLS_ENABLED=false
TLS_ENABLED=true
VERSION=latest
2 changes: 1 addition & 1 deletion postman_collections/crAPI.postman_environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Crapi",
"values": [{
"key": "url",
"value": "http://127.0.0.1:8888",
"value": "http://127.0.0.1:8889",
"enabled": true
},
{
Expand Down
4 changes: 2 additions & 2 deletions services/community/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


# GoLang Build
FROM golang:alpine AS builder
FROM golang:1.21-alpine AS builder
ENV GO111MODULE=on \
CGO_ENABLED=0
WORKDIR /build
Expand All @@ -39,6 +39,6 @@ COPY certs /app/certs
COPY health.sh /app/health.sh
RUN ls -al /app

ARG SERVER_PORT
ARG SERVER_PORT
EXPOSE ${SERVER_PORT}
CMD /app/main
50 changes: 50 additions & 0 deletions services/docker-database.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Licensed under the Apache License, Version 2.0 (the “License”);
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an “AS IS” BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

services:

postgresdb:
container_name: postgresdb
image: 'postgres:14'
command: ["postgres", "-c", "max_connections=500"]
environment:
POSTGRES_USER: admin
POSTGRES_PASSWORD: crapisecretpassword
POSTGRES_DB: crapi
ports:
- "127.0.0.1:5432:5432"
healthcheck:
test: [ "CMD-SHELL", "pg_isready" ]
interval: 15s
timeout: 15s
retries: 15

mongodb:
container_name: mongodb
image: 'mongo:4.4'
environment:
MONGO_INITDB_ROOT_USERNAME: admin
MONGO_INITDB_ROOT_PASSWORD: crapisecretpassword
ports:
- "127.0.0.1:27017:27017"
healthcheck:
test: echo 'db.runCommand("ping").ok' | mongo mongodb:27017/test --quiet
interval: 15s
timeout: 15s
retries: 15
start_period: 20s






2 changes: 2 additions & 0 deletions services/workshop/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
__pycache__/
*.pyc
*.log
.coverage
*.xml
Loading

0 comments on commit 904e421

Please sign in to comment.