github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: return explicit errors for flags unsupported by transfer service

Browse Source 
ctr currently silently ignores several flags by default (without --local) and
the user can't know which flags are supported until they see the code.
This commit fixes ctr to return an explicit error when it finds an unsupported
flag.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
This commit is contained in:
Kohei Tokunaga 2024-06-10 21:35:11 +09:00
parent 378a502fb2
commit df7f6ba5b9
No known key found for this signature in database
GPG Key ID: 6CE0A04690DB3FB3
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/ctr/commands/images/import.go
View File

@ -115,6 +115,12 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
defer cancel() defer cancel()
if !context.Bool("local") { if !context.Bool("local") {
unsupportedFlags := []string{"discard-unpacked-layers"}
for _, s := range unsupportedFlags {
if context.IsSet(s) {
return fmt.Errorf("\"--%s\" requires \"--local\" flag", s)
}
}
var opts []image.StoreOpt var opts []image.StoreOpt
prefix := context.String("base-name") prefix := context.String("base-name")
var overwrite bool var overwrite bool

9
cmd/ctr/commands/images/pull.go
View File

@ -100,6 +100,15 @@ command. As part of this process, we do the following:
defer cancel() defer cancel()
if !context.Bool("local") { if !context.Bool("local") {
unsupportedFlags := []string{"max-concurrent-downloads", "print-chainid",
"skip-verify", "tlscacert", "tlscert", "tlskey", "http-dump", "http-trace", // RegistryFlags
}
for _, s := range unsupportedFlags {
if context.IsSet(s) {
return fmt.Errorf("\"--%s\" requires \"--local\" flag", s)
}
}
ch, err := commands.NewStaticCredentials(ctx, context, ref) ch, err := commands.NewStaticCredentials(ctx, context, ref)
if err != nil { if err != nil {
return err return err

10
cmd/ctr/commands/images/push.go
View File

@ -96,6 +96,16 @@ var pushCommand = &cli.Command{
defer cancel() defer cancel()
if !context.Bool("local") { if !context.Bool("local") {
unsupportedFlags := []string{
"manifest", "manifest-type", "max-concurrent-uploaded-layers", "allow-non-distributable-blobs",
"skip-verify", "tlscacert", "tlscert", "tlskey", "http-dump", "http-trace", // RegistryFlags
}
for _, s := range unsupportedFlags {
if context.IsSet(s) {
return fmt.Errorf("\"--%s\" requires \"--local\" flag", s)
}
}
ch, err := commands.NewStaticCredentials(ctx, context, ref) ch, err := commands.NewStaticCredentials(ctx, context, ref)
if err != nil { if err != nil {
return err return err