Skip to content

Commit 30f302a

Browse files
PeefyPeefy
authored
Merge pull request #81 from Peefy/bump-kcl-go-090-latest
chore: bump kcl and kpm to latest version
2 parents 22ae06d + 21bb994 commit 30f302a

File tree

12 files changed

+187
-125
lines changed

12 files changed

+187
-125
lines changed

‎cmd/kcl/commands/mod.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ const (
2727
)
2828

2929
var (
30-
quiet bool
31-
vendor bool
32-
update bool
33-
git string
34-
tag string
35-
commit string
36-
target string
30+
quiet bool
31+
vendor bool
32+
update bool
33+
git string
34+
tag string
35+
commit string
36+
target string
37+
rename string
38+
noSumCheck bool
3739
)
3840

3941
// NewModCmd returns the mod command.

‎cmd/kcl/commands/mod_add.go

+4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ func NewModAddCmd(cli *client.KpmClient) *cobra.Command {
4747
cmd.Flags().StringVar(&git, "git", "", "git repository location")
4848
cmd.Flags().StringVar(&tag, "tag", "", "git repository tag")
4949
cmd.Flags().StringVar(&commit, "commit", "", "git repository commit")
50+
cmd.Flags().BoolVarP(&quiet, "quiet", "q", false, "quiet (no output)")
51+
cmd.Flags().BoolVar(&noSumCheck, "no_sum_check", false, "rename the dependency")
5052

5153
return cmd
5254
}
@@ -129,6 +131,8 @@ func parseAddOptions(cli *client.KpmClient, localPath string, args []string) (*o
129131
Commit: commit,
130132
},
131133
},
134+
NoSumCheck: noSumCheck,
135+
NewPkgName: rename,
132136
}, nil
133137
} else {
134138
localPkg, err := parseLocalPathOptions(args)

‎cmd/kcl/commands/mod_graph.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/dominikbraun/graph"
88
"github.com/spf13/cobra"
9+
"golang.org/x/mod/module"
910
"kcl-lang.io/kpm/pkg/client"
1011
"kcl-lang.io/kpm/pkg/env"
1112
pkg "kcl-lang.io/kpm/pkg/package"
@@ -82,11 +83,11 @@ func ModGraph(cli *client.KpmClient, args []string) error {
8283
}
8384

8485
// Print the dependency graph to stdout.
85-
root := fmt.Sprintf("%s@%s", kclPkg.GetPkgName(), kclPkg.GetPkgVersion())
86-
err = graph.BFS(depGraph, root, func(source string) bool {
86+
root := module.Version{Path: kclPkg.GetPkgName(), Version: kclPkg.GetPkgVersion()}
87+
err = graph.BFS(depGraph, root, func(source module.Version) bool {
8788
for target := range adjMap[source] {
8889
reporter.ReportMsgTo(
89-
fmt.Sprint(source, " ", target),
90+
fmt.Sprint(format(source), " ", format(target)),
9091
cli.GetLogWriter(),
9192
)
9293
}
@@ -97,3 +98,11 @@ func ModGraph(cli *client.KpmClient, args []string) error {
9798
}
9899
return nil
99100
}
101+
102+
func format(m module.Version) string {
103+
formattedMsg := m.Path
104+
if m.Version != "" {
105+
formattedMsg += "@" + m.Version
106+
}
107+
return formattedMsg
108+
}

‎go.mod

+48-34
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require (
77
github.com/onsi/ginkgo/v2 v2.17.3
88
github.com/onsi/gomega v1.33.1
99
github.com/spf13/cobra v1.8.0
10-
kcl-lang.io/kcl-go v0.9.0-alpha.1
10+
kcl-lang.io/kcl-go v0.9.0-alpha.1.0.20240520022521-00adadd8c6f2
1111
kcl-lang.io/kcl-openapi v0.6.1
1212
kcl-lang.io/kcl-playground v0.5.1
13-
kcl-lang.io/kpm v0.8.7-0.20240511160903-faa726d7169b
13+
kcl-lang.io/kpm v0.8.7-0.20240520061008-9fc4c5efc8c7
1414
)
1515

1616
require (
@@ -19,12 +19,18 @@ require (
1919
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2020
cloud.google.com/go/iam v1.1.6 // indirect
2121
cloud.google.com/go/storage v1.36.0 // indirect
22-
github.com/Microsoft/hcsshim v0.11.4 // indirect
22+
github.com/Microsoft/hcsshim v0.12.3 // indirect
2323
github.com/aws/aws-sdk-go v1.44.122 // indirect
2424
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2525
github.com/bytedance/sonic v1.9.1 // indirect
26+
github.com/chainguard-dev/git-urls v1.0.2 // indirect
2627
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
2728
github.com/containerd/log v0.1.0 // indirect
29+
github.com/containers/image/v5 v5.30.1 // indirect
30+
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
31+
github.com/containers/ocicrypt v1.1.9 // indirect
32+
github.com/containers/storage v1.54.0 // indirect
33+
github.com/distribution/reference v0.5.0 // indirect
2834
github.com/felixge/httpsnoop v1.0.4 // indirect
2935
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
3036
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -34,22 +40,32 @@ require (
3440
github.com/google/uuid v1.6.0 // indirect
3541
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
3642
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
43+
github.com/hashicorp/errwrap v1.1.0 // indirect
3744
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3845
github.com/hashicorp/go-getter v1.7.4 // indirect
46+
github.com/hashicorp/go-multierror v1.1.1 // indirect
3947
github.com/hashicorp/go-safetemp v1.0.0 // indirect
4048
github.com/jmespath/go-jmespath v0.4.0 // indirect
4149
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
50+
github.com/klauspost/pgzip v1.2.6 // indirect
51+
github.com/kubescape/go-git-url v0.0.30 // indirect
4252
github.com/mitchellh/go-homedir v1.1.0 // indirect
4353
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
54+
github.com/moby/sys/mountinfo v0.7.1 // indirect
55+
github.com/moby/sys/user v0.1.0 // indirect
56+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
4457
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
58+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
4559
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
46-
github.com/ulikunitz/xz v0.5.10 // indirect
60+
github.com/ulikunitz/xz v0.5.12 // indirect
61+
github.com/vbatts/tar-split v0.11.5 // indirect
4762
go.opencensus.io v0.24.0 // indirect
4863
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
4964
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
5065
go.opentelemetry.io/otel/metric v1.22.0 // indirect
5166
golang.org/x/arch v0.3.0 // indirect
52-
golang.org/x/oauth2 v0.17.0 // indirect
67+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
68+
golang.org/x/oauth2 v0.18.0 // indirect
5369
golang.org/x/time v0.5.0 // indirect
5470
google.golang.org/api v0.162.0 // indirect
5571
google.golang.org/appengine v1.6.8 // indirect
@@ -63,9 +79,9 @@ require (
6379
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
6480
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
6581
github.com/BurntSushi/toml v1.3.2 // indirect
66-
github.com/Microsoft/go-winio v0.6.1 // indirect
82+
github.com/Microsoft/go-winio v0.6.2 // indirect
6783
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
68-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
84+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6985
github.com/bahlo/generic-list-go v0.2.0 // indirect
7086
github.com/beorn7/perks v1.0.1 // indirect
7187
github.com/boltdb/bolt v1.3.1 // indirect
@@ -75,12 +91,12 @@ require (
7591
github.com/chai2010/protorpc v1.1.4 // indirect
7692
github.com/cloudflare/circl v1.3.7 // indirect
7793
github.com/containerd/containerd v1.7.11 // indirect
78-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
79-
github.com/docker/cli v23.0.3+incompatible // indirect
80-
github.com/docker/distribution v2.8.2+incompatible // indirect
81-
github.com/docker/docker v23.0.3+incompatible // indirect
82-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
83-
github.com/docker/go-connections v0.4.0 // indirect
94+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
95+
github.com/docker/cli v25.0.3+incompatible // indirect
96+
github.com/docker/distribution v2.8.3+incompatible // indirect
97+
github.com/docker/docker v25.0.3+incompatible // indirect
98+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
99+
github.com/docker/go-connections v0.5.0 // indirect
84100
github.com/docker/go-metrics v0.0.1 // indirect
85101
github.com/docker/go-units v0.5.0 // indirect
86102
github.com/dominikbraun/graph v0.23.0
@@ -94,20 +110,19 @@ require (
94110
github.com/go-git/go-git/v5 v5.11.0 // indirect
95111
github.com/go-logr/logr v1.4.1 // indirect
96112
github.com/go-logr/stdr v1.2.2 // indirect
97-
github.com/go-openapi/analysis v0.21.2 // indirect
98-
github.com/go-openapi/errors v0.20.2 // indirect
113+
github.com/go-openapi/analysis v0.21.4 // indirect
114+
github.com/go-openapi/errors v0.21.1 // indirect
99115
github.com/go-openapi/inflect v0.19.0 // indirect
100116
github.com/go-openapi/jsonpointer v0.20.2 // indirect
101117
github.com/go-openapi/jsonreference v0.20.2 // indirect
102-
github.com/go-openapi/loads v0.21.1 // indirect
103-
github.com/go-openapi/spec v0.20.6 // indirect
104-
github.com/go-openapi/strfmt v0.21.2 // indirect
105-
github.com/go-openapi/swag v0.22.8 // indirect
106-
github.com/go-openapi/validate v0.21.0 // indirect
118+
github.com/go-openapi/loads v0.21.2 // indirect
119+
github.com/go-openapi/spec v0.20.9 // indirect
120+
github.com/go-openapi/strfmt v0.22.2 // indirect
121+
github.com/go-openapi/swag v0.22.10 // indirect
122+
github.com/go-openapi/validate v0.22.1 // indirect
107123
github.com/go-playground/locales v0.14.1 // indirect
108124
github.com/go-playground/universal-translator v0.18.1 // indirect
109125
github.com/go-playground/validator/v10 v10.14.0 // indirect
110-
github.com/go-stack/stack v1.8.1 // indirect
111126
github.com/goccy/go-yaml v1.11.3 // indirect
112127
github.com/gofrs/flock v0.8.1 // indirect
113128
github.com/gogo/protobuf v1.3.2 // indirect
@@ -128,7 +143,7 @@ require (
128143
github.com/json-iterator/go v1.1.12 // indirect
129144
github.com/julienschmidt/httprouter v1.3.0 // indirect
130145
github.com/kevinburke/ssh_config v1.2.0 // indirect
131-
github.com/klauspost/compress v1.16.0 // indirect
146+
github.com/klauspost/compress v1.17.8 // indirect
132147
github.com/kr/pretty v0.3.1 // indirect
133148
github.com/kr/text v0.2.0 // indirect
134149
github.com/leodido/go-urn v1.2.4 // indirect
@@ -138,11 +153,10 @@ require (
138153
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
139154
github.com/mitchellh/mapstructure v1.5.0 // indirect
140155
github.com/moby/locker v1.0.1 // indirect
141-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
156+
github.com/moby/term v0.5.0 // indirect
142157
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
143158
github.com/modern-go/reflect2 v1.0.2 // indirect
144159
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
145-
github.com/morikuni/aec v1.0.0 // indirect
146160
github.com/oklog/ulid v1.3.1 // indirect
147161
github.com/opencontainers/go-digest v1.0.0 // indirect
148162
github.com/opencontainers/image-spec v1.1.0 // indirect
@@ -151,13 +165,13 @@ require (
151165
github.com/pjbgf/sha1cd v0.3.0 // indirect
152166
github.com/pkg/errors v0.9.1
153167
github.com/powerman/rpc-codec v1.2.2 // indirect
154-
github.com/prometheus/client_golang v1.14.0 // indirect
155-
github.com/prometheus/client_model v0.3.0 // indirect
156-
github.com/prometheus/common v0.37.0 // indirect
157-
github.com/prometheus/procfs v0.8.0 // indirect
168+
github.com/prometheus/client_golang v1.17.0 // indirect
169+
github.com/prometheus/client_model v0.5.0 // indirect
170+
github.com/prometheus/common v0.44.0 // indirect
171+
github.com/prometheus/procfs v0.11.1 // indirect
158172
github.com/qri-io/jsonpointer v0.1.1 // indirect
159173
github.com/rogpeppe/go-internal v1.12.0 // indirect
160-
github.com/sergi/go-diff v1.1.0 // indirect
174+
github.com/sergi/go-diff v1.3.1 // indirect
161175
github.com/sirupsen/logrus v1.9.3 // indirect
162176
github.com/skeema/knownhosts v1.2.1 // indirect
163177
github.com/spf13/pflag v1.0.5
@@ -166,14 +180,14 @@ require (
166180
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
167181
github.com/xanzy/ssh-agent v0.3.3 // indirect
168182
github.com/yuin/goldmark v1.7.1 // indirect
169-
go.mongodb.org/mongo-driver v1.9.1 // indirect
183+
go.mongodb.org/mongo-driver v1.14.0 // indirect
170184
go.opentelemetry.io/otel v1.22.0 // indirect
171185
go.opentelemetry.io/otel/trace v1.22.0 // indirect
172186
golang.org/x/crypto v0.22.0 // indirect
173187
golang.org/x/mod v0.17.0 // indirect
174188
golang.org/x/net v0.24.0 // indirect
175189
golang.org/x/sync v0.7.0 // indirect
176-
golang.org/x/sys v0.19.0 // indirect
190+
golang.org/x/sys v0.20.0 // indirect
177191
golang.org/x/text v0.14.0 // indirect
178192
golang.org/x/tools v0.20.0 // indirect
179193
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
@@ -191,9 +205,9 @@ require (
191205
k8s.io/klog/v2 v2.100.1 // indirect
192206
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
193207
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
194-
kcl-lang.io/lib v0.9.0-alpha.1.0.20240513115021-7408627a80ec // indirect
195-
oras.land/oras-go v1.2.3 // indirect
196-
oras.land/oras-go/v2 v2.3.0 // indirect
208+
kcl-lang.io/lib v0.9.0-alpha.1.0.20240520020338-198f8ebdb26a // indirect
209+
oras.land/oras-go v1.2.5 // indirect
210+
oras.land/oras-go/v2 v2.5.0 // indirect
197211
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
198212
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
199213
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)