kubernetes · k8s-ci-robot · Oct 7, 2022 · May 11, 2022
diff --git a/...ng/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go b/...ng/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go
@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics"
-	celmodel "k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	celmodel "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 const (

diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation_test.go
@@ -24,7 +24,7 @@ import (
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 const (

diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library/urls.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library/urls.go
@@ -22,7 +22,7 @@ import (
 	"github.com/google/cel-go/cel"
 	"github.com/google/cel-go/common/types"
 	"github.com/google/cel-go/common/types/ref"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 // URLs provides a CEL function library extension of URL parsing functions.

diff --git a/...d_party/forked/celopenapi/model/README.md → .../pkg/apiserver/schema/cel/model/README.md b/...d_party/forked/celopenapi/model/README.md → .../pkg/apiserver/schema/cel/model/README.md
diff --git a/...party/forked/celopenapi/model/escaping.go → ...kg/apiserver/schema/cel/model/escaping.go b/...party/forked/celopenapi/model/escaping.go → ...kg/apiserver/schema/cel/model/escaping.go
@@ -90,13 +90,13 @@ var validCharacterFilter = newCharacterFilter("abcdefghijklmnopqrstuvwxyzABCDEFG
 // Escape escapes ident and returns a CEL identifier (of the form '[a-zA-Z_][a-zA-Z0-9_]*'), or returns
 // false if the ident does not match the supported input format of `[a-zA-Z_.-/][a-zA-Z0-9_.-/]*`.
 // Escaping Rules:
-// - '__' escapes to '__underscores__'
-// - '.' escapes to '__dot__'
-// - '-' escapes to '__dash__'
-// - '/' escapes to '__slash__'
-// - Identifiers that exactly match a CEL RESERVED keyword escape to '__{keyword}__'. The keywords are: "true", "false",
-//	  "null", "in", "as", "break", "const", "continue", "else", "for", "function", "if", "import", "let", loop", "package",
-//	  "namespace", "return".
+//   - '__' escapes to '__underscores__'
+//   - '.' escapes to '__dot__'
+//   - '-' escapes to '__dash__'
+//   - '/' escapes to '__slash__'
+//   - Identifiers that exactly match a CEL RESERVED keyword escape to '__{keyword}__'. The keywords are: "true", "false",
+//     "null", "in", "as", "break", "const", "continue", "else", "for", "function", "if", "import", "let", loop", "package",
+//     "namespace", "return".
 func Escape(ident string) (string, bool) {
 	if len(ident) == 0 || ('0' <= ident[0] && ident[0] <= '9') {
 		return "", false

diff --git a/.../forked/celopenapi/model/escaping_test.go → ...iserver/schema/cel/model/escaping_test.go b/.../forked/celopenapi/model/escaping_test.go → ...iserver/schema/cel/model/escaping_test.go
diff --git a/...party/forked/celopenapi/model/registry.go → ...kg/apiserver/schema/cel/model/registry.go b/...party/forked/celopenapi/model/registry.go → ...kg/apiserver/schema/cel/model/registry.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://www.apache.org/licenses/LICENSE2.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.
+/*
+Copyright 2022 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 model
 

diff --git a/..._party/forked/celopenapi/model/schemas.go → ...pkg/apiserver/schema/cel/model/schemas.go b/..._party/forked/celopenapi/model/schemas.go → ...pkg/apiserver/schema/cel/model/schemas.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://www.apache.org/licenses/LICENSE2.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.
+/*
+Copyright 2022 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 model
 
@@ -38,9 +40,6 @@ const (
 	minDurationSizeJSON = 3
 	// RFC 3339 dates require YYYY-MM-DD, and then we add 2 to allow for quotation marks
 	dateSizeJSON = 12
-	// RFC 3339 times require 2-digit 24-hour time at the very least plus a capital T at the start,
-	// e.g., T23, and we add 2 to allow for quotation marks as usual
-	minTimeSizeJSON = 5
 	// RFC 3339 datetimes require a full date (YYYY-MM-DD) and full time (HH:MM:SS), and we add 3 for
 	// quotation marks like always in addition to the capital T that separates the date and time
 	minDatetimeSizeJSON = 21

diff --git a/...y/forked/celopenapi/model/schemas_test.go → ...piserver/schema/cel/model/schemas_test.go b/...y/forked/celopenapi/model/schemas_test.go → ...piserver/schema/cel/model/schemas_test.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://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.
+/*
+Copyright 2022 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 model
 
@@ -335,12 +337,12 @@ func TestEstimateMaxLengthJSON(t *testing.T) {
 						Type: "object",
 					},
 					Properties: map[string]schema.Structural{
-						"required": schema.Structural{
+						"required": {
 							Generic: schema.Generic{
 								Type: "string",
 							},
 						},
-						"optional": schema.Structural{
+						"optional": {
 							Generic: schema.Generic{
 								Type: "string",
 							},
@@ -453,7 +455,7 @@ func TestEstimateMaxLengthJSON(t *testing.T) {
 						Type: "object",
 					},
 					Properties: map[string]schema.Structural{
-						"field": schema.Structural{
+						"field": {
 							Generic: schema.Generic{
 								Type:    "string",
 								Default: schema.JSON{Object: "default"},

diff --git a/...rd_party/forked/celopenapi/model/types.go → ...r/pkg/apiserver/schema/cel/model/types.go b/...rd_party/forked/celopenapi/model/types.go → ...r/pkg/apiserver/schema/cel/model/types.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://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.
+/*
+Copyright 2022 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 model
 
@@ -79,9 +81,9 @@ func NewObjectType(name string, fields map[string]*DeclField) *DeclType {
 
 func newSimpleTypeWithMinSize(name string, celType *cel.Type, zeroVal ref.Val, minSize int64) *DeclType {
 	return &DeclType{
-		name: name,
-		celType: celType,
-		defaultValue: zeroVal,
+		name:              name,
+		celType:           celType,
+		defaultValue:      zeroVal,
 		MinSerializedSize: minSize,
 	}
 }
@@ -473,35 +475,6 @@ func (rt *RuleTypes) findDeclType(typeName string) (*DeclType, bool) {
 	return nil, false
 }
 
-func (rt *RuleTypes) convertToCustomType(dyn *DynValue, declType *DeclType) *DynValue {
-	switch v := dyn.Value().(type) {
-	case *MapValue:
-		if declType.IsObject() {
-			obj := v.ConvertToObject(declType)
-			for name, f := range obj.fieldMap {
-				field := declType.Fields[name]
-				f.Ref = rt.convertToCustomType(f.Ref, field.Type)
-			}
-			dyn.SetValue(obj)
-			return dyn
-		}
-		fieldType := declType.ElemType
-		for _, f := range v.fieldMap {
-			f.Ref = rt.convertToCustomType(f.Ref, fieldType)
-		}
-		return dyn
-	case *ListValue:
-		for i := 0; i < len(v.Entries); i++ {
-			elem := v.Entries[i]
-			elem = rt.convertToCustomType(elem, declType.ElemType)
-			v.Entries[i] = elem
-		}
-		return dyn
-	default:
-		return dyn
-	}
-}
-
 func newSchemaTypeProvider(kind string, declType *DeclType) (*schemaTypeProvider, error) {
 	if declType == nil {
 		return nil, nil

diff --git a/...rty/forked/celopenapi/model/types_test.go → .../apiserver/schema/cel/model/types_test.go b/...rty/forked/celopenapi/model/types_test.go → .../apiserver/schema/cel/model/types_test.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://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.
+/*
+Copyright 2022 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 model
 

diff --git a/...hird_party/forked/celopenapi/model/url.go → ...ver/pkg/apiserver/schema/cel/model/url.go b/...hird_party/forked/celopenapi/model/url.go → ...ver/pkg/apiserver/schema/cel/model/url.go
@@ -1,16 +1,18 @@
-// Copyright 2022 Google LLC
-//
-// 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.
+/*
+Copyright 2022 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 model
 

diff --git a/...rd_party/forked/celopenapi/model/value.go → ...r/pkg/apiserver/schema/cel/model/value.go b/...rd_party/forked/celopenapi/model/value.go → ...r/pkg/apiserver/schema/cel/model/value.go
@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
-//
-// 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
-//
-//    https://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.
+/*
+Copyright 2022 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 model
 
@@ -706,9 +708,7 @@ func (lv *ListValue) finalizeValueSet() {
 	for _, e := range lv.Entries {
 		switch e.value.(type) {
 		case bool, float64, int64, string, uint64, types.Null, PlainTextValue:
-			if valueSet != nil {
-				valueSet[e.ExprValue()] = struct{}{}
-			}
+			valueSet[e.ExprValue()] = struct{}{}
 		default:
 			lv.valueSet = nil
 			return