From 39ffd45175876fe7c846c6239d89613d31a28fa1 Mon Sep 17 00:00:00 2001 From: Manish Kumar Date: Fri, 7 Oct 2022 05:43:52 +0530 Subject: [PATCH] Move celopenapi/model to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/ (#109959) Co-authored-by: Manish Kumar --- .../validation/cel_validation.go | 2 +- .../pkg/apiserver/schema/cel/compilation.go | 2 +- .../apiserver/schema/cel/compilation_test.go | 2 +- .../pkg/apiserver/schema/cel/library/urls.go | 2 +- .../apiserver/schema/cel}/model/README.md | 0 .../apiserver/schema/cel}/model/escaping.go | 14 +- .../schema/cel}/model/escaping_test.go | 0 .../apiserver/schema/cel}/model/registry.go | 28 +-- .../apiserver/schema/cel}/model/schemas.go | 31 ++- .../schema/cel}/model/schemas_test.go | 34 +-- .../apiserver/schema/cel}/model/types.go | 63 ++---- .../apiserver/schema/cel}/model/types_test.go | 28 +-- .../apiserver/schema/cel}/model/url.go | 28 +-- .../apiserver/schema/cel}/model/value.go | 32 +-- .../apiserver/schema/cel}/model/value_test.go | 34 +-- .../pkg/apiserver/schema/cel/validation.go | 2 +- .../apiserver/schema/cel/validation_test.go | 2 +- .../pkg/apiserver/schema/cel/values.go | 2 +- .../third_party/forked/celopenapi/LICENSE | 202 ------------------ .../src/k8s.io/apiserver/pkg/server/config.go | 2 +- vendor/modules.txt | 2 +- 21 files changed, 146 insertions(+), 366 deletions(-) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/README.md (100%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/escaping.go (91%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/escaping_test.go (100%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/registry.go (76%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/schemas.go (93%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/schemas_test.go (95%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/types.go (92%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/types_test.go (88%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/url.go (71%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/value.go (96%) rename staging/src/k8s.io/apiextensions-apiserver/{third_party/forked/celopenapi => pkg/apiserver/schema/cel}/model/value_test.go (92%) delete mode 100644 staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go index a529e7abfb6..854a61024d0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go +++ b/staging/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 index 7757441436f..6c93a557857 100644 --- 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 index 3eec572ff1e..759d5137e6a 100644 --- 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 index d2c8483bed8..94688039d50 100644 --- 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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/README.md b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/README.md similarity index 100% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/README.md rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/README.md diff --git a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/escaping.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/escaping.go similarity index 91% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/escaping.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/escaping.go index 60571202d75..c9d6463dd53 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/escaping.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/escaping_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/escaping_test.go similarity index 100% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/escaping_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/escaping_test.go diff --git a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/registry.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/registry.go similarity index 76% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/registry.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/registry.go index 120c49fc64a..44f63dc1af5 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/registry.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go similarity index 93% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go index 0a907519b5b..3d2a4730a4b 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go +++ b/staging/src/k8s.io/apiextensions-apiserver/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas_test.go similarity index 95% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas_test.go index 138b7f6fd1f..aa5c1e9a93a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types.go similarity index 92% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types.go index 7c77a3247dd..08823f94ffb 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types.go +++ b/staging/src/k8s.io/apiextensions-apiserver/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types_test.go similarity index 88% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types_test.go index 5edb5e082b6..9ad95ccbb26 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/types_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/url.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/url.go similarity index 71% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/url.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/url.go index 5e2eba7e3f2..03234d7a0ef 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/url.go +++ b/staging/src/k8s.io/apiextensions-apiserver/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/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value.go similarity index 96% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value.go index 9a537aba97f..62affeffff3 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value.go +++ b/staging/src/k8s.io/apiextensions-apiserver/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 diff --git a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value_test.go similarity index 92% rename from staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value_test.go rename to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value_test.go index 5dda06e415d..bf5e0b7b53f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/value_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value_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 @@ -322,9 +324,9 @@ func TestMapValueIsSet(t *testing.T) { func TestObjectValueEqual(t *testing.T) { objType := NewObjectType("Notice", map[string]*DeclField{ - "name": &DeclField{Name: "name", Type: StringType}, - "priority": &DeclField{Name: "priority", Type: IntType}, - "message": &DeclField{Name: "message", Type: StringType, defaultValue: ""}, + "name": {Name: "name", Type: StringType}, + "priority": {Name: "priority", Type: IntType}, + "message": {Name: "message", Type: StringType, defaultValue: ""}, }) name := NewField(1, "name") name.Ref = testValue(t, 2, "alert") diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go index 73fc451fd54..cb8e9c8ae95 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go @@ -31,7 +31,7 @@ import ( apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/pkg/apiserver/schema" "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics" - "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/validation_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go index 8e0b26a1cdc..9bb50277c9f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go @@ -28,7 +28,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" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/values.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/values.go index f012ffdc45a..ea6a6301f9e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/values.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/values.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" 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/kube-openapi/pkg/validation/strfmt" ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE b/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE deleted file mode 100644 index 7a4a3ea2424..00000000000 --- a/staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. \ No newline at end of file diff --git a/staging/src/k8s.io/apiserver/pkg/server/config.go b/staging/src/k8s.io/apiserver/pkg/server/config.go index 0b716d4e337..29840dbe322 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/config.go @@ -360,7 +360,7 @@ func NewConfig(codecs serializer.CodecFactory) *Config { // A request body might be encoded in json, and is converted to // proto when persisted in etcd, so we allow 2x as the largest request // body size to be accepted and decoded in a write request. - // If this constant is changed, maxRequestSizeBytes in apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go + // If this constant is changed, maxRequestSizeBytes in apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go // should be changed to reflect the new value, if the two haven't // been wired together already somehow. MaxRequestBodyBytes: int64(3 * 1024 * 1024), diff --git a/vendor/modules.txt b/vendor/modules.txt index 12068286da2..418b46e3629 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1323,6 +1323,7 @@ k8s.io/apiextensions-apiserver/pkg/apiserver/schema k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics +k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting k8s.io/apiextensions-apiserver/pkg/apiserver/schema/listtype k8s.io/apiextensions-apiserver/pkg/apiserver/schema/objectmeta @@ -1357,7 +1358,6 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition k8s.io/apiextensions-apiserver/test/integration k8s.io/apiextensions-apiserver/test/integration/fixtures -k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model # k8s.io/apimachinery v0.0.0 => ./staging/src/k8s.io/apimachinery ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/apitesting