Merge pull request #175 from import-ai/feature/application

Feature/application

Author: LucienShui

.github/workflows/ci.yaml

@@ -179,10 +179,10 @@ jobs:
         run: |
           curl "${{ secrets.DEV_WEBHOOK_URL }}/dev" -H "Authorization: Bearer ${{ secrets.DEV_WEBHOOK_API_KEY }}"
 
-      - name: PR Webhook
+      - name: TEST Webhook
         if: github.event_name == 'pull_request'
         run: |
-          curl "${{ secrets.DEV_WEBHOOK_URL }}/pr?module=backend&pr=pr-${{ github.event.number }}" -H "Authorization: Bearer ${{ secrets.DEV_WEBHOOK_API_KEY }}"
+          curl "${{ secrets.DEV_WEBHOOK_URL }}/test?module=backend&pr=pr-${{ github.event.number }}&commit=${{ github.event.pull_request.head.sha }}" -H "Authorization: Bearer ${{ secrets.DEV_WEBHOOK_API_KEY }}"
 
       - name: PROD Webhook
         if: false && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')

helm/backend/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/backend/Chart.yaml

@@ -0,0 +1,7 @@
+apiVersion: v2
+name: OmniBox Backend
+description: OmniBox Backend Service
+
+type: application
+version: 0.1.0
+appVersion: "0.1.0"

helm/backend/templates/omnibox-backend.yaml

@@ -0,0 +1,88 @@
+{{- $name := default .Release.Name .Values.release.name }}
+{{- $namespace := default .Release.Namespace .Values.release.namespace }}
+
+{{- if ne $name .Release.Name }}
+{{ fail (printf "Name from command line not equal to config's: %s != %s" ($name | quote) (.Release.Name | quote)) }}
+{{- end }}
+
+{{- if ne $namespace .Release.Namespace }}
+{{ fail (printf "Namespace from command line not equal to config's: %s != %s" ($namespace | quote) (.Release.Namespace | quote)) }}
+{{- end }}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $name }}
+  namespace: {{ $namespace }}
+spec:
+  replicas: {{ .Values.replicas }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  selector:
+    matchLabels:
+      app: {{ $name }}
+  template:
+    metadata:
+      labels:
+        app: {{ $name }}
+    spec:
+      restartPolicy: Always
+      containers:
+        - name: {{ $name }}
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          imagePullPolicy: Always
+          ports:
+            - containerPort: {{ .Values.app.port }}
+          volumeMounts:
+            - name: localtime
+              mountPath: /etc/localtime
+              readOnly: true
+          envFrom:
+            - secretRef:
+                name: omnibox-secrets
+          readinessProbe:
+            httpGet:
+              path: /api/v1/health
+              port: {{ .Values.app.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.app.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
+          resources:
+            requests:
+              cpu: 128m
+              memory: 256Mi
+            limits:
+              cpu: "1"
+              memory: 2Gi
+      volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+            type: File
+      {{ if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+      {{ end }}
+      {{ if .Values.affinity }}
+      affinity: {{ toYaml .Values.affinity | nindent 8 }}
+      {{ end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $name }}
+  namespace: {{ $namespace }}
+spec:
+  selector:
+    app: {{ $name }}
+  ports:
+    - protocol: TCP
+      port: {{ .Values.app.port }}
+      targetPort: {{ .Values.app.port }}
+  type: ClusterIP

helm/backend/values.yaml

@@ -0,0 +1,15 @@
+release:
+  name: omnibox-backend
+  namespace:
+
+image:
+  repository: ghcr.io/import-ai/omnibox-backend
+  tag: main
+
+replicas: 1
+
+app:
+  port: 8000
+
+affinity: {}
+nodeSelector: {}

src/api-key/api-key.controller.ts

@@ -3,6 +3,7 @@ import {
   APIKeyResponseDto,
   CreateAPIKeyDto,
   UpdateAPIKeyDto,
+  PatchAPIKeyDto,
 } from 'omniboxd/api-key/api-key.dto';
 import {
   BadRequestException,
@@ -11,6 +12,7 @@ import {
   Delete,
   Get,
   Param,
+  Patch,
   Post,
   Put,
   Query,
@@ -53,6 +55,14 @@ export class APIKeyController {
     return await this.apiKeyService.update(id, updateApiKeyDto);
   }
 
+  @Patch(':id')
+  async patch(
+    @Param('id') id: string,
+    @Body() patchApiKeyDto: PatchAPIKeyDto,
+  ): Promise<APIKeyResponseDto> {
+    return await this.apiKeyService.patch(id, patchApiKeyDto);
+  }
+
   @Delete(':id')
   async delete(@Param('id') id: string): Promise<void> {
     return await this.apiKeyService.delete(id);

src/api-key/api-key.dto.ts

@@ -1,5 +1,13 @@
-import { IsOptional, IsString, IsUUID, IsObject } from 'class-validator';
-import { APIKeyAttrs } from './api-key.entity';
+import {
+  IsOptional,
+  IsString,
+  IsUUID,
+  IsObject,
+  IsArray,
+  ValidateNested,
+} from 'class-validator';
+import { Type } from 'class-transformer';
+import { APIKeyAttrs, APIKey, APIKeyPermission } from './api-key.entity';
 
 export class CreateAPIKeyDto {
   @IsString()
@@ -19,6 +27,18 @@ export class UpdateAPIKeyDto {
   attrs?: APIKeyAttrs;
 }
 
+export class PatchAPIKeyDto {
+  @IsString()
+  @IsOptional()
+  root_resource_id?: string;
+
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => Object)
+  @IsOptional()
+  permissions?: APIKeyPermission[];
+}
+
 export class APIKeyResponseDto {
   @IsUUID()
   id: string;
@@ -38,4 +58,16 @@ export class APIKeyResponseDto {
   created_at: Date;
 
   updated_at: Date;
+
+  static fromEntity(apiKey: APIKey): APIKeyResponseDto {
+    const dto = new APIKeyResponseDto();
+    dto.id = apiKey.id;
+    dto.value = apiKey.value;
+    dto.user_id = apiKey.userId;
+    dto.namespace_id = apiKey.namespaceId;
+    dto.attrs = apiKey.attrs;
+    dto.created_at = apiKey.createdAt;
+    dto.updated_at = apiKey.updatedAt;
+    return dto;
+  }
 }