Skip to content

Commit 39fb963

Browse files
PeefyPeefy
authored
chore: bump kcl lib 078 (#220)
* chore: bump lib version to v0.7.5 and add load package API Signed-off-by: peefy <[email protected]> * chore: remove unused codes Signed-off-by: peefy <[email protected]> --------- Signed-off-by: peefy <[email protected]>
1 parent 62ed9d5 commit 39fb963

File tree

12 files changed

+1476
-643
lines changed

12 files changed

+1476
-643
lines changed

‎Dockerfile

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

‎examples/kubernetes/main.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
// Copyright 2023 The KCL Authors. All rights reserved.
2-
3-
// Run CGO Mode:
4-
// KCLVM_SERVICE_CLIENT_HANDLER=native KCLVM_PLUGIN_DEBUG=1 go run -tags=kclvm_service_capi .
5-
61
package main
72

83
import (
94
"fmt"
105

11-
"kcl-lang.io/kcl-go"
6+
kcl "kcl-lang.io/kcl-go"
127
_ "kcl-lang.io/kcl-go/pkg/kcl_plugin/hello_plugin"
138
)
149

1510
func main() {
16-
yaml := kclvm.MustRun("kubernetes.k", kclvm.WithCode(k_code)).GetRawYamlResult()
11+
yaml := kcl.MustRun("kubernetes.k", kcl.WithCode(k_code)).GetRawYamlResult()
1712
fmt.Println(yaml)
1813
}
1914

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
google.golang.org/protobuf v1.30.0
2323
gopkg.in/yaml.v3 v3.0.1
2424
kcl-lang.io/kpm v0.6.0
25-
kcl-lang.io/lib v0.7.7
25+
kcl-lang.io/lib v0.7.8
2626
)
2727

2828
require (

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
794794
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
795795
kcl-lang.io/kpm v0.6.0 h1:8gHMyV2l/EpZ/w27c3UyybXEBATvAzL81JdAFzdYqWc=
796796
kcl-lang.io/kpm v0.6.0/go.mod h1:s9w+2itB6AcCNjdppZv2Tc9vGhKk/axtJ5XJYaWNR+0=
797-
kcl-lang.io/lib v0.7.7 h1:zz6KO7ZZl74xq8I85102Z/dPdN9c89e0qEk0ZjnOAH8=
798-
kcl-lang.io/lib v0.7.7/go.mod h1:ubsalGXxJaa5II/EsHmsI/tL2EluYHIcW+BwzQPt+uY=
797+
kcl-lang.io/lib v0.7.8 h1:kOYlrFqZkwzCG/CFs63cwbX3pPCNUci1Xvj7zqqnLno=
798+
kcl-lang.io/lib v0.7.8/go.mod h1:ubsalGXxJaa5II/EsHmsI/tL2EluYHIcW+BwzQPt+uY=
799799
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
800800
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
801801
oras.land/oras-go/v2 v2.3.0 h1:lqX1aXdN+DAmDTKjiDyvq85cIaI4RkIKp/PghWlAGIU=

‎pkg/service/client_kclvm_service.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ func (p *KclvmServiceClient) ParseProgram(args *gpyrpc.ParseProgram_Args) (resp
6969
return
7070
}
7171

72+
func (p *KclvmServiceClient) LoadPackage(args *gpyrpc.LoadPackage_Args) (resp *gpyrpc.LoadPackage_Result, err error) {
73+
p.Runtime.DoTask(func(c *rpc.Client, stderr io.Reader) {
74+
resp, err = p.getClient(c).LoadPackage(args)
75+
err = p.wrapErr(err, stderr)
76+
})
77+
return
78+
}
79+
7280
func (p *KclvmServiceClient) FormatCode(args *gpyrpc.FormatCode_Args) (resp *gpyrpc.FormatCode_Result, err error) {
7381
p.Runtime.DoTask(func(c *rpc.Client, stderr io.Reader) {
7482
resp, err = p.getClient(c).FormatCode(args)

‎pkg/service/grpc_server.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ func (p *_KclvmServiceImpl) ParseFile(ctx context.Context, args *gpyrpc.ParseFil
4949
func (p *_KclvmServiceImpl) ParseProgram(ctx context.Context, args *gpyrpc.ParseProgram_Args) (*gpyrpc.ParseProgram_Result, error) {
5050
return p.c.ParseProgram(args)
5151
}
52+
func (p *_KclvmServiceImpl) LoadPackage(ctx context.Context, args *gpyrpc.LoadPackage_Args) (*gpyrpc.LoadPackage_Result, error) {
53+
return p.c.LoadPackage(args)
54+
}
5255
func (p *_KclvmServiceImpl) FormatCode(ctx context.Context, args *gpyrpc.FormatCode_Args) (*gpyrpc.FormatCode_Result, error) {
5356
return p.c.FormatCode(args)
5457
}

‎pkg/service/kclvm_service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ type KclvmService interface {
77
ExecProgram(in *gpyrpc.ExecProgram_Args) (out *gpyrpc.ExecProgram_Result, err error)
88
ParseFile(in *gpyrpc.ParseFile_Args) (out *gpyrpc.ParseFile_Result, err error)
99
ParseProgram(in *gpyrpc.ParseProgram_Args) (out *gpyrpc.ParseProgram_Result, err error)
10+
LoadPackage(in *gpyrpc.LoadPackage_Args) (out *gpyrpc.LoadPackage_Result, err error)
1011
FormatCode(in *gpyrpc.FormatCode_Args) (out *gpyrpc.FormatCode_Result, err error)
1112
FormatPath(in *gpyrpc.FormatPath_Args) (out *gpyrpc.FormatPath_Result, err error)
1213
LintPath(in *gpyrpc.LintPath_Args) (out *gpyrpc.LintPath_Result, err error)

‎pkg/service/rest_server.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func (p *restServer) initHttpRrouter() {
6262
p.router.GET("/api:protorpc/KclvmService.ExecProgram", p.handle_ExecProgram)
6363
p.router.GET("/api:protorpc/KclvmService.ParseFile", p.handle_ParseFile)
6464
p.router.GET("/api:protorpc/KclvmService.ParseProgram", p.handle_ParseProgram)
65+
p.router.GET("/api:protorpc/KclvmService.LoadPackage", p.handle_LoadPackage)
6566
p.router.GET("/api:protorpc/KclvmService.FormatCode", p.handle_FormatCode)
6667
p.router.GET("/api:protorpc/KclvmService.FormatPath", p.handle_FormatPath)
6768
p.router.GET("/api:protorpc/KclvmService.LintPath", p.handle_LintPath)
@@ -75,6 +76,7 @@ func (p *restServer) initHttpRrouter() {
7576
p.router.POST("/api:protorpc/KclvmService.ExecProgram", p.handle_ExecProgram)
7677
p.router.POST("/api:protorpc/KclvmService.ParseFile", p.handle_ParseFile)
7778
p.router.POST("/api:protorpc/KclvmService.ParseProgram", p.handle_ParseProgram)
79+
p.router.POST("/api:protorpc/KclvmService.LoadPackage", p.handle_LoadPackage)
7880
p.router.POST("/api:protorpc/KclvmService.FormatCode", p.handle_FormatCode)
7981
p.router.POST("/api:protorpc/KclvmService.FormatPath", p.handle_FormatPath)
8082
p.router.POST("/api:protorpc/KclvmService.LintPath", p.handle_LintPath)
@@ -158,6 +160,13 @@ func (p *restServer) handle_ParseProgram(w http.ResponseWriter, r *http.Request,
158160
})
159161
}
160162

163+
func (p *restServer) handle_LoadPackage(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
164+
var args = new(gpyrpc.LoadPackage_Args)
165+
p.handle(w, r, args, func() (proto.Message, error) {
166+
return p.c.LoadPackage(args)
167+
})
168+
}
169+
161170
func (p *restServer) handle_FormatCode(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
162171
var args = new(gpyrpc.FormatCode_Args)
163172
p.handle(w, r, args, func() (proto.Message, error) {

0 commit comments

Comments
 (0)