Changes from Transparent Path

.github/ISSUE_TEMPLATE.md

@@ -3,6 +3,9 @@ Describe a feature request proposal explaining the benefits of having such featu
 
 ## Proposal
 
+## Estimate
+(Complexity ranked 1 to 10)
+
 # Bug report
 Describe the current behavior and what is the expected behavior. Include logs and screenshots if possible.
 

.github/workflows/demo-build.yml

@@ -0,0 +1,27 @@
+name: Build and Push to Demo
+
+on:
+  push:
+    branches:
+      - demo
+jobs:
+  build:
+    name: Build and Push to GCR
+    runs-on: ubuntu-latest
+    env:
+      IMAGE_NAME: gcr.io/spry-bricolage-298920/transparent-path/demo/buildly-core
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Docker login
+      uses: docker/login-action@v1
+      with:
+        registry: gcr.io
+        username: _json_key
+        password: ${{ secrets.GCR_JSON_KEY }}
+
+    - name: Build docker image
+      run: docker build -t $IMAGE_NAME:latest .
+
+    - name: Push to Google Container Registry
+      run: docker push $IMAGE_NAME:latest

.github/workflows/dev-build.yml

@@ -0,0 +1,28 @@
+name: Build and Push to Development
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build:
+    name: Build and Push to GCR
+    runs-on: ubuntu-latest
+    env:
+      IMAGE_NAME: gcr.io/dev-buildly/transparent-path/buildly-core
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Docker login
+      uses: docker/login-action@v1
+      with:
+        registry: gcr.io
+        username: _json_key
+        password: ${{ secrets.DEV_GCR_JSON_KEY }}
+
+    - name: Build docker image
+      run: docker build -t $IMAGE_NAME:latest .
+
+    - name: Push to Google Container Registry
+      run: docker push $IMAGE_NAME:latest

.github/workflows/prod-build.yml

@@ -0,0 +1,82 @@
+name: Build and Push Docker Image to Prod
+
+on:
+  push:
+    branches:
+      - prod
+
+jobs:
+  build:
+    name: Build and Push image to GCR
+    runs-on: ubuntu-latest
+    env:
+      IMAGE_NAME: gcr.io/spry-bricolage-298920/transparent-path/prod/buildly-core
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    # auto generate tag from label defined in Dockerfile
+    - uses: butlerlogic/action-autotag@stable
+      id: tag_version
+      with:
+        GITHUB_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
+        strategy: docker
+        tag_prefix: "v"
+
+    # Create release notes
+    - name: Build changelog
+      id: build_changelog
+      uses: mikepenz/release-changelog-builder-action@main
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+
+    # Create release
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@latest
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+      with:
+        tag_name: ${{ steps.tag_version.outputs.tagname }}
+        release_name: Release ${{ steps.tag_version.outputs.tagname }}
+        body: ${{ steps.build_changelog.outputs.changelog }}
+        draft: false
+        prerelease: false
+
+    # Login to docker
+    - name: Docker login
+      uses: docker/login-action@v1
+      with:
+        registry: gcr.io
+        username: _json_key
+        password: ${{ secrets.GCR_JSON_KEY }}
+
+    # Build docker image
+    - name: Build docker image
+      run: docker build -t $IMAGE_NAME:latest .
+
+    # Push docker image to GCR
+    - name: Push to Google Container Registry
+      run: docker push $IMAGE_NAME:latest
+
+    # Send message on Slack
+    - name: Slack Notification
+      uses: rtCamp/action-slack-notify@v2
+      env:
+        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        SLACK_MESSAGE: 'Production Docker Image of buildly core pushed to Google Container Registry Successfully'
+        MSG_MINIMAL: true
+
+    # Send email alert
+    - name: Email Alert
+      uses: dawidd6/action-send-mail@v3
+      with:
+        server_address: smtp.gmail.com
+        server_port: 465
+        username: ${{ secrets.MAIL_USERNAME }}
+        password: ${{ secrets.MAIL_PASSWORD }}
+        subject: Github Actions Build and Push job alert
+        to: ${{ secrets.RECIPIENT_EMAIL }}
+        from: ${{ secrets.SENDER_EMAIL }}
+        body: Production Docker Image of buildly core pushed to Google Container Registry Successfully

.github/workflows/unit_test.yml

@@ -0,0 +1,26 @@
+name: Buildly Core Unit Test
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  unit_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Build the docker-compose stack
+      run: docker-compose build
+
+    - name: Setup docker containers
+      run: docker-compose up -d
+
+    - name: Check running containers
+      run: docker ps -a
+
+    - name: Run unit test case
+      run: docker-compose run --entrypoint '/usr/bin/env' --rm buildly bash scripts/run-tests.sh --keepdb
+
+    - name: Stop docker container
+      run: docker-compose down

