Transparent path master

.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

@@ -3,7 +3,12 @@ name: Build and Push to Development
 on:
   push:
     branches:
+<<<<<<< HEAD
+      - dev
+
+=======
       - master
+>>>>>>> master
 jobs:
   build:
     name: Build and Push to GCR

.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/management/commands/loadinitialdata.py

@@ -5,8 +5,21 @@
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
+<<<<<<< HEAD
+from core.models import (
+    ROLE_VIEW_ONLY,
+    ROLE_ORGANIZATION_ADMIN,
+    ROLE_WORKFLOW_ADMIN,
+    ROLE_WORKFLOW_TEAM,
+    Organization,
+    CoreUser,
+    CoreGroup,
+    OrganizationType,
+)
+=======
 from core.models import ROLE_VIEW_ONLY, ROLE_ORGANIZATION_ADMIN, ROLE_WORKFLOW_ADMIN, ROLE_WORKFLOW_TEAM, \
     Organization, CoreUser, CoreGroup, OrganizationType
+>>>>>>> master
 
 logger = logging.getLogger(__name__)
 
@@ -34,13 +47,19 @@ def _create_organization_types(self):
 
     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))
@@ -56,7 +75,15 @@ def _create_user(self):
             logger.info("Creating Super User")
             user_password = None
             if settings.DEBUG:
+<<<<<<< HEAD
+                user_password = (
+                    settings.SUPER_USER_PASSWORD
+                    if settings.SUPER_USER_PASSWORD
+                    else 'zGtkgLvmNiKm'
+                )
+=======
                 user_password = settings.SUPER_USER_PASSWORD if settings.SUPER_USER_PASSWORD else 'zGtkgLvmNiKm'
+>>>>>>> master
             elif settings.SUPER_USER_PASSWORD:
                 user_password = settings.SUPER_USER_PASSWORD
             else:

buildly/settings/authentication.py

@@ -31,7 +31,7 @@
 # Rest Framework OAuth2 and JWT
 REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] += [
     'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
-    'oauth2_provider_jwt.authentication.JWTAuthentication'
+    'oauth2_provider_jwt.authentication.JWTAuthentication',
 ]
 
 # Auth Application
