fix(server): check website hosting in bucket deletion, add error hand…

…le to tasks; (#1017)
labring · Apr 11, 2023 · 48cad2d · 48cad2d
1 parent 6a96add
commit 48cad2d
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 73 deletions.
diff --git a/deploy/build/charts/laf-web/templates/ingress.yaml b/deploy/build/charts/laf-web/templates/ingress.yaml
@@ -1,28 +1,65 @@
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: apisix.apache.org/v2
+kind: ApisixRoute
 metadata:
   name: laf-web-ingress
 spec:
-  # apisix-ingress-controller is only interested in Ingress
-  # resources with the matched ingressClass name, in our case,
-  # it's apisix.
-  ingressClassName: apisix
-  rules:
-  - host: {{ .Values.domain }}
-    http:
-      paths:
-      - backend:
-          service:
-            name: laf-web
-            port:
-              number: 80
-        path: /
-        pathType: Prefix
-      - backend:
-          service:
-            name: laf-server
-            port:
-              number: 3000
-        path: /v1/
-        pathType: Prefix
+  http:
+    - name: laf-web
+      match:
+        hosts:
+          - { { .Values.domain } }
+        paths:
+          - /*
+      backends:
+        - serviceName: laf-web
+          servicePort: 80
+      plugins:
+        - name: gzip
+          enable: true
+          config:
+            comp_level: 6
+            min_length: 100
+            types:
+              - text/plain
+              - text/css
+              - text/html
+              - text/xml
+              - text/javascript
+              - application/json
+              - application/x-javascript
+              - application/javascript
+              - image/bmp
+              - image/png
+              - font/ttf
+              - font/otf
+              - font/eot
+    - name: laf-web-api
+      match:
+        hosts:
+          - { { .Values.domain } }
+        paths:
+          - /v1/*
+      backends:
+        - serviceName: laf-server
+          servicePort: 3000
+      websocket: true
+      plugins:
+        - name: gzip
+          enable: true
+          config:
+            comp_level: 6
+            min_length: 100
+            types:
+              - text/plain
+              - text/css
+              - text/html
+              - text/xml
+              - text/javascript
+              - application/json
+              - application/x-javascript
+              - application/javascript
+              - image/bmp
+              - image/png
+              - font/ttf
+              - font/otf
+              - font/eot
diff --git a/deploy/build/charts/minio/templates/ingress.yaml b/deploy/build/charts/minio/templates/ingress.yaml
@@ -1,21 +1,36 @@
 ---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: apisix.apache.org/v2
+kind: ApisixRoute
 metadata:
   name: oss-ingress
 spec:
-  # apisix-ingress-controller is only interested in Ingress
-  # resources with the matched ingressClass name, in our case,
-  # it's apisix.
-  ingressClassName: apisix
-  rules:
-  - host: {{ .Values.domain }}
-    http:
-      paths:
-      - backend:
-          service:
-            name: minio
-            port:
-              number: 9000
-        path: /
-        pathType: Prefix
+  http:
+    - backends:
+        - serviceName: minio
+          servicePort: 9000
+      match:
+        hosts:
+          - {{ .Values.domain }}
+        paths:
+          - /*
+      name: laf-oss
+      plugins:
+        - config:
+            comp_level: 5
+            min_length: 1024
+            types:
+              - text/plain
+              - text/css
+              - text/html
+              - text/xml
+              - text/javascript
+              - application/json
+              - application/x-javascript
+              - application/javascript
+              - image/bmp
+              - image/png
+              - font/ttf
+              - font/otf
+              - font/eot
+          enable: true
+          name: gzip
diff --git a/deploy/build/images/shim/ImageList b/deploy/build/images/shim/ImageList
@@ -2,3 +2,5 @@ docker.io/lafyun/runtime-node-init:latest
 docker.io/lafyun/runtime-node:latest
 docker.io/apache/apisix-dashboard:2.13-alpine
 docker.io/apache/apisix-ingress-controller:1.5.0
+quay.io/minio/minio:RELEASE.2023-03-22T06-36-24Z
+quay.io/minio/mc:RELEASE.2022-11-07T23-47-39Z
diff --git a/server/src/application/application-task.service.ts b/server/src/application/application-task.service.ts
@@ -51,13 +51,19 @@ export class ApplicationTaskService {
     }
 
     // Phase `Creating` -> `Created`
-    this.handleCreatingPhase()
+    this.handleCreatingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletingPhase()
+    this.handleDeletingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // State `Deleted`
-    this.handleDeletedState()
+    this.handleDeletedState().catch((err) => {
+      this.logger.error(err)
+    })
   }
 
   /**

diff --git a/server/src/gateway/bucket-domain-task.service.ts b/server/src/gateway/bucket-domain-task.service.ts
@@ -25,19 +25,29 @@ export class BucketDomainTaskService {
     }
 
     // Phase `Creating` -> `Created`
-    this.handleCreatingPhase()
+    this.handleCreatingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletingPhase()
+    this.handleDeletingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Created` -> `Deleting`
-    this.handleInactiveState()
+    this.handleInactiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleted` -> `Creating`
-    this.handleActiveState()
+    this.handleActiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletedState()
+    this.handleDeletedState().catch((err) => {
+      this.logger.error(err)
+    })
   }
 
   /**

diff --git a/server/src/gateway/runtime-domain-task.service.ts b/server/src/gateway/runtime-domain-task.service.ts
@@ -24,19 +24,29 @@ export class RuntimeDomainTaskService {
     }
 
     // Phase `Creating` -> `Created`
-    this.handleCreatingPhase()
+    this.handleCreatingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletingPhase()
+    this.handleDeletingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Created` -> `Deleting`
-    this.handleInactiveState()
+    this.handleInactiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleted` -> `Creating`
-    this.handleActiveState()
+    this.handleActiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletedState()
+    this.handleDeletedState().catch((err) => {
+      this.logger.error(err)
+    })
   }
 
   /**

diff --git a/server/src/gateway/website-task.service.ts b/server/src/gateway/website-task.service.ts
@@ -34,19 +34,29 @@ export class WebsiteTaskService {
     }
 
     // Phase `Creating` -> `Created`
-    this.handleCreatingPhase()
+    this.handleCreatingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletingPhase()
+    this.handleDeletingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Created` -> `Deleting`
-    this.handleInactiveState()
+    this.handleInactiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleted` -> `Creating`
-    this.handleActiveState()
+    this.handleActiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletedState()
+    this.handleDeletedState().catch((err) => {
+      this.logger.error(err)
+    })
   }
 
   /**

diff --git a/server/src/storage/bucket-task.service.ts b/server/src/storage/bucket-task.service.ts
@@ -8,7 +8,6 @@ import {
 import { RegionService } from 'src/region/region.service'
 import * as assert from 'node:assert'
 import { Cron, CronExpression } from '@nestjs/schedule'
-import { times } from 'lodash'
 import { ServerConfig, TASK_LOCK_INIT_TIME } from 'src/constants'
 import { SystemDatabase } from 'src/database/system-database'
 import { MinioService } from './minio/minio.service'
@@ -17,7 +16,6 @@ import { BucketDomainService } from 'src/gateway/bucket-domain.service'
 @Injectable()
 export class BucketTaskService {
   readonly lockTimeout = 30 // in second
-  readonly concurrency = 1 // concurrency count
   private readonly logger = new Logger(BucketTaskService.name)
 
   constructor(
@@ -33,19 +31,29 @@ export class BucketTaskService {
     }
 
     // Phase `Creating` -> `Created`
-    times(this.concurrency, () => this.handleCreatingPhase())
+    this.handleCreatingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    times(this.concurrency, () => this.handleDeletingPhase())
+    this.handleDeletingPhase().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Created` -> `Deleting`
-    this.handleInactiveState()
+    this.handleInactiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleted` -> `Creating`
-    this.handleActiveState()
+    this.handleActiveState().catch((err) => {
+      this.logger.error(err)
+    })
 
     // Phase `Deleting` -> `Deleted`
-    this.handleDeletedState()
+    this.handleDeletedState().catch((err) => {
+      this.logger.error(err)
+    })
   }
 
   /**

diff --git a/server/src/storage/bucket.controller.ts b/server/src/storage/bucket.controller.ts
@@ -156,6 +156,12 @@ export class BucketController {
       throw new HttpException('bucket not found', HttpStatus.NOT_FOUND)
     }
 
+    if (bucket?.websiteHosting) {
+      return ResponseUtil.error(
+        'bucket has website hosting enabled, please delete it first',
+      )
+    }
+
     const res = await this.bucketService.delete(bucket)
     if (!res) {
       return ResponseUtil.error('delete bucket failed')

diff --git a/server/src/storage/storage.service.ts b/server/src/storage/storage.service.ts
@@ -84,13 +84,9 @@ export class StorageService {
       await this.prisma.storageBucket.updateMany({
         where: {
           appid,
-          state: {
-            not: StorageState.Deleted,
-          },
-        },
-        data: {
-          state: StorageState.Deleted,
+          state: { not: StorageState.Deleted },
         },
+        data: { state: StorageState.Deleted },
       })
 
       return