Merge pull request kubernetes#54957 from apelisse/update-kube-openapi

Automatic merge from submit-queue (batch tested with PRs 55004, 54957). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update kube-openapi to use validation

**What this PR does / why we need it**: Moves openapi validation code to kube-openapi, so that we can move the rest of the code to apimachinery repository, so that later we can use it from both the client and the server.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #Nothing

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```

Author: Kubernetes Submit Queue

Godeps/Godeps.json

@@ -8,32 +8,28 @@ 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",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_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_xtest",
+    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",
     ],
 )
 

Godeps/LICENSES

@@ -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/BUILD

@@ -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.go

@@ -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())
 	})