Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
8f7262e8
Commit
8f7262e8
authored
Nov 01, 2017
by
Antoine Pelisse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update kube-openapi to use validation
parent
fcf9b1f7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
144 additions
and
101 deletions
+144
-101
Godeps.json
Godeps/Godeps.json
+11
-7
LICENSES
Godeps/LICENSES
+0
-0
BUILD
pkg/kubectl/cmd/util/openapi/validation/BUILD
+6
-9
validation.go
pkg/kubectl/cmd/util/openapi/validation/validation.go
+7
-7
validation_suite_test.go
...ectl/cmd/util/openapi/validation/validation_suite_test.go
+1
-1
validation_test.go
pkg/kubectl/cmd/util/openapi/validation/validation_test.go
+4
-4
Godeps.json
staging/src/k8s.io/api/Godeps/Godeps.json
+1
-1
Godeps.json
...ing/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
+4
-4
Godeps.json
staging/src/k8s.io/apimachinery/Godeps/Godeps.json
+1
-1
Godeps.json
staging/src/k8s.io/apiserver/Godeps/Godeps.json
+4
-4
Godeps.json
staging/src/k8s.io/client-go/Godeps/Godeps.json
+1
-1
Godeps.json
staging/src/k8s.io/code-generator/Godeps/Godeps.json
+2
-2
Godeps.json
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
+5
-5
Godeps.json
staging/src/k8s.io/metrics/Godeps/Godeps.json
+1
-1
Godeps.json
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
+4
-4
Godeps.json
staging/src/k8s.io/sample-controller/Godeps/Godeps.json
+1
-1
BUILD
vendor/BUILD
+0
-2
BUILD
...hub.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini/BUILD
+0
-28
BUILD
vendor/k8s.io/kube-openapi/pkg/util/BUILD
+4
-1
BUILD
vendor/k8s.io/kube-openapi/pkg/util/proto/BUILD
+4
-1
BUILD
vendor/k8s.io/kube-openapi/pkg/util/proto/validation/BUILD
+5
-8
errors.go
...r/k8s.io/kube-openapi/pkg/util/proto/validation/errors.go
+3
-3
types.go
...or/k8s.io/kube-openapi/pkg/util/proto/validation/types.go
+6
-6
validation.go
...s.io/kube-openapi/pkg/util/proto/validation/validation.go
+30
-0
util.go
vendor/k8s.io/kube-openapi/pkg/util/util.go
+39
-0
No files found.
Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -3052,31 +3052,35 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/aggregator"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/builder"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/generators"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/handler"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util/proto"
,
"Rev"
:
"61b46af70dfed79c6d24530cd23b41440a7f22a5"
"Rev"
:
"39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util/proto/validation"
,
"Rev"
:
"39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
},
{
"ImportPath"
:
"k8s.io/utils/exec"
,
...
...
Godeps/LICENSES
View file @
8f7262e8
This diff is collapsed.
Click to expand it.
pkg/kubectl/cmd/util/openapi/validation/BUILD
View file @
8f7262e8
...
...
@@ -8,11 +8,7 @@ load(
go_library(
name = "go_default_library",
srcs = [
"errors.go",
"types.go",
"validation.go",
],
srcs = ["validation.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/validation",
deps = [
"//pkg/kubectl/cmd/util/openapi:go_default_library",
...
...
@@ -20,20 +16,20 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util/proto
/validation
:go_default_library",
],
)
go_test(
name = "go_default_
x
test",
name = "go_default_test",
srcs = [
"validation_suite_test.go",
"validation_test.go",
],
data = ["//api/openapi-spec:swagger-spec"],
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/validation_test",
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/validation",
library = ":go_default_library",
deps = [
":go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/kubectl/cmd/util/openapi:go_default_library",
"//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
...
...
@@ -42,6 +38,7 @@ go_test(
"//vendor/github.com/onsi/ginkgo/types:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/util/proto/validation:go_default_library",
],
)
...
...
pkg/kubectl/cmd/util/openapi/validation/validation.go
View file @
8f7262e8
...
...
@@ -24,20 +24,25 @@ import (
utilerrors
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kube-openapi/pkg/util/proto
/validation
"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
)
// SchemaValidation validates the object against an OpenAPI schema.
type
SchemaValidation
struct
{
resources
openapi
.
Resources
}
// NewSchemaValidation creates a new SchemaValidation that can be used
// to validate objects.
func
NewSchemaValidation
(
resources
openapi
.
Resources
)
*
SchemaValidation
{
return
&
SchemaValidation
{
resources
:
resources
,
}
}
// ValidateBytes will validates the object against using the Resources
// object.
func
(
v
*
SchemaValidation
)
ValidateBytes
(
data
[]
byte
)
error
{
obj
,
err
:=
parse
(
data
)
if
err
!=
nil
{
...
...
@@ -80,12 +85,7 @@ func (v *SchemaValidation) validateResource(obj interface{}, gvk schema.GroupVer
return
nil
}
rootValidation
,
err
:=
itemFactory
(
proto
.
NewPath
(
gvk
.
Kind
),
obj
)
if
err
!=
nil
{
return
[]
error
{
err
}
}
resource
.
Accept
(
rootValidation
)
return
rootValidation
.
Errors
()
return
validation
.
ValidateModel
(
obj
,
resource
,
gvk
.
Kind
)
}
func
parse
(
data
[]
byte
)
(
interface
{},
error
)
{
...
...
pkg/kubectl/cmd/util/openapi/validation/validation_suite_test.go
View file @
8f7262e8
...
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package
validation
_test
package
validation
import
(
.
"github.com/onsi/ginkgo"
...
...
pkg/kubectl/cmd/util/openapi/validation/validation_test.go
View file @
8f7262e8
...
...
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package
validation
_test
package
validation
import
(
"path/filepath"
...
...
@@ -23,23 +23,23 @@ import (
.
"github.com/onsi/gomega"
utilerrors
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kube-openapi/pkg/util/proto/validation"
// This dependency is needed to register API types.
_
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
tst
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/validation"
)
var
fakeSchema
=
tst
.
Fake
{
Path
:
filepath
.
Join
(
".."
,
".."
,
".."
,
".."
,
".."
,
".."
,
"api"
,
"openapi-spec"
,
"swagger.json"
)}
var
_
=
Describe
(
"resource validation using OpenAPI Schema"
,
func
()
{
var
validator
*
validation
.
SchemaValidation
var
validator
*
SchemaValidation
BeforeEach
(
func
()
{
s
,
err
:=
fakeSchema
.
OpenAPISchema
()
Expect
(
err
)
.
To
(
BeNil
())
resources
,
err
:=
openapi
.
NewOpenAPIData
(
s
)
Expect
(
err
)
.
To
(
BeNil
())
validator
=
validation
.
NewSchemaValidation
(
resources
)
validator
=
NewSchemaValidation
(
resources
)
Expect
(
validator
)
.
ToNot
(
BeNil
())
})
...
...
staging/src/k8s.io/api/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -216,7 +216,7 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/apimachinery/pkg/api/resource"
,
...
...
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -1556,19 +1556,19 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/builder"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/handler"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/apimachinery/pkg/api/equality"
,
...
...
staging/src/k8s.io/apimachinery/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -216,7 +216,7 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/apiserver/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -1612,19 +1612,19 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/builder"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/handler"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/client-go/discovery"
,
...
...
staging/src/k8s.io/client-go/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -692,7 +692,7 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/code-generator/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -252,11 +252,11 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/generators"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -1544,23 +1544,23 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/aggregator"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/builder"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/handler"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/metrics/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -520,7 +520,7 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -1532,19 +1532,19 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/builder"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/handler"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/util"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
staging/src/k8s.io/sample-controller/Godeps/Godeps.json
View file @
8f7262e8
...
...
@@ -940,7 +940,7 @@
},
{
"ImportPath"
:
"k8s.io/kube-openapi/pkg/common"
,
"Rev"
:
"
61b46af70dfed79c6d24530cd23b41440a7f22a5
"
"Rev"
:
"
39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
"
}
]
}
vendor/BUILD
View file @
8f7262e8
...
...
@@ -41,8 +41,6 @@ filegroup(
"//vendor/github.com/aws/aws-sdk-go/service/elb:all-srcs",
"//vendor/github.com/aws/aws-sdk-go/service/kms:all-srcs",
"//vendor/github.com/aws/aws-sdk-go/service/sts:all-srcs",
"//vendor/github.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini:all-srcs",
"//vendor/github.com/aws/aws-sdk-go/vendor/github.com/jmespath/go-jmespath:all-srcs",
"//vendor/github.com/beorn7/perks/quantile:all-srcs",
"//vendor/github.com/blang/semver:all-srcs",
"//vendor/github.com/boltdb/bolt:all-srcs",
...
...
vendor/github.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini/BUILD
deleted
100644 → 0
View file @
fcf9b1f7
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["waiter.go"],
importpath = "github.com/aws/aws-sdk-go/private/waiter",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awsutil:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/request:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
vendor/k8s.io/kube-openapi/pkg/util/BUILD
View file @
8f7262e8
...
...
@@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["trie.go"],
srcs = [
"trie.go",
"util.go",
],
importpath = "k8s.io/kube-openapi/pkg/util",
visibility = ["//visibility:public"],
)
...
...
vendor/k8s.io/kube-openapi/pkg/util/proto/BUILD
View file @
8f7262e8
...
...
@@ -24,7 +24,10 @@ filegroup(
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
srcs = [
":package-srcs",
"//vendor/k8s.io/kube-openapi/pkg/util/proto/validation:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
vendor/
github.com/aws/aws-sdk-go/vendor/github.com/jmespath/go-jmespath
/BUILD
→
vendor/
k8s.io/kube-openapi/pkg/util/proto/validation
/BUILD
View file @
8f7262e8
...
...
@@ -3,16 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"api.go",
"astnodetype_string.go",
"functions.go",
"interpreter.go",
"lexer.go",
"parser.go",
"toktype_string.go",
"util.go",
"errors.go",
"types.go",
"validation.go",
],
importpath = "k8s.io/kube-openapi/pkg/util/proto/validation",
visibility = ["//visibility:public"],
deps = ["//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library"],
)
filegroup(
...
...
pkg/kubectl/cmd/util/openapi
/validation/errors.go
→
vendor/k8s.io/kube-openapi/pkg/util/proto
/validation/errors.go
View file @
8f7262e8
...
...
@@ -20,15 +20,15 @@ import (
"fmt"
)
type
E
rrors
struct
{
type
e
rrors
struct
{
errors
[]
error
}
func
(
e
*
E
rrors
)
Errors
()
[]
error
{
func
(
e
*
e
rrors
)
Errors
()
[]
error
{
return
e
.
errors
}
func
(
e
*
E
rrors
)
AppendErrors
(
err
...
error
)
{
func
(
e
*
e
rrors
)
AppendErrors
(
err
...
error
)
{
e
.
errors
=
append
(
e
.
errors
,
err
...
)
}
...
...
pkg/kubectl/cmd/util/openapi
/validation/types.go
→
vendor/k8s.io/kube-openapi/pkg/util/proto
/validation/types.go
View file @
8f7262e8
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kube-openapi/pkg/util/proto"
)
type
V
alidationItem
interface
{
type
v
alidationItem
interface
{
proto
.
SchemaVisitor
Errors
()
[]
error
...
...
@@ -31,7 +31,7 @@ type ValidationItem interface {
}
type
baseItem
struct
{
errors
E
rrors
errors
e
rrors
path
proto
.
Path
}
...
...
@@ -78,7 +78,7 @@ func (item *mapItem) sortedKeys() []string {
return
sortedKeys
}
var
_
V
alidationItem
=
&
mapItem
{}
var
_
v
alidationItem
=
&
mapItem
{}
func
(
item
*
mapItem
)
VisitPrimitive
(
schema
*
proto
.
Primitive
)
{
item
.
AddValidationError
(
InvalidTypeError
{
Path
:
schema
.
GetPath
()
.
String
(),
Expected
:
schema
.
Type
,
Actual
:
"map"
})
...
...
@@ -139,7 +139,7 @@ type arrayItem struct {
Array
[]
interface
{}
}
var
_
V
alidationItem
=
&
arrayItem
{}
var
_
v
alidationItem
=
&
arrayItem
{}
func
(
item
*
arrayItem
)
VisitPrimitive
(
schema
*
proto
.
Primitive
)
{
item
.
AddValidationError
(
InvalidTypeError
{
Path
:
schema
.
GetPath
()
.
String
(),
Expected
:
schema
.
Type
,
Actual
:
"array"
})
...
...
@@ -183,7 +183,7 @@ type primitiveItem struct {
Kind
string
}
var
_
V
alidationItem
=
&
primitiveItem
{}
var
_
v
alidationItem
=
&
primitiveItem
{}
func
(
item
*
primitiveItem
)
VisitPrimitive
(
schema
*
proto
.
Primitive
)
{
// Some types of primitives can match more than one (a number
...
...
@@ -232,7 +232,7 @@ func (item *primitiveItem) VisitReference(schema proto.Reference) {
}
// itemFactory creates the relevant item type/visitor based on the current yaml type.
func
itemFactory
(
path
proto
.
Path
,
v
interface
{})
(
V
alidationItem
,
error
)
{
func
itemFactory
(
path
proto
.
Path
,
v
interface
{})
(
v
alidationItem
,
error
)
{
// We need to special case for no-type fields in yaml (e.g. empty item in list)
if
v
==
nil
{
return
nil
,
InvalidObjectTypeError
{
Type
:
"nil"
,
Path
:
path
.
String
()}
...
...
vendor/k8s.io/kube-openapi/pkg/util/proto/validation/validation.go
0 → 100644
View file @
8f7262e8
/*
Copyright 2017 The Kubernetes 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
validation
import
(
"k8s.io/kube-openapi/pkg/util/proto"
)
func
ValidateModel
(
obj
interface
{},
schema
proto
.
Schema
,
name
string
)
[]
error
{
rootValidation
,
err
:=
itemFactory
(
proto
.
NewPath
(
name
),
obj
)
if
err
!=
nil
{
return
[]
error
{
err
}
}
schema
.
Accept
(
rootValidation
)
return
rootValidation
.
Errors
()
}
vendor/k8s.io/kube-openapi/pkg/util/util.go
0 → 100644
View file @
8f7262e8
/*
Copyright 2017 The Kubernetes 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
util
import
"strings"
// ToCanonicalName converts Golang package/type name into canonical OpenAPI name.
// Examples:
// Input: k8s.io/api/core/v1.Pod
// Output: io.k8s.api.core.v1.Pod
//
// Input: k8s.io/api/core/v1
// Output: io.k8s.api.core.v1
func
ToCanonicalName
(
name
string
)
string
{
nameParts
:=
strings
.
Split
(
name
,
"/"
)
// Reverse first part. e.g., io.k8s... instead of k8s.io...
if
len
(
nameParts
)
>
0
&&
strings
.
Contains
(
nameParts
[
0
],
"."
)
{
parts
:=
strings
.
Split
(
nameParts
[
0
],
"."
)
for
i
,
j
:=
0
,
len
(
parts
)
-
1
;
i
<
j
;
i
,
j
=
i
+
1
,
j
-
1
{
parts
[
i
],
parts
[
j
]
=
parts
[
j
],
parts
[
i
]
}
nameParts
[
0
]
=
strings
.
Join
(
parts
,
"."
)
}
return
strings
.
Join
(
nameParts
,
"."
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment