fix: extension agent cannot quit normally in container (#303)

Co-authored-by: rick <[email protected]>

Author: LinuxSuRen

README.md

@@ -3,7 +3,6 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/3f16717cd6f841118006f12c346e9341)](https://app.codacy.com/gh/LinuxSuRen/api-testing/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 ![GitHub All Releases](https://img.shields.io/github/downloads/linuxsuren/api-testing/total)
 ![Docker Pulls](https://img.shields.io/docker/pulls/linuxsuren/api-testing)
-![](https://sloc.xyz/github/linuxsuren/api-testing)
 [![LinuxSuRen/open-source-best-practice](https://img.shields.io/static/v1?label=OSBP&message=%E5%BC%80%E6%BA%90%E6%9C%80%E4%BD%B3%E5%AE%9E%E8%B7%B5&color=blue)](https://github.com/LinuxSuRen/open-source-best-practice)
 
 This is a API testing tool.

cmd/function.go

@@ -13,8 +13,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/antonmedv/expr/builtin"
 	"github.com/cucumber/godog"
+	"github.com/expr-lang/expr/builtin"
 	"github.com/linuxsuren/api-testing/pkg/render"
 	"github.com/spf13/cobra"
 )

cmd/run.go

@@ -194,7 +194,7 @@ func (o *runOption) startMonitor() (err error) {
 
 	execer := fakeruntime.NewDefaultExecerWithContext(o.context)
 	go func(socketURL, plugin string) {
-		if err = execer.RunCommandWithIO(plugin, "", os.Stdout, os.Stderr, "server", "--socket", socketURL); err != nil {
+		if err = execer.RunCommandWithIO(plugin, "", os.Stdout, os.Stderr, nil, "server", "--socket", socketURL); err != nil {
 			log.Printf("failed to start %s, error: %v", socketURL, err)
 		}
 	}(sockFile, monitorBin)

cmd/server.go

@@ -207,6 +207,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 	}
 
 	storeExtMgr := server.NewStoreExtManager(o.execer)
+	defer storeExtMgr.StopAll()
 
 	remoteServer := server.NewRemoteServer(loader, remote.NewGRPCloaderFromStore(), secretServer, storeExtMgr, o.configDir)
 	kinds, storeKindsErr := remoteServer.GetStoreKinds(ctx, nil)
@@ -219,7 +220,7 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 	}
 
 	clean := make(chan os.Signal, 1)
-	signal.Notify(clean, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(clean, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
 
 	s := o.gRPCServer
 	go func() {
@@ -233,9 +234,9 @@ func (o *serverOption) runE(cmd *cobra.Command, args []string) (err error) {
 
 	go func() {
 		<-clean
+		log.Println("stopping the server")
 		_ = lis.Close()
 		_ = o.httpServer.Shutdown(ctx)
-		_ = storeExtMgr.StopAll()
 	}()
 
 	mux := runtime.NewServeMux(runtime.WithMetadata(server.MetadataStoreFunc))

cmd/service.go

@@ -324,9 +324,9 @@ func (s *podmanService) Install() (output string, err error) {
 
 func (s *podmanService) Start() (output string, err error) {
 	if s.exist() {
-		err = s.Execer.RunCommandWithIO(s.client, "", s.stdOut, s.errOut, "start", s.name)
+		err = s.Execer.RunCommandWithIO(s.client, "", s.stdOut, s.errOut, nil, "start", s.name)
 	} else {
-		err = s.Execer.RunCommandWithIO(s.client, "", s.stdOut, s.errOut, s.getStartArgs()...)
+		err = s.Execer.RunCommandWithIO(s.client, "", s.stdOut, s.errOut, nil, s.getStartArgs()...)
 		if err == nil {
 			output, err = s.installService()
 		}

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

@@ -22,20 +22,20 @@ interface Secret {
   Value: string
 }
 
-function loadStores() {
+function loadSecrets() {
   API.GetSecrets((e) => {
     secrets.value = e.data
   }, UIAPI.ErrorTip)
 }
-loadStores()
+loadSecrets()
 
 function deleteSecret(name: string) {
   API.DeleteSecret(name, () => {
       ElMessage({
         message: 'Deleted.',
         type: 'success'
       })
-      loadStores()
+      loadSecrets()
     }, UIAPI.ErrorTip)
 }
 
@@ -59,10 +59,10 @@ const rules = reactive<FormRules<Secret>>({
 })
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
-  await formEl.validate((valid: boolean, fields) => {
+  await formEl.validate((valid: boolean) => {
     if (valid) {
       UIAPI.CreateOrUpdateSecret(secret.value, createAction.value, () => {
-          loadStores()
+          loadSecrets()
           dialogVisible.value = false
           formEl.resetFields()
       }, creatingLoading)

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

@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { ElMessage } from 'element-plus'
-import { reactive, ref } from 'vue'
+import { reactive, ref, watch } from 'vue'
 import { Edit, Delete } from '@element-plus/icons-vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { Pair } from './types'
 import { API } from './net'
+import { UIAPI } from './net-vue'
 import { SupportedExtensions } from './store'
 import { useI18n } from 'vue-i18n'
 
@@ -115,44 +116,25 @@ const rules = reactive<FormRules<Store>>({
 })
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
-  await formEl.validate((valid: boolean, fields) => {
+  await formEl.validate((valid: boolean) => {
     if (valid) {
-      creatingLoading.value = true
-
-      const requestOptions = {
-        method: 'POST',
-        headers: {
-          'X-Auth': API.getToken()
-        },
-        body: JSON.stringify(storeForm)
-      }
-      
-      let api = '/server.Runner/CreateStore'
-      if (!createAction.value) {
-        api = '/server.Runner/UpdateStore'
-      }
-
-      fetch(api, requestOptions)
-        .then((response) => {
-          if (!response.ok) {
-            throw new Error(response.statusText)
-          } else {
-            return response.json()
-          }
-        })
-        .then(() => {
+      UIAPI.CreateOrUpdateStore(storeForm, createAction.value, () => {
           loadStores()
           dialogVisible.value = false
           formEl.resetFields()
-        })
-        .catch((e) => {
-          ElMessage.error('Oops, ' + e)
-        })
-        creatingLoading.value = false
+      }, creatingLoading)
     }
   })
 }
 
+watch(storeForm, (e) => {
+  if (e.kind.name === '') {
+    if (e.url.startsWith('https://github.com') || e.url.startsWith('https://gitee.com')) {
+      e.kind.name = 'atest-store-git'
+    }
+  }
+})
+
 function storeVerify(formEl: FormInstance | undefined) {
   if (!formEl) return
   

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

@@ -46,6 +46,16 @@ function CreateOrUpdateSecret(payload: any, create: boolean,
     })
 }
 
+function CreateOrUpdateStore(payload: any, create: boolean,
+    callback: (d: any) => void,
+    loadingRef?: Ref<Boolean>) {
+    API.CreateOrUpdateStore(payload, create, callback, ErrorTip, (e: boolean) => {
+        if (loadingRef) {
+            loadingRef.value = e
+        }
+    })
+}
+
 function ErrorTip(e: {
     statusText:''
 }) {
@@ -54,5 +64,6 @@ function ErrorTip(e: {
 
 export const UIAPI = {
     UpdateTestCase, CreateOrUpdateSecret,
+    CreateOrUpdateStore,
     ErrorTip
 }

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

@@ -350,6 +350,30 @@ function PopularHeaders(callback: (d: any) => void, errHandle?: (e: any) => void
     .then(callback).catch(errHandle)
 }
 
+function CreateOrUpdateStore(payload: any, create: boolean,
+  callback: (d: any) => void, errHandle?: (e: any) => void | null,
+  toggle?: (e: boolean) => void) {
+  const requestOptions = {
+    method: 'POST',
+    headers: {
+      'X-Auth': getToken()
+    },
+    body: JSON.stringify(payload)
+  }
+  
+  let api = '/server.Runner/CreateStore'
+  if (!create) {
+    api = '/server.Runner/UpdateStore'
+  }
+
+  safeToggleFunc(toggle)(true)
+  fetch(api, requestOptions)
+    .then(DefaultResponseProcess)
+    .then(callback).catch(errHandle).finally(() => {
+      safeToggleFunc(toggle)(false)
+    })
+}
+
 function GetStores(callback: (d: any) => void,
   errHandle?: (e: any) => void | null, final?: () => void | null) {
   const requestOptions = {
@@ -499,7 +523,7 @@ export const API = {
   CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase,
   GenerateCode, ListCodeGenerator,
   PopularHeaders,
-  GetStores, DeleteStore, VerifyStore,
+  CreateOrUpdateStore, GetStores, DeleteStore, VerifyStore,
   FunctionsQuery,
   GetSecrets, DeleteSecret, CreateOrUpdateSecret,
   GetSuggestedAPIs,

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

@@ -1,3 +1,27 @@
+/**
+MIT License
+
+Copyright (c) 2023 API Testing Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
 import type { Pair } from './types'
 
 export function SupportedExtensions() {