Skip to content

Commit 9320b3d

Browse files
committed
polish some paths of modules
1 parent 3d410d4 commit 9320b3d

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

.github/workflows/ci-it.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,20 @@ jobs:
149149
fail-fast: true
150150
matrix:
151151
package-paths:
152-
- ./modules/pkg/... ./apistructs/... ./bundle/... ./providers/...
152+
- ./internal/pkg/... ./apistructs/... ./bundle/... ./providers/...
153153
- ./pkg/...
154154

155-
- ./modules/tools/orchestrator/...
156-
- ./modules/tools/pipeline/...
157-
- ./modules/tools/cluster-agent/... ./modules/tools/cluster-ops/...
158-
- ./modules/tools/gittar/... ./modules/tools/kms/... ./modules/tools/volume-provisioner/...
159-
- ./modules/tools/openapi/...
160-
- ./modules/tools/monitor/...
161-
- ./modules/core/...
162-
- ./modules/apps/dop/...
163-
- ./modules/apps/admin/... ./modules/apps/devflow/... ./modules/apps/ecp/... ./modules/apps/gallery/...
164-
- ./modules/apps/msp/...
165-
- ./modules/apps/cmp/...
155+
- ./internal/tools/orchestrator/...
156+
- ./internal/tools/pipeline/...
157+
- ./internal/tools/cluster-agent/... ./internal/tools/cluster-ops/...
158+
- ./internal/tools/gittar/... ./internal/tools/kms/... ./internal/tools/volume-provisioner/...
159+
- ./internal/tools/openapi/...
160+
- ./internal/tools/monitor/...
161+
- ./internal/core/...
162+
- ./internal/apps/dop/...
163+
- ./internal/apps/admin/... ./internal/apps/devflow/... ./internal/apps/ecp/... ./internal/apps/gallery/...
164+
- ./internal/apps/msp/...
165+
- ./internal/apps/cmp/...
166166
steps:
167167
- name: Install Tools
168168
run: apk add tar

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ cmd/**/bin
4343
/.env
4444
/.env.*
4545
/conf/**/*.local.yaml
46-
modules/local/
4746
internal/local/
4847
cmd/local
4948
conf/local

.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ run:
77
skip-dirs:
88
- tools/cli/generated_cmd
99
- tools/cli/command/generate
10-
- modules/tools/openapi/legacy/api/generate
10+
- internal/tools/openapi/legacy/api/generate
1111
- pkg/parser/pipelineyml/pipelineymlv1
1212
- third_party
1313
- pkg/mock
1414
skip-files:
1515
- apistructs/generated_desc.go
16-
- modules/tools/openapi/legacy/api/api.go
16+
- internal/tools/openapi/legacy/api/api.go
1717
build-tags:
1818
- musl
1919

.licenserc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"pkg/k8s/httpstream/spdy",
99
"pkg/k8s/spdy",
1010
"pkg/pipe.v2/pipe.go",
11-
"modules/tools/admin-tools/statik/statik.go",
12-
"modules/tools/gittar/pkg/gitmodule",
11+
"internal/tools/admin-tools/statik/statik.go",
12+
"internal/tools/gittar/pkg/gitmodule",
1313
"api",
14-
"modules/core/monitor/log/storage/clickhouse/query_parser/parser"
14+
"internal/tools/monitor/core/log/storage/clickhouse/query_parser/parser"
1515
]
1616
}

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ prepare:
193193
ifeq "$(SKIP_PREPARE)" ""
194194
cd "${PROJ_PATH}" && \
195195
${GO_BUILD_ENV} go generate ./apistructs && \
196-
${GO_BUILD_ENV} go generate ./modules/tools/openapi/legacy/api/generate && \
197-
${GO_BUILD_ENV} go generate ./modules/tools/openapi/legacy/component-protocol/generate
196+
${GO_BUILD_ENV} go generate ./internal/tools/openapi/legacy/api/generate && \
197+
${GO_BUILD_ENV} go generate ./internal/tools/openapi/legacy/component-protocol/generate
198198
make prepare-cli
199199
endif
200200

codecov.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github_checks:
3737

3838
ignore:
3939
# ignore the boilerplate code
40-
- "modules/*/conf"
41-
- "modules/*/dbclient"
42-
- "modules/*/dao"
40+
- "internal/*/conf"
41+
- "internal/*/dbclient"
42+
- "internal/*/dao"
4343
- "bundle"
4444
- "api/proto-go"

internal/tools/openapi/openapi-ng/routes/dynamic/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (p *provider) Init(ctx servicehub.Context) (err error) {
7373
if p.Cfg.UseEmbedStaticFiles {
7474
p.Router.Static("/openapi/static", "/static", httpserver.WithFileSystem(http.FS(webfs)))
7575
} else {
76-
p.Router.Static("/openapi/static", "modules/core/openapi-ng/routes/dynamic/static")
76+
p.Router.Static("/openapi/static", "internal/tools/openapi/openapi-ng/routes/dynamic/static")
7777
}
7878

7979
return p.initRemoteForward(ctx)

0 commit comments

Comments
 (0)