Plumb context to strategy methods

lavalamp · Aug 9, 2016 · 4db0049 · 4db0049
1 parent 16621cd
commit 4db0049
Show file tree

Hide file tree

Showing 58 changed files with 166 additions and 165 deletions.
diff --git a/federation/registry/cluster/strategy.go b/federation/registry/cluster/strategy.go
@@ -59,7 +59,7 @@ func MatchCluster(label labels.Selector, field fields.Selector) generic.Matcher
 }
 
 // PrepareForCreate clears fields that are not allowed to be set by end users on creation.
-func (clusterStrategy) PrepareForCreate(obj runtime.Object) {
+func (clusterStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	cluster := obj.(*federation.Cluster)
 	cluster.Status = federation.ClusterStatus{}
 }
@@ -80,7 +80,7 @@ func (clusterStrategy) AllowCreateOnUpdate() bool {
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (clusterStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (clusterStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	cluster := obj.(*federation.Cluster)
 	oldCluster := old.(*federation.Cluster)
 	cluster.Status = oldCluster.Status
@@ -100,10 +100,10 @@ type clusterStatusStrategy struct {
 
 var StatusStrategy = clusterStatusStrategy{Strategy}
 
-func (clusterStatusStrategy) PrepareForCreate(obj runtime.Object) {
+func (clusterStatusStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	_ = obj.(*federation.Cluster)
 }
-func (clusterStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (clusterStatusStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	cluster := obj.(*federation.Cluster)
 	oldCluster := old.(*federation.Cluster)
 	cluster.Spec = oldCluster.Spec

diff --git a/federation/registry/cluster/strategy_test.go b/federation/registry/cluster/strategy_test.go
@@ -79,7 +79,7 @@ func TestClusterStrategy(t *testing.T) {
 	}
 
 	cluster := validNewCluster()
-	Strategy.PrepareForCreate(cluster)
+	Strategy.PrepareForCreate(ctx, cluster)
 	if len(cluster.Status.Conditions) != 0 {
 		t.Errorf("Cluster should not allow setting conditions on create")
 	}
@@ -89,7 +89,7 @@ func TestClusterStrategy(t *testing.T) {
 	}
 
 	invalidCluster := invalidNewCluster()
-	Strategy.PrepareForUpdate(invalidCluster, cluster)
+	Strategy.PrepareForUpdate(ctx, invalidCluster, cluster)
 	if reflect.DeepEqual(invalidCluster.Spec, cluster.Spec) ||
 		!reflect.DeepEqual(invalidCluster.Status, cluster.Status) {
 		t.Error("Only spec is expected being changed")
@@ -114,7 +114,7 @@ func TestClusterStatusStrategy(t *testing.T) {
 
 	cluster := validNewCluster()
 	invalidCluster := invalidNewCluster()
-	StatusStrategy.PrepareForUpdate(cluster, invalidCluster)
+	StatusStrategy.PrepareForUpdate(ctx, cluster, invalidCluster)
 	if !reflect.DeepEqual(invalidCluster.Spec, cluster.Spec) ||
 		reflect.DeepEqual(invalidCluster.Status, cluster.Status) {
 		t.Logf("== cluster.Spec: %v\n", cluster.Spec)

diff --git a/pkg/api/rest/create.go b/pkg/api/rest/create.go
@@ -40,7 +40,7 @@ type RESTCreateStrategy interface {
 	// the object.  For example: remove fields that are not to be persisted,
 	// sort order-insensitive list fields, etc.  This should not remove fields
 	// whose presence would be considered a validation error.
-	PrepareForCreate(obj runtime.Object)
+	PrepareForCreate(ctx api.Context, obj runtime.Object)
 	// Validate is invoked after default fields in the object have been filled in before
 	// the object is persisted.  This method should not mutate the object.
 	Validate(ctx api.Context, obj runtime.Object) field.ErrorList
@@ -67,7 +67,7 @@ func BeforeCreate(strategy RESTCreateStrategy, ctx api.Context, obj runtime.Obje
 	}
 	objectMeta.DeletionTimestamp = nil
 	objectMeta.DeletionGracePeriodSeconds = nil
-	strategy.PrepareForCreate(obj)
+	strategy.PrepareForCreate(ctx, obj)
 	api.FillObjectMetaSystemFields(ctx, objectMeta)
 	api.GenerateName(strategy, objectMeta)
 

diff --git a/pkg/api/rest/delete.go b/pkg/api/rest/delete.go
@@ -37,7 +37,7 @@ type RESTDeleteStrategy interface {
 type RESTGracefulDeleteStrategy interface {
 	// CheckGracefulDelete should return true if the object can be gracefully deleted and set
 	// any default values on the DeleteOptions.
-	CheckGracefulDelete(obj runtime.Object, options *api.DeleteOptions) bool
+	CheckGracefulDelete(ctx api.Context, obj runtime.Object, options *api.DeleteOptions) bool
 }
 
 // BeforeDelete tests whether the object can be gracefully deleted. If graceful is set the object
@@ -87,7 +87,7 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx api.Context, obj runtime.Obje
 		return false, true, nil
 	}
 
-	if !gracefulStrategy.CheckGracefulDelete(obj, options) {
+	if !gracefulStrategy.CheckGracefulDelete(ctx, obj, options) {
 		return false, false, nil
 	}
 	now := unversioned.NewTime(unversioned.Now().Add(time.Second * time.Duration(*options.GracePeriodSeconds)))

diff --git a/pkg/api/rest/export.go b/pkg/api/rest/export.go
@@ -17,12 +17,13 @@ limitations under the License.
 package rest
 
 import (
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
 // RESTExportStrategy is the interface that defines how to export a Kubernetes object
 type RESTExportStrategy interface {
 	// Export strips fields that can not be set by the user.  If 'exact' is false
 	// fields specific to the cluster are also stripped
-	Export(obj runtime.Object, exact bool) error
+	Export(ctx api.Context, obj runtime.Object, exact bool) error
 }
diff --git a/pkg/api/rest/update.go b/pkg/api/rest/update.go
@@ -41,7 +41,7 @@ type RESTUpdateStrategy interface {
 	// the object.  For example: remove fields that are not to be persisted,
 	// sort order-insensitive list fields, etc.  This should not remove fields
 	// whose presence would be considered a validation error.
-	PrepareForUpdate(obj, old runtime.Object)
+	PrepareForUpdate(ctx api.Context, obj, old runtime.Object)
 	// ValidateUpdate is invoked after default fields in the object have been
 	// filled in before the object is persisted.  This method should not mutate
 	// the object.
@@ -93,7 +93,7 @@ func BeforeUpdate(strategy RESTUpdateStrategy, ctx api.Context, obj, old runtime
 	}
 	objectMeta.Generation = oldMeta.Generation
 
-	strategy.PrepareForUpdate(obj, old)
+	strategy.PrepareForUpdate(ctx, obj, old)
 
 	// Ensure some common fields, like UID, are validated for all resources.
 	errs, err := validateCommonFields(obj, old)

diff --git a/pkg/registry/certificates/strategy.go b/pkg/registry/certificates/strategy.go
@@ -54,7 +54,7 @@ func (csrStrategy) AllowCreateOnUpdate() bool {
 // information about the requesting user to be injected by the registry
 // interface. Clear everything else.
 // TODO: check these ordering assumptions. better way to inject user info?
-func (csrStrategy) PrepareForCreate(obj runtime.Object) {
+func (csrStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	csr := obj.(*certificates.CertificateSigningRequest)
 
 	// Be explicit that users cannot create pre-approved certificate requests.
@@ -64,7 +64,7 @@ func (csrStrategy) PrepareForCreate(obj runtime.Object) {
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users
 // on update. Certificate requests are immutable after creation except via subresources.
-func (csrStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (csrStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newCSR := obj.(*certificates.CertificateSigningRequest)
 	oldCSR := old.(*certificates.CertificateSigningRequest)
 
@@ -97,13 +97,13 @@ func (csrStrategy) AllowUnconditionalUpdate() bool {
 	return true
 }
 
-func (s csrStrategy) Export(obj runtime.Object, exact bool) error {
+func (s csrStrategy) Export(ctx api.Context, obj runtime.Object, exact bool) error {
 	csr, ok := obj.(*certificates.CertificateSigningRequest)
 	if !ok {
 		// unexpected programmer error
 		return fmt.Errorf("unexpected object: %v", obj)
 	}
-	s.PrepareForCreate(obj)
+	s.PrepareForCreate(ctx, obj)
 	if exact {
 		return nil
 	}
@@ -119,7 +119,7 @@ type csrStatusStrategy struct {
 
 var StatusStrategy = csrStatusStrategy{Strategy}
 
-func (csrStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (csrStatusStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newCSR := obj.(*certificates.CertificateSigningRequest)
 	oldCSR := old.(*certificates.CertificateSigningRequest)
 
@@ -145,7 +145,7 @@ type csrApprovalStrategy struct {
 
 var ApprovalStrategy = csrApprovalStrategy{Strategy}
 
-func (csrApprovalStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (csrApprovalStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newCSR := obj.(*certificates.CertificateSigningRequest)
 	oldCSR := old.(*certificates.CertificateSigningRequest)
 

diff --git a/pkg/registry/clusterrole/strategy.go b/pkg/registry/clusterrole/strategy.go
@@ -58,12 +58,12 @@ func (strategy) AllowCreateOnUpdate() bool {
 
 // PrepareForCreate clears fields that are not allowed to be set by end users
 // on creation.
-func (strategy) PrepareForCreate(obj runtime.Object) {
+func (strategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	_ = obj.(*rbac.ClusterRole)
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (strategy) PrepareForUpdate(obj, old runtime.Object) {
+func (strategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newClusterRole := obj.(*rbac.ClusterRole)
 	oldClusterRole := old.(*rbac.ClusterRole)
 
@@ -97,7 +97,7 @@ func (strategy) AllowUnconditionalUpdate() bool {
 	return true
 }
 
-func (s strategy) Export(obj runtime.Object, exact bool) error {
+func (s strategy) Export(ctx api.Context, obj runtime.Object, exact bool) error {
 	return nil
 }
 

diff --git a/pkg/registry/clusterrolebinding/strategy.go b/pkg/registry/clusterrolebinding/strategy.go
@@ -58,12 +58,12 @@ func (strategy) AllowCreateOnUpdate() bool {
 
 // PrepareForCreate clears fields that are not allowed to be set by end users
 // on creation.
-func (strategy) PrepareForCreate(obj runtime.Object) {
+func (strategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	_ = obj.(*rbac.ClusterRoleBinding)
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (strategy) PrepareForUpdate(obj, old runtime.Object) {
+func (strategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newClusterRoleBinding := obj.(*rbac.ClusterRoleBinding)
 	oldClusterRoleBinding := old.(*rbac.ClusterRoleBinding)
 
@@ -97,7 +97,7 @@ func (strategy) AllowUnconditionalUpdate() bool {
 	return true
 }
 
-func (s strategy) Export(obj runtime.Object, exact bool) error {
+func (s strategy) Export(ctx api.Context, obj runtime.Object, exact bool) error {
 	return nil
 }
 

diff --git a/pkg/registry/configmap/strategy.go b/pkg/registry/configmap/strategy.go
@@ -49,7 +49,7 @@ func (strategy) NamespaceScoped() bool {
 	return true
 }
 
-func (strategy) PrepareForCreate(obj runtime.Object) {
+func (strategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	_ = obj.(*api.ConfigMap)
 }
 
@@ -67,7 +67,7 @@ func (strategy) AllowCreateOnUpdate() bool {
 	return false
 }
 
-func (strategy) PrepareForUpdate(newObj, oldObj runtime.Object) {
+func (strategy) PrepareForUpdate(ctx api.Context, newObj, oldObj runtime.Object) {
 	_ = oldObj.(*api.ConfigMap)
 	_ = newObj.(*api.ConfigMap)
 }

diff --git a/pkg/registry/configmap/strategy_test.go b/pkg/registry/configmap/strategy_test.go
@@ -44,7 +44,7 @@ func TestConfigMapStrategy(t *testing.T) {
 		},
 	}
 
-	Strategy.PrepareForCreate(cfg)
+	Strategy.PrepareForCreate(ctx, cfg)
 
 	errs := Strategy.Validate(ctx, cfg)
 	if len(errs) != 0 {
@@ -62,7 +62,7 @@ func TestConfigMapStrategy(t *testing.T) {
 		},
 	}
 
-	Strategy.PrepareForUpdate(newCfg, cfg)
+	Strategy.PrepareForUpdate(ctx, newCfg, cfg)
 
 	errs = Strategy.ValidateUpdate(ctx, newCfg, cfg)
 	if len(errs) == 0 {

diff --git a/pkg/registry/controller/strategy.go b/pkg/registry/controller/strategy.go
@@ -47,15 +47,15 @@ func (rcStrategy) NamespaceScoped() bool {
 }
 
 // PrepareForCreate clears the status of a replication controller before creation.
-func (rcStrategy) PrepareForCreate(obj runtime.Object) {
+func (rcStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	controller := obj.(*api.ReplicationController)
 	controller.Status = api.ReplicationControllerStatus{}
 
 	controller.Generation = 1
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (rcStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (rcStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newController := obj.(*api.ReplicationController)
 	oldController := old.(*api.ReplicationController)
 	// update is not allowed to set status
@@ -133,7 +133,7 @@ type rcStatusStrategy struct {
 
 var StatusStrategy = rcStatusStrategy{Strategy}
 
-func (rcStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (rcStatusStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newRc := obj.(*api.ReplicationController)
 	oldRc := old.(*api.ReplicationController)
 	// update is not allowed to set spec

diff --git a/pkg/registry/controller/strategy_test.go b/pkg/registry/controller/strategy_test.go
@@ -59,7 +59,7 @@ func TestControllerStrategy(t *testing.T) {
 		},
 	}
 
-	Strategy.PrepareForCreate(rc)
+	Strategy.PrepareForCreate(ctx, rc)
 	if rc.Status.Replicas != 0 {
 		t.Error("ReplicationController should not allow setting status.replicas on create")
 	}
@@ -74,7 +74,7 @@ func TestControllerStrategy(t *testing.T) {
 	invalidRc := &api.ReplicationController{
 		ObjectMeta: api.ObjectMeta{Name: "bar", ResourceVersion: "4"},
 	}
-	Strategy.PrepareForUpdate(invalidRc, rc)
+	Strategy.PrepareForUpdate(ctx, invalidRc, rc)
 	errs = Strategy.ValidateUpdate(ctx, invalidRc, rc)
 	if len(errs) == 0 {
 		t.Errorf("Expected a validation error")
@@ -129,7 +129,7 @@ func TestControllerStatusStrategy(t *testing.T) {
 			ObservedGeneration: int64(11),
 		},
 	}
-	StatusStrategy.PrepareForUpdate(newController, oldController)
+	StatusStrategy.PrepareForUpdate(ctx, newController, oldController)
 	if newController.Status.Replicas != 3 {
 		t.Errorf("Replication controller status updates should allow change of replicas: %v", newController.Status.Replicas)
 	}

diff --git a/pkg/registry/daemonset/strategy.go b/pkg/registry/daemonset/strategy.go
@@ -45,15 +45,15 @@ func (daemonSetStrategy) NamespaceScoped() bool {
 }
 
 // PrepareForCreate clears the status of a daemon set before creation.
-func (daemonSetStrategy) PrepareForCreate(obj runtime.Object) {
+func (daemonSetStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	daemonSet := obj.(*extensions.DaemonSet)
 	daemonSet.Status = extensions.DaemonSetStatus{}
 
 	daemonSet.Generation = 1
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (daemonSetStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (daemonSetStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newDaemonSet := obj.(*extensions.DaemonSet)
 	oldDaemonSet := old.(*extensions.DaemonSet)
 
@@ -132,7 +132,7 @@ type daemonSetStatusStrategy struct {
 
 var StatusStrategy = daemonSetStatusStrategy{Strategy}
 
-func (daemonSetStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (daemonSetStatusStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newDaemonSet := obj.(*extensions.DaemonSet)
 	oldDaemonSet := old.(*extensions.DaemonSet)
 	newDaemonSet.Spec = oldDaemonSet.Spec

diff --git a/pkg/registry/deployment/strategy.go b/pkg/registry/deployment/strategy.go
@@ -46,7 +46,7 @@ func (deploymentStrategy) NamespaceScoped() bool {
 }
 
 // PrepareForCreate clears fields that are not allowed to be set by end users on creation.
-func (deploymentStrategy) PrepareForCreate(obj runtime.Object) {
+func (deploymentStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 	deployment := obj.(*extensions.Deployment)
 	deployment.Status = extensions.DeploymentStatus{}
 	deployment.Generation = 1
@@ -68,7 +68,7 @@ func (deploymentStrategy) AllowCreateOnUpdate() bool {
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (deploymentStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (deploymentStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newDeployment := obj.(*extensions.Deployment)
 	oldDeployment := old.(*extensions.Deployment)
 	newDeployment.Status = oldDeployment.Status
@@ -98,7 +98,7 @@ type deploymentStatusStrategy struct {
 var StatusStrategy = deploymentStatusStrategy{Strategy}
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update of status
-func (deploymentStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (deploymentStatusStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 	newDeployment := obj.(*extensions.Deployment)
 	oldDeployment := old.(*extensions.Deployment)
 	newDeployment.Spec = oldDeployment.Spec

diff --git a/pkg/registry/deployment/strategy_test.go b/pkg/registry/deployment/strategy_test.go
@@ -56,7 +56,7 @@ func TestStatusUpdates(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		deploymentStatusStrategy{}.PrepareForUpdate(test.obj, test.old)
+		deploymentStatusStrategy{}.PrepareForUpdate(api.NewContext(), test.obj, test.old)
 		if !reflect.DeepEqual(test.expected, test.obj) {
 			t.Errorf("Unexpected object mismatch! Expected:\n%#v\ngot:\n%#v", test.expected, test.obj)
 		}

diff --git a/pkg/registry/endpoint/strategy.go b/pkg/registry/endpoint/strategy.go
@@ -45,11 +45,11 @@ func (endpointsStrategy) NamespaceScoped() bool {
 }
 
 // PrepareForCreate clears fields that are not allowed to be set by end users on creation.
-func (endpointsStrategy) PrepareForCreate(obj runtime.Object) {
+func (endpointsStrategy) PrepareForCreate(ctx api.Context, obj runtime.Object) {
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
-func (endpointsStrategy) PrepareForUpdate(obj, old runtime.Object) {
+func (endpointsStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Object) {
 }
 
 // Validate validates a new endpoints.