Merge pull request #1200 from amazeeio/rbac

RBAC

.lagoon.yml

@@ -39,6 +39,7 @@ environments:
   master:
     types:
       logs-db: elasticsearch-cluster
+      logs-collector: custom
     templates:
       logs-db: services/logs-db/.lagoon.cluster.yml
       logs-forwarder: services/logs-forwarder/.lagoon.multi.yml

docker-compose.yaml

@@ -89,6 +89,10 @@ services:
     volumes:
       - ./services/openshiftjobs/src:/app/services/openshiftjobs/src
       - ./node-packages:/app/node-packages:delegated
+    environment:
+      # Gateway IP in virtualbox, so pods running in minishift can connect to
+      # docker-for-mac containers.
+      - LAGOON_SSH_HOST=10.0.2.2
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftjobs/.lagoon.app.yml
@@ -158,6 +162,8 @@ services:
   api:
     image: ${IMAGE_REPO:-lagoon}/api
     command: yarn run dev
+    environment:
+      - KEYCLOAK_API_CLIENT_SECRET=39d5282d-3684-4026-b4ed-04bbc034b61a
     volumes:
       - ./services/api/src:/app/services/api/src
       - ./node-packages:/app/node-packages:delegated
@@ -214,6 +220,7 @@ services:
     environment:
       - JWTISSUER=auth-server.dev
       - JWTAUDIENCE=api.dev
+      - KEYCLOAK_AUTH_SERVER_CLIENT_SECRET=f605b150-7636-4447-abd3-70988786b330
     volumes:
       - ./services/auth-server/src:/app/services/auth-server/src
     user: '111111111'
@@ -259,6 +266,7 @@ services:
       - API_HOST=api
       - API_PROTOCOL=http
       - API_PORT=3000
+      - KEYCLOAK_AUTH_SERVER_CLIENT_SECRET=f605b150-7636-4447-abd3-70988786b330
     volumes:
       - ./tests:/ansible
     labels:

images/yarn-workspace-builder/Dockerfile

@@ -5,7 +5,7 @@ RUN apk add --no-cache \
         libexecinfo-dev \
         python
 
-COPY package.json yarn.lock .env.defaults /app/
+COPY package.json yarn.lock .env.defaults tsconfig.json /app/
 COPY node-packages /app/node-packages
 
 # We need to copy all services, so we have all

local-dev/api-data/00-clear-api-data.gql

@@ -4,11 +4,8 @@ mutation ClearApiData {
   # First, remove all relations between entities...
   RemoveAllNotificationsFromAllProjects: removeAllNotificationsFromAllProjects
   RemoveAllSshKeysFromAllUsers: removeAllSshKeysFromAllUsers
-  RemoveAllUsersFromAllCustomers: removeAllUsersFromAllCustomers
-  RemoveAllUsersFromAllProjects: removeAllUsersFromAllProjects
 
   # ...then delete the entities themselves
-  DeleteAllCustomers: deleteAllCustomers
   DeleteAllEnvironments: deleteAllEnvironments
   DeleteAllNotificationSlacks: deleteAllNotificationSlacks
   DeleteAllNotificationRocketChats: deleteAllNotificationRocketChats
@@ -17,4 +14,5 @@ mutation ClearApiData {
   DeleteAllSshKeys: deleteAllSshKeys
   DeleteAllUsers: deleteAllUsers
   DeleteAllBackups: deleteAllBackups
+  DeleteAllGroups: deleteAllGroups
 }