@@ -50,28 +50,25 @@
 AUTH_PASSWORD_VALIDATORS = []
 
 AUTH_PASSWORD_VALIDATORS_MAP = {
-    'USE_PASSWORD_USER_ATTRIBUTE_SIMILARITY_VALIDATOR':
-        {
-            'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-        },
-    'USE_PASSWORD_MINIMUM_LENGTH_VALIDATOR':
-        {
-            'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-            'OPTIONS': {
-                'min_length': int(os.getenv('PASSWORD_MINIMUM_LENGTH', 6)),
-            }
-        },
-    'USE_PASSWORD_COMMON_VALIDATOR':
-        {
-            'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-        },
-    'USE_PASSWORD_NUMERIC_VALIDATOR':
-        {
-            'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-        },
+    'USE_PASSWORD_USER_ATTRIBUTE_SIMILARITY_VALIDATOR': {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'
+    },
+    'USE_PASSWORD_MINIMUM_LENGTH_VALIDATOR': {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        'OPTIONS': {'min_length': int(os.getenv('PASSWORD_MINIMUM_LENGTH', 6))},
+    },
+    'USE_PASSWORD_COMMON_VALIDATOR': {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'
+    },
+    'USE_PASSWORD_NUMERIC_VALIDATOR': {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'
+    },
 }
 
-for password_validator_env_var, password_validator in AUTH_PASSWORD_VALIDATORS_MAP.items():
+for (
+    password_validator_env_var,
+    password_validator,
+) in AUTH_PASSWORD_VALIDATORS_MAP.items():
     if os.getenv(password_validator_env_var, 'True') == 'True':
         AUTH_PASSWORD_VALIDATORS.append(password_validator)
 
@@ -81,11 +78,13 @@
 SOCIAL_AUTH_URL_NAMESPACE = 'social'
 SOCIAL_AUTH_POSTGRES_JSONFIELD = True
 
-SOCIAL_AUTH_REDIRECT_IS_HTTPS = True if os.getenv('SOCIAL_AUTH_REDIRECT_IS_HTTPS') == 'True' else False
+SOCIAL_AUTH_REDIRECT_IS_HTTPS = (
+    True if os.getenv('SOCIAL_AUTH_REDIRECT_IS_HTTPS') == 'True' else False
+)
 SOCIAL_AUTH_LOGIN_REDIRECT_URLS = {
     'github': os.getenv('SOCIAL_AUTH_GITHUB_REDIRECT_URL', None),
     'google-oauth2': os.getenv('SOCIAL_AUTH_GOOGLE_OAUTH2_REDIRECT_URL', None),
-    'microsoft-graph': os.getenv('SOCIAL_AUTH_MICROSOFT_GRAPH_REDIRECT_URL', None)
+    'microsoft-graph': os.getenv('SOCIAL_AUTH_MICROSOFT_GRAPH_REDIRECT_URL', None),
 }
 
 SOCIAL_AUTH_PIPELINE = (
@@ -117,9 +116,18 @@
 # i.e. ['example.com', 'buildly.io','treeaid.org']
 if os.getenv('SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS'):
     SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = os.getenv(
+<<<<<<< HEAD
+        'SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS'
+    ).split(',')
+        'SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS').split(',')
+
+=======
         'SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS').split(',')
+>>>>>>> master
 if os.getenv('SOCIAL_AUTH_MICROSOFT_WHITELISTED_DOMAINS'):
-    SOCIAL_AUTH_GOOGLE_MICROSOFT_DOMAINS = os.getenv('SOCIAL_AUTH_MICROSOFT_WHITELISTED_DOMAINS').split(',')
+    SOCIAL_AUTH_GOOGLE_MICROSOFT_DOMAINS = os.getenv(
+        'SOCIAL_AUTH_MICROSOFT_WHITELISTED_DOMAINS'
+    ).split(',')
 
 # oauth2 settings
 OAUTH2_PROVIDER = {
@@ -132,7 +140,9 @@
 }
 
 DEFAULT_OAUTH_DOMAINS = os.getenv('DEFAULT_OAUTH_DOMAINS', '')
-CREATE_DEFAULT_PROGRAM = True if os.getenv('CREATE_DEFAULT_PROGRAM') == 'True' else False
+CREATE_DEFAULT_PROGRAM = (
+    True if os.getenv('CREATE_DEFAULT_PROGRAM') == 'True' else False
+)
 
 # LDAP configuration
 # https://django-auth-ldap.readthedocs.io/en/latest/reference.html#settings
@@ -147,7 +157,7 @@
     AUTH_LDAP_USER_SEARCH = LDAPSearch(
         AUTH_LDAP_BASE_DN,
         ldap.SCOPE_SUBTREE,
-        f'{AUTH_LDAP_USERNAME_FIELD_SEARCH}=%(user)s'
+        f'{AUTH_LDAP_USERNAME_FIELD_SEARCH}=%(user)s',
     )
 
     AUTH_LDAP_USER_ATTR_MAP = {
@@ -157,4 +167,6 @@
         'email': 'mail',
     }
     AUTH_LDAP_ALWAYS_UPDATE_USER = True
-    AUTH_LDAP_CACHE_TIMEOUT = 3600  # Cache distinguished names and group memberships for an hour to minimize
+    AUTH_LDAP_CACHE_TIMEOUT = (
+        3600
+    )  # Cache distinguished names and group memberships for an hour to minimize

buildly/settings/base.py

@@ -1,8 +1,7 @@
 import os
 
 # Base dir path
-BASE_DIR = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 SECRET_KEY = os.environ['SECRET_KEY']
 
@@ -20,9 +19,7 @@
 
 STATIC_URL = '/static/'
 
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static"),
-]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 
 
 INSTALLED_APPS_DJANGO = [
@@ -40,31 +37,23 @@
     'django_filters',
     'rest_framework',
     'rest_framework.authtoken',
-
     # Social auth
     'social_django',
-
     # OAuth2
     'oauth2_provider',
     'oauth2_provider_jwt',
-
     # swagger
     'drf_yasg',
-
     # health check
-    'health_check',                             # required
-    'health_check.db',                          # stock Django health checkers
+    'health_check',  # required
+    'health_check.db',  # stock Django health checkers
 ]
 
