Skip to content

Commit ff2830b

Browse files
tikazyqtikazyq
authored
Merge pull request #1481 from crawlab-team/develop
Develop
2 parents 005b67c + 6a60433 commit ff2830b

719 files changed

Lines changed: 68854 additions & 37 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎backend/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ require (
2020
github.com/cenkalti/backoff/v4 v4.1.0 // indirect
2121
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
2222
github.com/cloudflare/circl v1.3.3 // indirect
23-
github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484 // indirect
24-
github.com/crawlab-team/crawlab-fs v0.6.3 // indirect
23+
github.com/crawlab-team/crawlab/db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484 // indirect
24+
github.com/crawlab-team/crawlab/fs v0.6.3 // indirect
2525
github.com/crawlab-team/crawlab-grpc v0.6.0-beta.20211219.1930.0.20221020032435-afa1c691f73c // indirect
2626
github.com/crawlab-team/crawlab-vcs v0.6.2-0.20230629045457-afe0be0e2185 // indirect
27-
github.com/crawlab-team/go-trace v0.1.1 // indirect
27+
github.com/crawlab-team/crawlab/vcs v0.1.1 // indirect
2828
github.com/crawlab-team/goseaweedfs v0.6.0-beta.20211101.1936.0.20220912021203-dfee5f74dd69 // indirect
29-
github.com/crawlab-team/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e // indirect
29+
github.com/crawlab-team/crawlab/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e // indirect
3030
github.com/denisenkom/go-mssqldb v0.11.0 // indirect
3131
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
3232
github.com/elastic/elastic-transport-go/v8 v8.2.0 // indirect

‎backend/go.mod.dev‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.16
55
replace (
66
github.com/crawlab-team/crawlab-core => ../../crawlab-core
77
github.com/crawlab-team/crawlab-vcs => ../../crawlab-vcs
8-
github.com/crawlab-team/crawlab-fs => ../../crawlab-fs
9-
github.com/crawlab-team/crawlab-db => ../../crawlab-db
8+
github.com/crawlab-team/crawlab/fs => ../../crawlab-fs
9+
github.com/crawlab-team/crawlab/db => ../../crawlab-db
1010
)
1111

1212
require (
1313
github.com/apex/log v1.9.0
1414
github.com/crawlab-team/crawlab-core v0.6.0-beta.20211230.1200
15-
github.com/crawlab-team/go-trace v0.1.1
15+
github.com/crawlab-team/crawlab/vcs v0.1.1
1616
github.com/gin-gonic/gin v1.7.1
1717
github.com/spf13/cobra v1.1.3
1818
github.com/spf13/viper v1.7.1

‎backend/go.mod.local‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.16
55
replace (
66
github.com/crawlab-team/crawlab-core => /libs/crawlab-team/crawlab-core
77
github.com/crawlab-team/crawlab-vcs => /libs/crawlab-team/crawlab-vcs
8-
github.com/crawlab-team/crawlab-fs => /libs/crawlab-team/crawlab-fs
9-
github.com/crawlab-team/crawlab-db => /libs/crawlab-team/crawlab-db
8+
github.com/crawlab-team/crawlab/fs => /libs/crawlab-team/crawlab-fs
9+
github.com/crawlab-team/crawlab/db => /libs/crawlab-team/crawlab-db
1010
)
1111

1212
require (
1313
github.com/apex/log v1.9.0
1414
github.com/crawlab-team/crawlab-core v0.6.0-beta.20211230.1200
15-
github.com/crawlab-team/go-trace v0.1.1
15+
github.com/crawlab-team/crawlab/vcs v0.1.1
1616
github.com/gin-gonic/gin v1.7.1
1717
github.com/spf13/cobra v1.1.3
1818
github.com/spf13/viper v1.7.1

‎backend/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,24 +155,24 @@ github.com/crawlab-team/crawlab-core v0.6.3-0.20231021045242-07956209f653 h1:uOC
155155
github.com/crawlab-team/crawlab-core v0.6.3-0.20231021045242-07956209f653/go.mod h1:HNuAjSVVZpHhpyUP4k1F2YKxEiarZESFolSyx7YjgZ8=
156156
github.com/crawlab-team/crawlab-core v0.6.3-0.20231031044528-37e6d73eb203 h1:nyANfzoPgTSYJxuTye1uj44An8Cjou9QmcKRES7Gdwg=
157157
github.com/crawlab-team/crawlab-core v0.6.3-0.20231031044528-37e6d73eb203/go.mod h1:HNuAjSVVZpHhpyUP4k1F2YKxEiarZESFolSyx7YjgZ8=
158-
github.com/crawlab-team/crawlab-db v0.6.0-1/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
159-
github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484 h1:1CXWC3lYcVWcgPRc3PNKzZ3fcfX5WZ/V8xwzHEMUFHQ=
160-
github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
161-
github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940.0.20221218100256-a28d12756f73 h1:xIgfVPa3ZJWC72Y57oHS41n4jRtGZPn1YDEYBgMj2EU=
162-
github.com/crawlab-team/crawlab-fs v0.6.0-beta.20211101.1940.0.20221218100256-a28d12756f73/go.mod h1:y9YhLLR3GuPrDuPKe7ZuiHCITK9K2IcI8nlznF8YIEc=
163-
github.com/crawlab-team/crawlab-fs v0.6.3 h1:mS91sYu+tOPavjYvt4CZ8YwY5okEiwCAuyx/5RIbXJY=
164-
github.com/crawlab-team/crawlab-fs v0.6.3/go.mod h1:y9YhLLR3GuPrDuPKe7ZuiHCITK9K2IcI8nlznF8YIEc=
158+
github.com/crawlab-team/crawlab/db v0.6.0-1/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
159+
github.com/crawlab-team/crawlab/db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484 h1:1CXWC3lYcVWcgPRc3PNKzZ3fcfX5WZ/V8xwzHEMUFHQ=
160+
github.com/crawlab-team/crawlab/db v0.6.0-beta.20220417.1300.0.20221226064900-5a357ee73484/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
161+
github.com/crawlab-team/crawlab/fs v0.6.0-beta.20211101.1940.0.20221218100256-a28d12756f73 h1:xIgfVPa3ZJWC72Y57oHS41n4jRtGZPn1YDEYBgMj2EU=
162+
github.com/crawlab-team/crawlab/fs v0.6.0-beta.20211101.1940.0.20221218100256-a28d12756f73/go.mod h1:y9YhLLR3GuPrDuPKe7ZuiHCITK9K2IcI8nlznF8YIEc=
163+
github.com/crawlab-team/crawlab/fs v0.6.3 h1:mS91sYu+tOPavjYvt4CZ8YwY5okEiwCAuyx/5RIbXJY=
164+
github.com/crawlab-team/crawlab/fs v0.6.3/go.mod h1:y9YhLLR3GuPrDuPKe7ZuiHCITK9K2IcI8nlznF8YIEc=
165165
github.com/crawlab-team/crawlab-grpc v0.6.0-beta.20211219.1930.0.20221020032435-afa1c691f73c h1:jX0iax3WHwomWGQVWrCTy8a4zYDsKKyuspP3+04XCcU=
166166
github.com/crawlab-team/crawlab-grpc v0.6.0-beta.20211219.1930.0.20221020032435-afa1c691f73c/go.mod h1:Bq2Pm967EYWbjhP5Ghc4DV2LZgbOLMzLftJXDJYz/gs=
167167
github.com/crawlab-team/crawlab-vcs v0.6.2-0.20230629045457-afe0be0e2185 h1:A/XSUuGgGMn+z+lFd2ye2ClgIKhDZYUerhOL5jePQhU=
168168
github.com/crawlab-team/crawlab-vcs v0.6.2-0.20230629045457-afe0be0e2185/go.mod h1:YHMYUEoSqfXUZHsWW/M/DaLh/zOpRtiElaRWcrGyv/I=
169-
github.com/crawlab-team/go-trace v0.1.0/go.mod h1:LcWyn68HoT+d29CHM8L41pFHxsAcBMF1xjqJmWdyFh8=
170-
github.com/crawlab-team/go-trace v0.1.1 h1:AecgAOld+ZrSVvujyhK3zoaOmViGKHSCT8/weJ7adB8=
171-
github.com/crawlab-team/go-trace v0.1.1/go.mod h1:4U+pWgLhRuD3pbXHonwcaHcW+y8AUqyOfKoZnvKwCug=
169+
github.com/crawlab-team/crawlab/vcs v0.1.0/go.mod h1:LcWyn68HoT+d29CHM8L41pFHxsAcBMF1xjqJmWdyFh8=
170+
github.com/crawlab-team/crawlab/vcs v0.1.1 h1:AecgAOld+ZrSVvujyhK3zoaOmViGKHSCT8/weJ7adB8=
171+
github.com/crawlab-team/crawlab/vcs v0.1.1/go.mod h1:4U+pWgLhRuD3pbXHonwcaHcW+y8AUqyOfKoZnvKwCug=
172172
github.com/crawlab-team/goseaweedfs v0.6.0-beta.20211101.1936.0.20220912021203-dfee5f74dd69 h1:qPLsh2aWqI5HioWBymzQirt+HQxfRgd7BSoOqfN33Q0=
173173
github.com/crawlab-team/goseaweedfs v0.6.0-beta.20211101.1936.0.20220912021203-dfee5f74dd69/go.mod h1:u+rwfqb0rnYllTLjCctE/z1Yp+TC8L+CbbWH8E2NstA=
174-
github.com/crawlab-team/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e h1:Gwg9kKNZUAI4bSssomlzXCN01Q3MapgwQOCeOxGX/NU=
175-
github.com/crawlab-team/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e/go.mod h1:FImmp7V0VcIdTRM68F3PQUqewzuShvUjYBhAHRjD1Aw=
174+
github.com/crawlab-team/crawlab/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e h1:Gwg9kKNZUAI4bSssomlzXCN01Q3MapgwQOCeOxGX/NU=
175+
github.com/crawlab-team/crawlab/template-parser v0.0.4-0.20221006034646-9bb77a7ae86e/go.mod h1:FImmp7V0VcIdTRM68F3PQUqewzuShvUjYBhAHRjD1Aw=
176176
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
177177
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
178178
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎core/.editorconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 4
7+
indent_style = tab
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[{*.yaml,*.yml,package.json}]
12+
indent_size = 2
13+
indent_style = space

‎core/.github/workflows/test.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "Test"
2+
3+
on:
4+
push:
5+
branches: [ main, develop ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ main, develop ]
9+
10+
jobs:
11+
test:
12+
name: Test
13+
runs-on: ubuntu-20.04
14+
services:
15+
mongo:
16+
image: mongo:5
17+
ports:
18+
- 27017:27017
19+
env:
20+
CRAWLAB_SERVER_PORT: 9999
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v2
24+
- uses: actions/setup-go@v3
25+
with:
26+
go-version: '^1.22'
27+
- name: Run unit tests
28+
run: |
29+
mods=(\
30+
"github.com/crawlab-team/crawlab/core/controllers" \
31+
"github.com/crawlab-team/crawlab/core/models/client" \
32+
"github.com/crawlab-team/crawlab/core/models/service" \
33+
)
34+
for pkg in ${mods[@]}; do
35+
go test ${pkg}
36+
done

‎core/.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.idea
2+
.DS_Store
3+
vendor/
4+
tmp/
5+
build/
6+
dist/
7+
*.log
8+
gen/
9+
*.exe
10+
*.txt

0 commit comments

Comments
 (0)