Skip to content

Commit

Permalink
chore: update latest kpm and kcl-go version and bump version to v0.10…
Browse files Browse the repository at this point in the history 
….0-alpha.1

Signed-off-by: peefy <xpf6677@163.com>
  • Loading branch information
@Peefy
Peefy committed Jul 30, 2024
1 parent e6b7bf7 commit d78297a
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 40 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.4
0.10.0-alpha.1
15 changes: 12 additions & 3 deletions cmd/kcl/commands/doc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/spf13/cobra"
"kcl-lang.io/kcl-go/pkg/tools/gen"
"kcl-lang.io/kpm/pkg/api"
)

const (
Expand Down Expand Up @@ -64,12 +65,20 @@ func NewDocGenerateCmd() *cobra.Command {
return err
}

err = genContext.GenDoc()
pkg, err := api.GetKclPackage(genContext.PackagePath)
if err != nil {
fmt.Println(fmt.Errorf("generate failed: %s", err))
return err
}
spec, err := pkg.ExportSwaggerV2Spec()
if err != nil {
return err
}
err = genContext.RenderSwaggerV2(spec)
if err != nil {
fmt.Println(fmt.Errorf("doc generate failed: %s", err))
return err
} else {
fmt.Printf("Generate Complete! Check generated docs in %s\n", genContext.Target)
fmt.Printf("doc generate complete and check generated docs in %s\n", genContext.Target)
return nil
}
},
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ require (
github.com/onsi/ginkgo/v2 v2.19.1
github.com/onsi/gomega v1.34.0
github.com/spf13/cobra v1.8.1
kcl-lang.io/kcl-go v0.9.3
kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2
kcl-lang.io/kcl-openapi v0.6.3
kcl-lang.io/kcl-playground v0.5.1
kcl-lang.io/kpm v0.9.3
kcl-lang.io/kpm v0.9.4-0.20240730115858-1fb33d5051a8
)

require (
Expand Down Expand Up @@ -72,7 +72,7 @@ require (
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
kcl-lang.io/lib v0.9.3 // indirect
kcl-lang.io/lib v0.10.0-alpha.1 // indirect
)

require (
Expand Down Expand Up @@ -125,7 +125,7 @@ require (
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/goccy/go-yaml v1.12.0
github.com/gofrs/flock v0.12.0 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,8 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG
github.com/goccy/go-yaml v1.12.0 h1:/1WHjnMsI1dlIBQutrvSMGZRQufVO3asrHfTwfACoPM=
github.com/goccy/go-yaml v1.12.0/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/flock v0.12.0 h1:xHW8t8GPAiGtqz7KxiSqfOEXwpOaqhpYZrTE2MQBgXY=
github.com/gofrs/flock v0.12.0/go.mod h1:FirDy1Ing0mI2+kB6wk+vyyAH+e6xiE+EYA0jnzV9jc=
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
Expand Down Expand Up @@ -1684,16 +1684,16 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
kcl-lang.io/kcl-go v0.9.3 h1:zqWgE6SSdoD7VHhapOAmmDCrtqyeBvdOcCeqUfT6eu8=
kcl-lang.io/kcl-go v0.9.3/go.mod h1:X30Qh5/jryvnGanaXGRjsuy/dnj211vPHXpfy7AEspw=
kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2 h1:GbX+J5OE+sPbFz2HPMD0oDHnvdJB055Il7brmY+5Wsg=
kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2/go.mod h1:q1NZjPbx9XnR7gd1SEtPng82meJNx8sW/wRcRW8DGJs=
kcl-lang.io/kcl-openapi v0.6.3 h1:6Br0IBaNshRvBfmaH22Zv1miVEt6FWlmh2v/wBLb194=
kcl-lang.io/kcl-openapi v0.6.3/go.mod h1:Ai9mFztCVKkRSFabczO/r5hCNdqaNtAc2ZIRxTeV0Mk=
kcl-lang.io/kcl-playground v0.5.1 h1:MKQQUHgt4+2QyU2NVwa73oksOaBJGDi4keGoggA0MiU=
kcl-lang.io/kcl-playground v0.5.1/go.mod h1:IFmnlw7m011ccX8OidMUfnnN2u/TWdtQGxyABRTbmow=
kcl-lang.io/kpm v0.9.3 h1:lwFSrJTRyAzjygT5Oo/98DxCCiDZmujo46PcmRx54Ck=
kcl-lang.io/kpm v0.9.3/go.mod h1:4HTbPhB4DVtkamnIv5lrRcHtCVwzp4Pf/b+d3TN4nzs=
kcl-lang.io/lib v0.9.3 h1:Mlr+H0oaxujUQi6QD6eP+Fbi1waVsRWXddIzQhddK+Y=
kcl-lang.io/lib v0.9.3/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs=
kcl-lang.io/kpm v0.9.4-0.20240730115858-1fb33d5051a8 h1:KZM3Pu8TEg6qnWbnCiFWoIrinZturAlMVmqx8DL+6Ks=
kcl-lang.io/kpm v0.9.4-0.20240730115858-1fb33d5051a8/go.mod h1:XjCq2Rcv99hL0pIqS4ut7DWHA+UyxATywcvmxxRVY+8=
kcl-lang.io/lib v0.10.0-alpha.1 h1:GMVB75Pc1W29gcl1WlVgdgUscH6h+d9No0fzBH0rNYg=
kcl-lang.io/lib v0.10.0-alpha.1/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs=
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
Expand Down
49 changes: 25 additions & 24 deletions pkg/version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,29 @@ func getVersion(version string) string {
}

const (
VersionTypeLatest = Version_0_9_4

Version_0_9_4 VersionType = "0.9.4"
Version_0_9_3 VersionType = "0.9.3"
Version_0_9_2 VersionType = "0.9.2"
Version_0_9_1 VersionType = "0.9.1"
Version_0_9_0 VersionType = "0.9.0"
Version_0_8_9 VersionType = "0.8.9"
Version_0_8_8 VersionType = "0.8.8"
Version_0_8_7 VersionType = "0.8.7"
Version_0_8_6 VersionType = "0.8.6"
Version_0_8_5 VersionType = "0.8.5"
Version_0_8_4 VersionType = "0.8.4"
Version_0_8_3 VersionType = "0.8.3"
Version_0_8_2 VersionType = "0.8.2"
Version_0_8_1 VersionType = "0.8.1"
Version_0_8_0 VersionType = "0.8.0"
Version_0_7_5 VersionType = "0.7.5"
Version_0_7_4 VersionType = "0.7.4"
Version_0_7_3 VersionType = "0.7.3"
Version_0_7_2 VersionType = "0.7.2"
Version_0_7_1 VersionType = "0.7.1"
Version_0_7_0 VersionType = "0.7.0"
Version_0_6_0 VersionType = "0.6.0"
VersionTypeLatest = Version_0_10_0_alpha1

Version_0_10_0_alpha1 VersionType = "0.10.0-alpha.1"
Version_0_9_4 VersionType = "0.9.4"
Version_0_9_3 VersionType = "0.9.3"
Version_0_9_2 VersionType = "0.9.2"
Version_0_9_1 VersionType = "0.9.1"
Version_0_9_0 VersionType = "0.9.0"
Version_0_8_9 VersionType = "0.8.9"
Version_0_8_8 VersionType = "0.8.8"
Version_0_8_7 VersionType = "0.8.7"
Version_0_8_6 VersionType = "0.8.6"
Version_0_8_5 VersionType = "0.8.5"
Version_0_8_4 VersionType = "0.8.4"
Version_0_8_3 VersionType = "0.8.3"
Version_0_8_2 VersionType = "0.8.2"
Version_0_8_1 VersionType = "0.8.1"
Version_0_8_0 VersionType = "0.8.0"
Version_0_7_5 VersionType = "0.7.5"
Version_0_7_4 VersionType = "0.7.4"
Version_0_7_3 VersionType = "0.7.3"
Version_0_7_2 VersionType = "0.7.2"
Version_0_7_1 VersionType = "0.7.1"
Version_0_7_0 VersionType = "0.7.0"
Version_0_6_0 VersionType = "0.6.0"
)

0 comments on commit d78297a

Please sign in to comment.