github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 13:50:01 +00:00
Code Issues Projects Releases Wiki Activity

pkg/api: move HasObjectMetaSystemFieldValues into apimachinery

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-29 22:15:52 +01:00
parent 96cfe7b938
commit d6adb51e6c
5 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/api/meta.go
View File

@@ -1,27 +0,0 @@
/*
Copyright 2014 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 api
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
// HasObjectMetaSystemFieldValues returns true if fields that are managed by the system on ObjectMeta have values.
func HasObjectMetaSystemFieldValues(meta *metav1.ObjectMeta) bool {
return !meta.CreationTimestamp.Time.IsZero() ||
len(meta.UID) != 0
}

4
pkg/genericapiserver/registry/rest/meta_test.go
View File

@@ -49,11 +49,11 @@ func TestFillObjectMetaSystemFields(t *testing.T) {
func TestHasObjectMetaSystemFieldValues(t *testing.T) { func TestHasObjectMetaSystemFieldValues(t *testing.T) {
ctx := genericapirequest.NewDefaultContext() ctx := genericapirequest.NewDefaultContext()
resource := metav1.ObjectMeta{} resource := metav1.ObjectMeta{}
if api.HasObjectMetaSystemFieldValues(&resource) { if metav1.HasObjectMetaSystemFieldValues(&resource) {
t.Errorf("the resource does not have all fields yet populated, but incorrectly reports it does") t.Errorf("the resource does not have all fields yet populated, but incorrectly reports it does")
} }
FillObjectMetaSystemFields(ctx, &resource) FillObjectMetaSystemFields(ctx, &resource)
if !api.HasObjectMetaSystemFieldValues(&resource) { if !metav1.HasObjectMetaSystemFieldValues(&resource) {
t.Errorf("the resource does have all fields populated, but incorrectly reports it does not") t.Errorf("the resource does have all fields populated, but incorrectly reports it does not")
} }
} }

2
pkg/genericapiserver/registry/rest/resttest/resttest.go
View File

@@ -328,7 +328,7 @@ func (t *Tester) testCreateHasMetadata(valid runtime.Object) {
t.Fatalf("Unexpected object from result: %#v", obj) t.Fatalf("Unexpected object from result: %#v", obj)
} }
defer t.delete(t.TestContext(), obj) defer t.delete(t.TestContext(), obj)
if !api.HasObjectMetaSystemFieldValues(objectMeta) { if !metav1.HasObjectMetaSystemFieldValues(objectMeta) {
t.Errorf("storage did not populate object meta field values") t.Errorf("storage did not populate object meta field values")
} }
} }

4
pkg/registry/core/service/rest_test.go
View File

@@ -98,7 +98,7 @@ func TestServiceRegistryCreate(t *testing.T) {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
created_service := created_svc.(*api.Service) created_service := created_svc.(*api.Service)
if !api.HasObjectMetaSystemFieldValues(&created_service.ObjectMeta) { if !metav1.HasObjectMetaSystemFieldValues(&created_service.ObjectMeta) {
t.Errorf("storage did not populate object meta field values") t.Errorf("storage did not populate object meta field values")
} }
if created_service.Name != "foo" { if created_service.Name != "foo" {
@@ -218,7 +218,7 @@ func TestServiceRegistryCreateMultiNodePortsService(t *testing.T) {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
created_service := created_svc.(*api.Service) created_service := created_svc.(*api.Service)
if !api.HasObjectMetaSystemFieldValues(&created_service.ObjectMeta) { if !metav1.HasObjectMetaSystemFieldValues(&created_service.ObjectMeta) {
t.Errorf("storage did not populate object meta field values") t.Errorf("storage did not populate object meta field values")
} }
if created_service.Name != test.name { if created_service.Name != test.name {

6
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
View File

@@ -226,3 +226,9 @@ func NewUIDPreconditions(uid string) *Preconditions {
u := types.UID(uid) u := types.UID(uid)
return &Preconditions{UID: &u} return &Preconditions{UID: &u}
} }
// HasObjectMetaSystemFieldValues returns true if fields that are managed by the system on ObjectMeta have values.
func HasObjectMetaSystemFieldValues(meta *ObjectMeta) bool {
return !meta.CreationTimestamp.Time.IsZero() ||
len(meta.UID) != 0
}