Add monogram to organisation model for testing file-upload

Change-Type: patch Signed-off-by: Nitish Agarwal <[email protected]>
balena-io · Jan 29, 2023 · 887e90e · 887e90e
1 parent 9864a1b
commit 887e90e
Show file tree

Hide file tree

Showing 7 changed files with 8,117 additions and 12,033 deletions.
diff --git a/config/confd/templates/env.tmpl b/config/confd/templates/env.tmpl
@@ -63,6 +63,8 @@ TOKEN_AUTH_CERT_KEY='{{getenv "TOKEN_AUTH_CERT_KEY"}}'
 TOKEN_AUTH_CERT_KID='{{getenv "TOKEN_AUTH_CERT_KID"}}'
 TOKEN_AUTH_CERT_PUB='{{getenv "TOKEN_AUTH_CERT_PUB"}}'
 TOKEN_AUTH_JWT_ALGO='{{getenv "TOKEN_AUTH_JWT_ALGO"}}'
+PINEJS_MAX_FILE_SIZE='{{getenv "PINEJS_MAX_FILE_SIZE"}}'
+PINEJS_STORAGE_ENGINE=S3
 TRANSACTION_TIMEOUT_MS=30000
 UV_THREADPOOL_SIZE=128
 VPN_HOST={{getenv "VPN_HOST"}}

diff --git a/docker-compose.test-custom.yml b/docker-compose.test-custom.yml
@@ -48,6 +48,8 @@ services:
       BLUEBIRD_LONG_STACK_TRACES: 0
       COOKIE_SESSION_SECRET: fuschia
       DATABASE_URL: postgres://docker:docker@db:5432/postgres
+      PINEJS_MAX_FILE_SIZE: 10485760
+      PINEJS_STORAGE_ENGINE: S3
       DEBUG:
       DELTA_HOST: delta_host.com
       DEVICE_CONFIG_OPENVPN_CA: 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNXRENDQWNHZ0F3SUJBZ0lKQVBTeHZhSG5zanVpTUEwR0NTcUdTSWIzRFFFQkJRVUFNRVV4Q3pBSkJnTlYKQkFZVEFrRlZNUk13RVFZRFZRUUlEQXBUYjIxbExWTjBZWFJsTVNFd0h3WURWUVFLREJoSmJuUmxjbTVsZENCWAphV1JuYVhSeklGQjBlU0JNZEdRd0hoY05NVE14TWpFeU1UUTBOelUyV2hjTk1qTXhNakV3TVRRME56VTJXakJGCk1Rc3dDUVlEVlFRR0V3SkJWVEVUTUJFR0ExVUVDQXdLVTI5dFpTMVRkR0YwWlRFaE1COEdBMVVFQ2d3WVNXNTAKWlhKdVpYUWdWMmxrWjJsMGN5QlFkSGtnVEhSa01JR2ZNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0R05BRENCaVFLQgpnUURsTXZRMmp1WnJ6WFJxV3BYN3Q0RlhYTGw0RzhuY05UMXYyTW1UM3BwNnVGNG5rVkd1UjRZdFczYmlwQ0thClRYRnZ5aFp1eEUvN2ZKWUdoYWZNV1pzMjZrUHQ3dnNtaVRSRUVHQytCSHFOUWIwd0ltckxaT0syVzk3R2R1U2UKZThuWmNXU0MzWjhVQ1hSQkg3WmtzNHphRndodGNnZ3ZkSi9Qdzl3MTJ0Tkl6UUlEQVFBQm8xQXdUakFkQmdOVgpIUTRFRmdRVVU0V3FYMmZMeDdnVTJRcFF2VkgwblpOUXNSWXdId1lEVlIwakJCZ3dGb0FVVTRXcVgyZkx4N2dVCjJRcFF2VkgwblpOUXNSWXdEQVlEVlIwVEJBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRVUZBQU9CZ1FBWWhUTWQKUHNDQ3hIbHFCak91c3dQNlBZT2c1TXo1QXFnNzBaWmZoTGpFV3lvU0VzclZKTTRlcyt4cnRIQUl0VDI4QXhreQpSUE43cnpMc2QzR2lIOWE2V3phZU5kcFdkWU1TaTMrTnJOYmtPU3ZuTmhHeHUvUUhiMEx0bWV0eHBENlNERmZQCkoxMUVuTjM0dldHMUpCWUh2NVNvditFOTkzclJKdkU0VUV1bFpRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo='

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,11 +33,11 @@
     "prepare": "node -e \"try { require('husky').install() } catch (e) {if (e.code !== 'MODULE_NOT_FOUND') throw e}\""
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^7.25.3",
+    "@balena/abstract-sql-compiler": "7.24.1-build-web-resource-2-924b6a699f0e50a1ecd787695879418e54671abd-1",
     "@balena/env-parsing": "^1.1.5",
     "@balena/es-version": "^1.0.2",
     "@balena/node-metrics-gatherer": "^6.0.3",
-    "@balena/pinejs": "^14.57.2",
+    "@balena/pinejs": "14.54.8-build-web-resource-2-6b3e0e820e9e0914ec6226c0453f64a264876297-1",
     "@sentry/node": "^7.31.1",
     "@types/basic-auth": "^1.1.3",
     "@types/bluebird": "^3.5.38",

diff --git a/src/balena-model.ts b/src/balena-model.ts
@@ -220,6 +220,7 @@ export interface Organization {
 	id: number;
 	name: string;
 	handle: string;
+	monogram: {} | null;
 	user__is_member_of__organization?: OrganizationMembership[];
 	includes__user?: OrganizationMembership[];
 	application?: Application[];

diff --git a/src/balena.sbvr b/src/balena.sbvr
@@ -313,7 +313,6 @@ Term: version
 Term: vpn address
 	Concept Type: Short Text (Type)
 
-
 -- Complex terms
 
 Term: application type
@@ -434,7 +433,6 @@ Fact type: organization has handle
 	Necessity: each handle is of exactly one organization.
 	Necessity: each handle of an organization, has a Length (Type) that is greater than 0.
 
-
 -- user
 
 Fact type: user (Auth) has email

diff --git a/src/infra/redis/config.ts b/src/infra/redis/config.ts
@@ -28,9 +28,9 @@ export const getRedisOptions = ({
 		retryStrategy: redisRetryStrategy,
 		enableOfflineQueue: false,
 		enableAutoPipelining,
-		// @ts-expect-error - `keepAlive` is actually used as `initialDelay` which is a number as the typings say
-		//                    but it clashes with the socket keepAlive option which is a boolean, this probably
-		//                    needs updated ioredis typings
+		// `keepAlive` is actually used as `initialDelay` which is a number as the typings say
+		// but it clashes with the socket keepAlive option which is a boolean, this probably
+		// needs updated ioredis typings
 		keepAlive: 0,
 	};