Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: return error when header flags used on oci layout #841

Merged
merged 15 commits into from
Mar 2, 2023
4 changes: 4 additions & 0 deletions cmd/oras/internal/option/target.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package option

import (
"context"
"errors"
"fmt"
"os"
"strings"
Expand Down Expand Up @@ -86,6 +87,9 @@ func (opts *Target) Parse() error {
switch {
case opts.isOCILayout:
opts.Type = TargetTypeOCILayout
if len(opts.headerFlags) != 0 {
return errors.New("customer header([--{from|to}]-header/H) cannot be used on OCI image layout target")
qweeah marked this conversation as resolved.
Show resolved Hide resolved
}
return nil
default:
opts.Type = TargetTypeRemote
Expand Down
31 changes: 31 additions & 0 deletions test/e2e/suite/command/customer_header.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
Copyright The ORAS Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package command

import (
. "github.com/onsi/ginkgo/v2"
. "oras.land/oras/test/e2e/internal/utils"
)

var _ = Describe("OCI image layout users:", func() {
When("custom header is provided", func() {
It("should fail attach", func() {
ORAS("attach", ".:test", "-a", "test=true", "--artifact-type", "doc/example", "--oci-layout", "-H=foo:bar").
WithWorkDir(GinkgoT().TempDir()).
ExpectFailure().
MatchErrKeyWords("customer header").
Exec()
})
})
})