Deprecate studio API functions and comment out test cases
- Marked the studio API functions (Start, Load, loadDSL, loadScripts) as deprecated, returning an error message to indicate their status. - Commented out all test cases in studio_test.go to prevent execution of deprecated functionality, ensuring clarity in the test suite.
This commit is contained in:
Max
parent
92d21c5389
commit
7bdeec85f9
2 changed files with 194 additions and 190 deletions
|
|
@ -29,6 +29,7 @@ type cfunc struct {
|
|||
|
||||
// Start start the studio api server
|
||||
func Start(cfg config.Config) (err error) {
|
||||
return fmt.Errorf("studio is deprecated")
|
||||
|
||||
// recive interrupt signal
|
||||
interrupt := make(chan os.Signal, 1)
|
||||
|
|
@ -92,6 +93,7 @@ func Stop() {
|
|||
|
||||
// Load studio config
|
||||
func Load(cfg config.Config) error {
|
||||
return fmt.Errorf("studio is deprecated")
|
||||
|
||||
err := loadDSL(cfg)
|
||||
if err != nil {
|
||||
|
|
@ -101,12 +103,14 @@ func Load(cfg config.Config) error {
|
|||
}
|
||||
|
||||
func loadDSL(cfg config.Config) error {
|
||||
return fmt.Errorf("studio is deprecated")
|
||||
dslDenyList := []string{cfg.DataRoot}
|
||||
dfs = dsl.New(cfg.AppSource).DenyAbs(dslDenyList...)
|
||||
return nil
|
||||
}
|
||||
|
||||
func loadScripts() error {
|
||||
return fmt.Errorf("studio is deprecated")
|
||||
exts := []string{"*.js"}
|
||||
return application.App.Walk("studio", func(root, file string, isdir bool) error {
|
||||
if isdir {
|
||||
|
|
|
|||
|
|
@ -1,241 +1,241 @@
|
|||
package studio
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
// import (
|
||||
// "bytes"
|
||||
// "fmt"
|
||||
// "io"
|
||||
// "net/http"
|
||||
// "testing"
|
||||
// "time"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/yaoapp/yao/config"
|
||||
"github.com/yaoapp/yao/helper"
|
||||
"github.com/yaoapp/yao/test"
|
||||
)
|
||||
// jsoniter "github.com/json-iterator/go"
|
||||
// "github.com/stretchr/testify/assert"
|
||||
// "github.com/yaoapp/yao/config"
|
||||
// "github.com/yaoapp/yao/helper"
|
||||
// "github.com/yaoapp/yao/test"
|
||||
// )
|
||||
|
||||
type kv map[string]interface{}
|
||||
type arr []interface{}
|
||||
// type kv map[string]interface{}
|
||||
// type arr []interface{}
|
||||
|
||||
func TestLoad(t *testing.T) {
|
||||
// func TestLoad(t *testing.T) {
|
||||
|
||||
test.Prepare(t, config.Conf)
|
||||
defer test.Clean()
|
||||
// test.Prepare(t, config.Conf)
|
||||
// defer test.Clean()
|
||||
|
||||
err := Load(config.Conf)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// err := Load(config.Conf)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
// res, err := gou.Yao.Engine.RootCall(map[string]interface{}{}, "table", "Ping")
|
||||
// assert.Nil(t, err)
|
||||
// assert.Equal(t, "PONG", res)
|
||||
// // res, err := gou.Yao.Engine.RootCall(map[string]interface{}{}, "table", "Ping")
|
||||
// // assert.Nil(t, err)
|
||||
// // assert.Equal(t, "PONG", res)
|
||||
|
||||
// _, err = gou.Yao.Engine.Call(map[string]interface{}{}, "table", "Ping")
|
||||
// assert.NotNil(t, err)
|
||||
// assert.Contains(t, err.Error(), "The table does not loaded")
|
||||
}
|
||||
// // _, err = gou.Yao.Engine.Call(map[string]interface{}{}, "table", "Ping")
|
||||
// // assert.NotNil(t, err)
|
||||
// // assert.Contains(t, err.Error(), "The table does not loaded")
|
||||
// }
|
||||
|
||||
func TestStartStop(t *testing.T) {
|
||||
// func TestStartStop(t *testing.T) {
|
||||
|
||||
test.Prepare(t, config.Conf)
|
||||
defer test.Clean()
|
||||
// test.Prepare(t, config.Conf)
|
||||
// defer test.Clean()
|
||||
|
||||
var err error
|
||||
go func() { err = Start(config.Conf) }()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// var err error
|
||||
// go func() { err = Start(config.Conf) }()
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
Stop()
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
}
|
||||
// time.Sleep(500 * time.Millisecond)
|
||||
// Stop()
|
||||
// time.Sleep(100 * time.Millisecond)
|
||||
// }
|
||||
|
||||
func TestStartStopError(t *testing.T) {
|
||||
// func TestStartStopError(t *testing.T) {
|
||||
|
||||
test.Prepare(t, config.Conf)
|
||||
defer test.Clean()
|
||||
// test.Prepare(t, config.Conf)
|
||||
// defer test.Clean()
|
||||
|
||||
var err error
|
||||
go func() { err = Start(config.Conf) }()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// var err error
|
||||
// go func() { err = Start(config.Conf) }()
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
go func() { err = Start(config.Conf) }()
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
assert.NotNil(t, err)
|
||||
// time.Sleep(500 * time.Millisecond)
|
||||
// go func() { err = Start(config.Conf) }()
|
||||
// time.Sleep(100 * time.Millisecond)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
Stop()
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
}
|
||||
// Stop()
|
||||
// time.Sleep(100 * time.Millisecond)
|
||||
// }
|
||||
|
||||
func TestAPI(t *testing.T) {
|
||||
// func TestAPI(t *testing.T) {
|
||||
|
||||
test.Prepare(t, config.Conf)
|
||||
defer test.Clean()
|
||||
// test.Prepare(t, config.Conf)
|
||||
// defer test.Clean()
|
||||
|
||||
Load(config.Conf)
|
||||
// Load(config.Conf)
|
||||
|
||||
var err error
|
||||
go func() { err = Start(config.Conf) }()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer Stop()
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
// var err error
|
||||
// go func() { err = Start(config.Conf) }()
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
// defer Stop()
|
||||
// time.Sleep(500 * time.Millisecond)
|
||||
|
||||
code, row := httpGet[kv]("/dsl/ReadFile?name=/models/user.mod.yao", t)
|
||||
assert.Equal(t, 200, code)
|
||||
assert.Equal(t, "User", row["name"])
|
||||
// code, row := httpGet[kv]("/dsl/ReadFile?name=/models/user.mod.yao", t)
|
||||
// assert.Equal(t, 200, code)
|
||||
// assert.Equal(t, "User", row["name"])
|
||||
|
||||
code, rows := httpGet[arr]("/dsl/ReadDir?name=/models", t)
|
||||
assert.Equal(t, 200, code)
|
||||
assert.Equal(t, 8, len(rows))
|
||||
// code, rows := httpGet[arr]("/dsl/ReadDir?name=/models", t)
|
||||
// assert.Equal(t, 200, code)
|
||||
// assert.Equal(t, 8, len(rows))
|
||||
|
||||
code, rows = httpGet[arr]("/dsl/ReadDir?name=/models&recursive=1", t)
|
||||
assert.Equal(t, 200, code)
|
||||
assert.Equal(t, 13, len(rows))
|
||||
// code, rows = httpGet[arr]("/dsl/ReadDir?name=/models&recursive=1", t)
|
||||
// assert.Equal(t, 200, code)
|
||||
// assert.Equal(t, 13, len(rows))
|
||||
|
||||
code, length := httpPost[int]("/dsl/WriteFile?name=/models/foo.mod.yao", []byte(`{"name":"foo"}`), t)
|
||||
assert.Equal(t, 200, code)
|
||||
assert.Equal(t, 19, length)
|
||||
// code, length := httpPost[int]("/dsl/WriteFile?name=/models/foo.mod.yao", []byte(`{"name":"foo"}`), t)
|
||||
// assert.Equal(t, 200, code)
|
||||
// assert.Equal(t, 19, length)
|
||||
|
||||
code, _ = httpPost[kv]("/dsl/Remove?name=/models/foo.mod.yao", nil, t)
|
||||
assert.Equal(t, 200, code)
|
||||
// code, _ = httpPost[kv]("/dsl/Remove?name=/models/foo.mod.yao", nil, t)
|
||||
// assert.Equal(t, 200, code)
|
||||
|
||||
code, _ = httpPost[kv]("/dsl/Mkdir?name=/models/bar", nil, t)
|
||||
assert.Equal(t, 200, code)
|
||||
// code, _ = httpPost[kv]("/dsl/Mkdir?name=/models/bar", nil, t)
|
||||
// assert.Equal(t, 200, code)
|
||||
|
||||
code, _ = httpPost[kv]("/dsl/Remove?name=/models/bar", nil, t)
|
||||
assert.Equal(t, 200, code)
|
||||
// code, _ = httpPost[kv]("/dsl/Remove?name=/models/bar", nil, t)
|
||||
// assert.Equal(t, 200, code)
|
||||
|
||||
code, _ = httpPost[kv]("/dsl/MkdirAll?name=/models/bar/hi", nil, t)
|
||||
assert.Equal(t, 200, code)
|
||||
// code, _ = httpPost[kv]("/dsl/MkdirAll?name=/models/bar/hi", nil, t)
|
||||
// assert.Equal(t, 200, code)
|
||||
|
||||
code, _ = httpPost[kv]("/dsl/RemoveAll?name=/models/bar", nil, t)
|
||||
assert.Equal(t, 200, code)
|
||||
// code, _ = httpPost[kv]("/dsl/RemoveAll?name=/models/bar", nil, t)
|
||||
// assert.Equal(t, 200, code)
|
||||
|
||||
code, res := httpPostJSON[arr](
|
||||
"/service/table",
|
||||
kv{
|
||||
"method": "UnitTest",
|
||||
"args": []interface{}{
|
||||
"foo", 1, 0.618,
|
||||
kv{"string": "world", "int": 1, "float": 0.618},
|
||||
arr{"foo", 1, 0.618},
|
||||
},
|
||||
}, t)
|
||||
// code, res := httpPostJSON[arr](
|
||||
// "/service/table",
|
||||
// kv{
|
||||
// "method": "UnitTest",
|
||||
// "args": []interface{}{
|
||||
// "foo", 1, 0.618,
|
||||
// kv{"string": "world", "int": 1, "float": 0.618},
|
||||
// arr{"foo", 1, 0.618},
|
||||
// },
|
||||
// }, t)
|
||||
|
||||
assert.Equal(t, 200, code)
|
||||
assert.Equal(t, "foo", res[0])
|
||||
assert.Equal(t, float64(1), res[1])
|
||||
assert.Equal(t, 0.618, res[2])
|
||||
assert.Equal(t, "world", res[3].(map[string]interface{})["string"])
|
||||
assert.Equal(t, float64(1), res[3].(map[string]interface{})["int"])
|
||||
assert.Equal(t, 0.618, res[3].(map[string]interface{})["float"])
|
||||
assert.Equal(t, "foo", res[4].([]interface{})[0])
|
||||
assert.Equal(t, float64(1), res[4].([]interface{})[1])
|
||||
assert.Equal(t, 0.618, res[4].([]interface{})[2])
|
||||
// assert.Equal(t, 200, code)
|
||||
// assert.Equal(t, "foo", res[0])
|
||||
// assert.Equal(t, float64(1), res[1])
|
||||
// assert.Equal(t, 0.618, res[2])
|
||||
// assert.Equal(t, "world", res[3].(map[string]interface{})["string"])
|
||||
// assert.Equal(t, float64(1), res[3].(map[string]interface{})["int"])
|
||||
// assert.Equal(t, 0.618, res[3].(map[string]interface{})["float"])
|
||||
// assert.Equal(t, "foo", res[4].([]interface{})[0])
|
||||
// assert.Equal(t, float64(1), res[4].([]interface{})[1])
|
||||
// assert.Equal(t, 0.618, res[4].([]interface{})[2])
|
||||
|
||||
code, excp := httpPostJSON[kv]("/service/table", kv{"method": "UnitTest", "args": []interface{}{"throw-test"}}, t)
|
||||
assert.Equal(t, 418, code)
|
||||
assert.Equal(t, float64(418), excp["code"])
|
||||
assert.Equal(t, "I'm a teapot", excp["message"])
|
||||
}
|
||||
// code, excp := httpPostJSON[kv]("/service/table", kv{"method": "UnitTest", "args": []interface{}{"throw-test"}}, t)
|
||||
// assert.Equal(t, 418, code)
|
||||
// assert.Equal(t, float64(418), excp["code"])
|
||||
// assert.Equal(t, "I'm a teapot", excp["message"])
|
||||
// }
|
||||
|
||||
func httpGet[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, t *testing.T) (int, T) {
|
||||
// func httpGet[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, t *testing.T) (int, T) {
|
||||
|
||||
var data T
|
||||
url = fmt.Sprintf("http://127.0.0.1:%d%s", config.Conf.Studio.Port, url)
|
||||
req, err := http.NewRequest("GET", url, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// var data T
|
||||
// url = fmt.Sprintf("http://127.0.0.1:%d%s", config.Conf.Studio.Port, url)
|
||||
// req, err := http.NewRequest("GET", url, nil)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
token := getToken(t)
|
||||
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||
// token := getToken(t)
|
||||
// req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||
|
||||
client := http.Client{}
|
||||
res, err := client.Do(req)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// client := http.Client{}
|
||||
// res, err := client.Do(req)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
if res.Body != nil {
|
||||
body, err := io.ReadAll(res.Body)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// if res.Body != nil {
|
||||
// body, err := io.ReadAll(res.Body)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
if body != nil && len(body) > 0 {
|
||||
err = jsoniter.Unmarshal(body, &data)
|
||||
if err != nil {
|
||||
t.Fatal(fmt.Sprintf("%s\n%s\n", err.Error(), string(body)))
|
||||
}
|
||||
}
|
||||
}
|
||||
// if body != nil && len(body) > 0 {
|
||||
// err = jsoniter.Unmarshal(body, &data)
|
||||
// if err != nil {
|
||||
// t.Fatal(fmt.Sprintf("%s\n%s\n", err.Error(), string(body)))
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
return res.StatusCode, data
|
||||
}
|
||||
// return res.StatusCode, data
|
||||
// }
|
||||
|
||||
func httpPost[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, payload []byte, t *testing.T) (int, T) {
|
||||
// func httpPost[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, payload []byte, t *testing.T) (int, T) {
|
||||
|
||||
var data T
|
||||
var buff *bytes.Buffer = bytes.NewBuffer([]byte{})
|
||||
// var data T
|
||||
// var buff *bytes.Buffer = bytes.NewBuffer([]byte{})
|
||||
|
||||
if payload != nil {
|
||||
buff = bytes.NewBuffer(payload)
|
||||
}
|
||||
// if payload != nil {
|
||||
// buff = bytes.NewBuffer(payload)
|
||||
// }
|
||||
|
||||
url = fmt.Sprintf("http://127.0.0.1:%d%s", config.Conf.Studio.Port, url)
|
||||
req, err := http.NewRequest("POST", url, buff)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// url = fmt.Sprintf("http://127.0.0.1:%d%s", config.Conf.Studio.Port, url)
|
||||
// req, err := http.NewRequest("POST", url, buff)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
token := getToken(t)
|
||||
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||
// token := getToken(t)
|
||||
// req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
|
||||
|
||||
client := http.Client{}
|
||||
res, err := client.Do(req)
|
||||
if res.Body != nil {
|
||||
body, err := io.ReadAll(res.Body)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// client := http.Client{}
|
||||
// res, err := client.Do(req)
|
||||
// if res.Body != nil {
|
||||
// body, err := io.ReadAll(res.Body)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
|
||||
if body != nil && string(body) != "" {
|
||||
err = jsoniter.Unmarshal(body, &data)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
// if body != nil && string(body) != "" {
|
||||
// err = jsoniter.Unmarshal(body, &data)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
return res.StatusCode, data
|
||||
}
|
||||
// return res.StatusCode, data
|
||||
// }
|
||||
|
||||
func httpPostJSON[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, payload interface{}, t *testing.T) (int, T) {
|
||||
var data []byte
|
||||
var err error
|
||||
if payload != nil {
|
||||
data, err = jsoniter.Marshal(payload)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
return httpPost[T](url, data, t)
|
||||
}
|
||||
// func httpPostJSON[T kv | arr | interface{} | map[string]interface{} | int | []interface{}](url string, payload interface{}, t *testing.T) (int, T) {
|
||||
// var data []byte
|
||||
// var err error
|
||||
// if payload != nil {
|
||||
// data, err = jsoniter.Marshal(payload)
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
// }
|
||||
// return httpPost[T](url, data, t)
|
||||
// }
|
||||
|
||||
func getToken(t *testing.T) string {
|
||||
return helper.JwtMake(
|
||||
1,
|
||||
map[string]interface{}{"id": 1, "user_id": 1, "user": kv{"id": 1, "name": "test"}},
|
||||
map[string]interface{}{"issuer": "unit-test", "timeout": 3600},
|
||||
[]byte(config.Conf.Studio.Secret),
|
||||
).Token
|
||||
}
|
||||
// func getToken(t *testing.T) string {
|
||||
// return helper.JwtMake(
|
||||
// 1,
|
||||
// map[string]interface{}{"id": 1, "user_id": 1, "user": kv{"id": 1, "name": "test"}},
|
||||
// map[string]interface{}{"issuer": "unit-test", "timeout": 3600},
|
||||
// []byte(config.Conf.Studio.Secret),
|
||||
// ).Token
|
||||
// }
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue