Skip to content

Commit 2dcc098

Browse files
authored
fix: bump kpm version to 0.11.0-alpha.2 (#183)
* fix: bump kpm version to 0.11.0-alpha.2 Signed-off-by: zongz <zongzhe1024@163.com> * fix: move push on API `Push` Signed-off-by: zongz <zongzhe1024@163.com> --------- Signed-off-by: zongz <zongzhe1024@163.com>
1 parent 25be385 commit 2dcc098

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

cmd/kcl/commands/mod_push.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/spf13/cobra"
99
"kcl-lang.io/kpm/pkg/client"
10+
"kcl-lang.io/kpm/pkg/downloader"
1011
"kcl-lang.io/kpm/pkg/errors"
1112
kpmoci "kcl-lang.io/kpm/pkg/oci"
12-
"kcl-lang.io/kpm/pkg/opt"
1313
pkg "kcl-lang.io/kpm/pkg/package"
1414
"kcl-lang.io/kpm/pkg/reporter"
1515
"kcl-lang.io/kpm/pkg/utils"
@@ -164,24 +164,21 @@ func pushPackage(ociUrl string, kclPkg *pkg.KclPkg, vendorMode bool, cli *client
164164
)
165165
}
166166
}
167-
168-
// 3. Generate the OCI options from oci url and the version of current kcl package.
169-
ociOpts, err := opt.ParseOciOptionFromOciUrl(ociUrl, kclPkg.GetPkgTag())
170-
if err != (*reporter.KpmEvent)(nil) {
171-
return reporter.NewErrorEvent(
172-
reporter.UnsupportOciUrlScheme,
173-
errors.InvalidOciUrl,
174-
"only support url scheme 'oci://'.",
175-
)
176-
}
177-
ociOpts.Annotations, err = kclPkg.GenOciManifestFromPkg()
167+
// 4. Push it.
168+
ociSource := downloader.Source{}
169+
err = ociSource.FromString(ociUrl)
178170
if err != nil {
179171
return err
180172
}
181-
182-
reporter.ReportMsgTo(fmt.Sprintf("package '%s' will be pushed", kclPkg.GetPkgName()), cli.GetLogWriter())
183-
// 4. Push it.
184-
err = cli.PushToOci(tarPath, ociOpts)
173+
ociSource.ModSpec = &downloader.ModSpec{
174+
Name: kclPkg.GetPkgName(),
175+
Version: kclPkg.GetPkgTag(),
176+
}
177+
err = cli.Push(
178+
client.WithPushModPath(kclPkg.HomePath),
179+
client.WithPushSource(ociSource),
180+
client.WithPushVendorMode(vendorMode),
181+
)
185182
if err != (*reporter.KpmEvent)(nil) {
186183
return err
187184
}

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
kcl-lang.io/kcl-go v0.10.8
1414
kcl-lang.io/kcl-openapi v0.10.0
1515
kcl-lang.io/kcl-plugin v0.6.0
16-
kcl-lang.io/kpm v0.11.0-alpha.1
16+
kcl-lang.io/kpm v0.11.0-alpha.2
1717
)
1818

1919
require (
@@ -36,7 +36,7 @@ require (
3636
github.com/dchest/siphash v1.2.3 // indirect
3737
github.com/distribution/reference v0.6.0 // indirect
3838
github.com/ebitengine/purego v0.7.1 // indirect
39-
github.com/elliotchance/orderedmap/v2 v2.4.0 // indirect
39+
github.com/elliotchance/orderedmap/v2 v2.5.0 // indirect
4040
github.com/emicklei/proto v1.13.2 // indirect
4141
github.com/felixge/httpsnoop v1.0.4 // indirect
4242
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2
378378
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
379379
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
380380
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
381-
github.com/elliotchance/orderedmap/v2 v2.4.0 h1:6tUmMwD9F998FNpwFxA5E6NQvSpk2PVw7RKsVq3+2Cw=
382-
github.com/elliotchance/orderedmap/v2 v2.4.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q=
381+
github.com/elliotchance/orderedmap/v2 v2.5.0 h1:WRPmWGChucaZ09eEd3UkU8XfVajv6ZZ6eg3+x0cLWPM=
382+
github.com/elliotchance/orderedmap/v2 v2.5.0/go.mod h1:85lZyVbpGaGvHvnKa7Qhx7zncAdBIBq6u56Hb1PRU5Q=
383383
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
384384
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
385385
github.com/emicklei/proto v1.13.2 h1:z/etSFO3uyXeuEsVPzfl56WNgzcvIr42aQazXaQmFZY=
@@ -1697,8 +1697,8 @@ kcl-lang.io/kcl-openapi v0.10.0 h1:yetZMSnn/HHaMcfiLt1P2zhCF06O33jxkjtHrm08VR8=
16971697
kcl-lang.io/kcl-openapi v0.10.0/go.mod h1:kGCf0AZygrZyB+xpmMtiC3FYoiV/1rCLXuAq2QtuLf8=
16981698
kcl-lang.io/kcl-plugin v0.6.0 h1:rBdoqKDPdOtojeOHCFnXoB/I7ltFjV61r0KkfOcL5sE=
16991699
kcl-lang.io/kcl-plugin v0.6.0/go.mod h1:LoIouleHYRKAvFcdW30yUlhsMYH2W9zD5Ji1XHfbht4=
1700-
kcl-lang.io/kpm v0.11.0-alpha.1 h1:WZDfCQDinyWionkLDYe56IEeCJpcCYTAwZJtIrtCyFg=
1701-
kcl-lang.io/kpm v0.11.0-alpha.1/go.mod h1:/G40SABMTuPEVaD1lp0nvPx4v1TIvxIuDwNCV6N9YSU=
1700+
kcl-lang.io/kpm v0.11.0-alpha.2 h1:EwWt9oedkB20E7ypnR8OOxxL1oNzdOrNhnDU7vsJ9no=
1701+
kcl-lang.io/kpm v0.11.0-alpha.2/go.mod h1:Z7df8c7NwWm8KNFGd6vmO0F6LArxtuN5a2eGVY95/1g=
17021702
kcl-lang.io/lib v0.10.8 h1:/Mhko6fngIstvdx9dAS3H6N1utogkWfoARVj643l5nU=
17031703
kcl-lang.io/lib v0.10.8/go.mod h1:0Dw/MQwRMjLDksxl4JerGBn/ueaxRyCCKBCCwQwJ1MI=
17041704
oras.land/oras-go v1.2.6 h1:z8cmxQXBU8yZ4mkytWqXfo6tZcamPwjsuxYU81xJ8Lk=

scripts/e2e/pull_pkg.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ cd ./scripts/e2e/pkg_in_reg/
1313

1414

1515
# Check if file exists
16+
17+
if [ ! -d "./oci/ghcr.io/kcl-lang/k8s/1.27/k8s/1.27" ]; then
18+
$current_dir/bin/kcl mod pull k8s:1.27
19+
fi
20+
1621
if [ ! -d "./oci/ghcr.io/kcl-lang/k8s/1.28/k8s/1.28" ]; then
1722
$current_dir/bin/kcl mod pull k8s:1.28
1823
fi

scripts/e2e/push_pkg.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ echo $current_dir
1111

1212
$current_dir/bin/kcl registry login -u test -p 1234 localhost:5001
1313

14+
cd ./scripts/e2e/pkg_in_reg/oci/ghcr.io/kcl-lang/k8s/1.27/k8s/1.27
15+
$current_dir/bin/kcl mod push
16+
17+
cd "$current_dir"
18+
1419
cd ./scripts/e2e/pkg_in_reg/oci/ghcr.io/kcl-lang/k8s/1.28/k8s/1.28
1520
$current_dir/bin/kcl mod push
1621

0 commit comments

Comments
 (0)