Skip to content

Commit 76aa4e5

Browse files
committed
Use common identifiers package with less restrictive regex
Regular expressions in the namespaces package are redundant with the pre-existing validator in the "identifiers" package; replace this custom usage with the validator in "identifiers" Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
1 parent 4d77395 commit 76aa4e5

File tree

5 files changed

+5
-157
lines changed

5 files changed

+5
-157
lines changed

events/exchange/exchange.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func validateTopic(topic string) error {
225225
}
226226

227227
func validateEnvelope(envelope *events.Envelope) error {
228-
if err := namespaces.Validate(envelope.Namespace); err != nil {
228+
if err := identifiers.Validate(envelope.Namespace); err != nil {
229229
return errors.Wrapf(err, "event envelope has invalid namespace")
230230
}
231231

metadata/namespaces.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121

2222
"github.com/containerd/containerd/errdefs"
23+
"github.com/containerd/containerd/identifiers"
2324
l "github.com/containerd/containerd/labels"
2425
"github.com/containerd/containerd/namespaces"
2526
"github.com/pkg/errors"
@@ -41,7 +42,7 @@ func (s *namespaceStore) Create(ctx context.Context, namespace string, labels ma
4142
return err
4243
}
4344

44-
if err := namespaces.Validate(namespace); err != nil {
45+
if err := identifiers.Validate(namespace); err != nil {
4546
return err
4647
}
4748

namespaces/context.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"os"
2222

2323
"github.com/containerd/containerd/errdefs"
24+
"github.com/containerd/containerd/identifiers"
2425
"github.com/pkg/errors"
2526
)
2627

@@ -70,7 +71,7 @@ func NamespaceRequired(ctx context.Context) (string, error) {
7071
if !ok || namespace == "" {
7172
return "", errors.Wrapf(errdefs.ErrFailedPrecondition, "namespace is required")
7273
}
73-
if err := Validate(namespace); err != nil {
74+
if err := identifiers.Validate(namespace); err != nil {
7475
return "", errors.Wrap(err, "namespace validation")
7576
}
7677
return namespace, nil

namespaces/validate.go

Lines changed: 0 additions & 83 deletions
This file was deleted.

namespaces/validate_test.go

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)