using api calling to replace extension define in vue

Author: LinuxSuRen

console/atest-ui/src/views/StoreManager.vue

@@ -130,8 +130,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   })
 }
 
-watch(() => storeForm.kind.name, (name) => {
-  const ext = SupportedExtension(name)
+watch(() => storeForm.kind.name, async (name) => {
+  const ext = await SupportedExtension(name)
   if (ext) {
     storeExtLink.value = ext.link
     let pro = storeForm.properties.slice()
@@ -211,6 +211,10 @@ function updateKeys() {
 }
 
 const storeExtLink = ref('')
+const extensions = ref([])
+SupportedExtensions().then(e => {
+  extensions.value = e
+})
 </script>
 
 <template>
@@ -301,7 +305,7 @@ const storeExtLink = ref('')
               class="m-2"
             >
               <el-option
-                v-for="item in SupportedExtensions()"
+                v-for="item in extensions"
                 :key="item.name"
                 :label="item.name"
                 :value="item.name"

console/atest-ui/src/views/net.ts

@@ -583,10 +583,31 @@ function PopularHeaders(callback: (d: any) => void, errHandle?: (e: any) => void
         .then(callback).catch(emptyOrDefault(errHandle))
 }
 
-const GetStoreKinds = (callback: (d: any) => void | null, errHandle?: (e: any) => void | null) => {
+interface StoreKindParam {
+    key: string
+    defaultValue: string
+    description: string
+}
+
+interface StoreKind {
+    name: string
+    link: string
+    params: StoreKindParam[]
+}
+
+interface StoreKindsResponse {
+    data: StoreKind[]
+}
+
+const GetStoreKinds = (callback?: (d: StoreKindsResponse) => void | null, errHandle?: (e: any) => void | null) => {
+    if (callback) {
+        return fetch(`/api/v1/stores/kinds`, {})
+            .then(DefaultResponseProcess)
+            .then(callback).catch(emptyOrDefault(errHandle))
+    }
     return fetch(`/api/v1/stores/kinds`, {})
         .then(DefaultResponseProcess)
-        .then(callback).catch(emptyOrDefault(errHandle))
+        .catch(emptyOrDefault(errHandle))
 }
 
 function CreateOrUpdateStore(payload: any, create: boolean,

console/atest-ui/src/views/store.ts

@@ -48,137 +48,12 @@ export const Driver = {
     MySQL, Postgres, SQLite, TDengine, Cassandra
 }
 
-const ExtensionKindGit = "atest-store-git"
-const ExtensionKindS3 = "atest-store-s3"
-const ExtensionKindORM = "atest-store-orm"
-const ExtensionKindIotDB = "atest-store-iotdb"
-const ExtensionKindCassandra = "atest-store-cassandra"
-const ExtensionKindEtcd = "atest-store-etcd"
-const ExtensionKindRedis = "atest-store-redis"
-const ExtensionKindMongoDB = "atest-store-mongodb"
-const ExtensionKindElasticsearch = "atest-store-elasticsearch"
-const ExtensionKindOpengeMini = "atest-store-opengemini"
-
-export const ExtensionKind = {
-    ExtensionKindGit,
-    ExtensionKindS3,
-    ExtensionKindORM,
-    ExtensionKindIotDB,
-    ExtensionKindCassandra,
-    ExtensionKindEtcd,
-    ExtensionKindRedis,
-    ExtensionKindMongoDB,
-    ExtensionKindElasticsearch,
-    ExtensionKindOpengeMini
-}
-
-const storeExtensions = [
-    {
-        name: ExtensionKindGit,
-        params: [{
-            key: 'insecure'
-        }, {
-            key: 'timeout'
-        }, {
-            key: 'targetpath'
-        }, {
-            key: 'branch'
-        }, {
-            key: 'email',
-            description: 'See also: git config --local user.email [email protected]'
-        }, {
-            key: 'name',
-            description: 'See also: git config --local user.name xxx'
-        }],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-git'
-    },
-    {
-        name: ExtensionKindS3,
-        params: [{
-            key: 'accesskeyid'
-        }, {
-            key: 'secretaccesskey'
-        }, {
-            key: 'sessiontoken'
-        }, {
-            key: 'region'
-        }, {
-            key: 'disablessl'
-        }, {
-            key: 'forcepathstyle'
-        }, {
-            key: 'bucket'
-        }],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-s3'
-    },
-    {
-        name: ExtensionKindORM,
-        params: [{
-            key: 'driver',
-            defaultValue: 'mysql',
-            enum: [MySQL, Postgres, SQLite, TDengine],
-            description: 'Supported: mysql, postgres, sqlite, tdengine'
-        }, {
-            key: 'database',
-            defaultValue: 'atest'
-        }, {
-            key: 'historyLimit',
-            defaultValue: '',
-            // type: 'number',
-            description: 'Set the limit of the history record count'
-        }],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-orm'
-    },
-    {
-        name: ExtensionKindIotDB,
-        params: [],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-iotdb'
-    },
-    {
-        name: ExtensionKindCassandra,
-        params: [{
-            key: 'keyspace',
-            defaultValue: ''
-        }],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-cassandra'
-    },
-    {
-        name: ExtensionKindEtcd,
-        params: [],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-etcd'
-    },
-    {
-        name: ExtensionKindRedis,
-        params: [],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-redis'
-    },
-    {
-        name: ExtensionKindMongoDB,
-        params: [{
-            key: 'collection'
-        }, {
-            key: 'database',
-            defaultValue: 'atest'
-        }],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-mongodb'
-    },
-    {
-        name: ExtensionKindElasticsearch,
-        params: [],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-elasticsearch'
-    },
-    {
-        name: ExtensionKindOpengeMini,
-        params: [],
-        link: 'https://github.com/LinuxSuRen/atest-ext-store-opengemini'
-    }
-] as Store[]
-
 export async function SupportedExtensions() {
-    API.GetStoreKinds()
-    return storeExtensions
+    const kinds = await API.GetStoreKinds()
+    return kinds.data
 }
 
-export function SupportedExtension(name: string) {
+export async function SupportedExtension(name: string) {
+    const storeExtensions = await SupportedExtensions()
     return storeExtensions.find(e => e.name === name)
 }

pkg/apispec/remote_swagger.go

@@ -21,13 +21,14 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
-	"github.com/linuxsuren/api-testing/pkg/downloader"
-	"github.com/linuxsuren/api-testing/pkg/util/home"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/linuxsuren/api-testing/pkg/downloader"
+	"github.com/linuxsuren/api-testing/pkg/util/home"
 )
 
 func DownloadSwaggerData(output string, dw downloader.PlatformAwareOCIDownloader) (err error) {
@@ -105,7 +106,7 @@ func decompressData(dataFile string) (err error) {
 			break // 退出循环
 		}
 		if err != nil {
-			panic(err)
+			return
 		}
 
 		// Ensure the file path does not contain directory traversal sequences

pkg/server/remote_server.go

@@ -1169,7 +1169,7 @@ func (s *server) GetStoreKinds(context.Context, *Empty) (kinds *StoreKinds, err
 		for _, store := range stores {
 			kinds.Data = append(kinds.Data, &StoreKind{
 				Name:    store.Name,
-				Enabled: store.Enabled,
+				Enabled: true,
 				Url:     store.URL,
 				Link:    store.Link,
 				Params:  convertStoreKindParams(store.Params),