.pre-commit-config.yaml

@@ -0,0 +1,6 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: no-commit-to-branch
+        args: [--branch, prod, --branch, demo, --branch, dev]

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.10
+FROM --platform=linux/amd64 python:3.7-alpine3.10
 
 # Do not buffer log messages in memory; some messages can be lost otherwise
 ENV PYTHONUNBUFFERED 1
@@ -21,5 +21,8 @@ RUN ./scripts/collectstatic.sh
 
 RUN apk del .build-deps
 
+# Specify tag name to be created on github
+LABEL version="1.0.10"
+
 EXPOSE 8080
 ENTRYPOINT ["bash", "/code/scripts/docker-entrypoint.sh"]

buildly/gunicorn_conf.py

@@ -0,0 +1,4 @@
+bind = '0.0.0.0:8080'
+limit_request_field_size = 0
+limit_request_line = 0
+timeout = 90

buildly/management/commands/loadinitialdata.py

@@ -5,10 +5,16 @@
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-from oauth2_provider.models import Application
-
-from core.models import ROLE_VIEW_ONLY, ROLE_ORGANIZATION_ADMIN, ROLE_WORKFLOW_ADMIN, ROLE_WORKFLOW_TEAM, \
-    Organization, CoreUser, CoreGroup
+from core.models import (
+    ROLE_VIEW_ONLY,
+    ROLE_ORGANIZATION_ADMIN,
+    ROLE_WORKFLOW_ADMIN,
+    ROLE_WORKFLOW_TEAM,
+    Organization,
+    CoreUser,
+    CoreGroup,
+    OrganizationType,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -29,28 +35,26 @@ def __init__(self, *args, **kwargs):
         self._su_group = None
         self._default_org = None
 
-    def _create_oauth_application(self):
-        if settings.OAUTH_CLIENT_ID and settings.OAUTH_CLIENT_SECRET:
-            app, created = Application.objects.update_or_create(
-                client_id=settings.OAUTH_CLIENT_ID,
-                client_secret=settings.OAUTH_CLIENT_SECRET,
-                defaults={
-                    'name': 'buildly oauth2',
-                    'client_type': Application.CLIENT_PUBLIC,
-                    'authorization_grant_type': Application.GRANT_PASSWORD,
-                }
-            )
-            self._application = app
+    def _create_organization_types(self):
+        if settings.ORGANIZATION_TYPES:
+            for organization_type in settings.ORGANIZATION_TYPES:
+                OrganizationType.objects.get_or_create(name=organization_type)
 
     def _create_default_organization(self):
         if settings.DEFAULT_ORG:
-            self._default_org, _ = Organization.objects.get_or_create(name=settings.DEFAULT_ORG)
+            self._default_org, _ = Organization.objects.get_or_create(
+                name=settings.DEFAULT_ORG
+            )
 
     def _create_groups(self):
-        self._su_group = CoreGroup.objects.filter(is_global=True, permissions=15).first()
+        self._su_group = CoreGroup.objects.filter(
+            is_global=True, permissions=15
+        ).first()
         if not self._su_group:
             logger.info("Creating global CoreGroup")
-            self._su_group = CoreGroup.objects.create(name='Global Admin', is_global=True, permissions=15)
+            self._su_group = CoreGroup.objects.create(
+                name='Global Admin', is_global=True, permissions=15
+            )
 
         # TODO: remove this after full Group -> CoreGroup refactoring
         self._groups.append(Group.objects.get_or_create(name=ROLE_VIEW_ONLY))
@@ -66,7 +70,11 @@ def _create_user(self):
             logger.info("Creating Super User")
             user_password = None
             if settings.DEBUG:
-                user_password = settings.SUPER_USER_PASSWORD if settings.SUPER_USER_PASSWORD else 'admin'
+                user_password = (
+                    settings.SUPER_USER_PASSWORD
+                    if settings.SUPER_USER_PASSWORD
+                    else 'zGtkgLvmNiKm'
+                )
             elif settings.SUPER_USER_PASSWORD:
                 user_password = settings.SUPER_USER_PASSWORD
             else:
@@ -78,7 +86,7 @@ def _create_user(self):
                 su = CoreUser.objects.create_superuser(
                     first_name='System',
                     last_name='Admin',
-                    username='admin',
+                    username='67OAI8DD5I1O',
                     email='[email protected]',
                     password=user_password,
                     organization=self._default_org,
@@ -88,6 +96,6 @@ def _create_user(self):
     @transaction.atomic
     def handle(self, *args, **options):
         self._create_groups()
+        self._create_organization_types()
         self._create_default_organization()
-        self._create_oauth_application()
         self._create_user()