-INSTALLED_APPS_LOCAL = [
-    'buildly',
-    'gateway',
-    'core',
-    'workflow',
-    'datamesh',
-]
+INSTALLED_APPS_LOCAL = ['buildly', 'gateway', 'core', 'workflow', 'datamesh']
 
-INSTALLED_APPS = INSTALLED_APPS_DJANGO + INSTALLED_APPS_THIRD_PARTIES + INSTALLED_APPS_LOCAL
+INSTALLED_APPS = (
+    INSTALLED_APPS_DJANGO + INSTALLED_APPS_THIRD_PARTIES + INSTALLED_APPS_LOCAL
+)
 
 MIDDLEWARE_DJANGO = [
     'django.middleware.security.SecurityMiddleware',
@@ -76,13 +65,9 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-MIDDLEWARE_CSRF = [
-    'core.middleware.DisableCsrfCheck',
-]
+MIDDLEWARE_CSRF = ['core.middleware.DisableCsrfCheck']
 
-EXCEPTION_MIDDLEWARE = [
-    'core.middleware.ExceptionMiddleware'
-]
+EXCEPTION_MIDDLEWARE = ['core.middleware.ExceptionMiddleware']
 
 MIDDLEWARE = MIDDLEWARE_DJANGO + MIDDLEWARE_CSRF + EXCEPTION_MIDDLEWARE
 
@@ -91,9 +76,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            'templates',
-        ],
+        'DIRS': ['templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -106,10 +89,10 @@
                 'social_django.context_processors.login_redirect',
             ],
             'builtins': [  # TODO to delete?
-                'django.contrib.staticfiles.templatetags.staticfiles',
+                'django.contrib.staticfiles.templatetags.staticfiles'
             ],
         },
-    },
+    }
 ]
 
 WSGI_APPLICATION = 'buildly.wsgi.application'
@@ -171,17 +154,17 @@
         'rest_framework.authentication.SessionAuthentication',  # TODO check if disable, and also delete CSRF
         'rest_framework.authentication.TokenAuthentication',
     ],
-    'DEFAULT_PERMISSION_CLASSES': (
-        'core.permissions.IsSuperUserBrowseableAPI',
-    )
+    'DEFAULT_PERMISSION_CLASSES': ('core.permissions.IsSuperUserBrowseableAPI',)
     # ToDo: Think about `DEFAULT_PAGINATION_CLASS as env variable and
     #       customizable values with reasonable defaults
 }
 
 # Front-end application URL
 FRONTEND_URL = os.getenv('FRONTEND_URL', 'http://www.example.com/')
 REGISTRATION_URL_PATH = os.getenv('REGISTRATION_URL_PATH', 'register/')
-RESETPASS_CONFIRM_URL_PATH = os.getenv('RESETPASS_CONFIRM_URL_PATH', 'reset_password_confirm/')
+RESETPASS_CONFIRM_URL_PATH = os.getenv(
+    'RESETPASS_CONFIRM_URL_PATH', 'reset_password_confirm/'
+)
 
 PASSWORD_RESET_TIMEOUT_DAYS = 1
 
@@ -197,11 +180,6 @@
 
 # Swagger settings - for generate_swagger management command
 
-SWAGGER_SETTINGS = {
-    'DEFAULT_INFO': 'gateway.urls.swagger_info',
-}
+SWAGGER_SETTINGS = {'DEFAULT_INFO': 'gateway.urls.swagger_info'}
 
-ORGANIZATION_TYPES = [
-    'Custodian',
-    'Producer'
-]
+ORGANIZATION_TYPES = ['Custodian', 'Producer']