Move the VerifyType checks into tests. (knative#2175)

This tracks the model changes that have already been made to `knative/pkg`.

Fixes: knative#2174

Author: mattmoor

Gopkg.lock

@@ -23,8 +23,8 @@ required = [
 
 [[override]]
   name = "github.com/knative/pkg"
-  # HEAD as of 2018-10-01
-  revision = "f00975a13e4c7284aac5b8d01181590869472291"
+  # HEAD as of 2018-10-06
+  revision = "46bd3d242bb31222602a53154e598d3cab585ae6"
 
 [[override]]
   name = "go.uber.org/zap"

Gopkg.toml

@@ -25,7 +25,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/knative/pkg/apis"
-	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"github.com/knative/serving/pkg/apis/autoscaling"
 	servingv1alpha1 "github.com/knative/serving/pkg/apis/serving/v1alpha1"
@@ -60,13 +59,6 @@ var _ apis.Immutable = (*PodAutoscaler)(nil)
 // Check that ConfigurationStatus may have its conditions managed.
 var _ duckv1alpha1.ConditionsAccessor = (*PodAutoscalerStatus)(nil)
 
-// Check that PodAutoscaler implements the Conditions duck type.
-var _ = duck.VerifyType(&PodAutoscaler{}, &duckv1alpha1.Conditions{})
-
-// Check that PodAutoscaler implements the Generation duck type.
-var emptyGen duckv1alpha1.Generation
-var _ = duck.VerifyType(&PodAutoscaler{}, &emptyGen)
-
 // PodAutoscalerSpec holds the desired state of the PodAutoscaler (from the client).
 type PodAutoscalerSpec struct {
 	// TODO: Generation does not work correctly with CRD. They are scrubbed

pkg/apis/autoscaling/v1alpha1/kpa_types.go

@@ -20,11 +20,36 @@ import (
 	"time"
 
 	"github.com/knative/pkg/apis"
+	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func TestPodAutoscalerDuckTypes(t *testing.T) {
+	var emptyGen duckv1alpha1.Generation
+
+	tests := []struct {
+		name string
+		t    duck.Implementable
+	}{{
+		name: "generations",
+		t:    &emptyGen,
+	}, {
+		name: "conditions",
+		t:    &duckv1alpha1.Conditions{},
+	}}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			err := duck.VerifyType(&PodAutoscaler{}, test.t)
+			if err != nil {
+				t.Errorf("VerifyType(PodAutoscaler, %T) = %v", test.t, err)
+			}
+		})
+	}
+}
+
 func TestGeneration(t *testing.T) {
 	r := PodAutoscaler{}
 	if a := r.GetGeneration(); a != 0 {

pkg/apis/autoscaling/v1alpha1/kpa_types_test.go

@@ -17,10 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"encoding/json"
-
 	"github.com/knative/pkg/apis"
-	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -302,25 +299,6 @@ var clusterIngressCondSet = duckv1alpha1.NewLivingConditionSet(
 var _ apis.Validatable = (*ClusterIngress)(nil)
 var _ apis.Defaultable = (*ClusterIngress)(nil)
 
-// Check that ClusterIngress implements the Conditions duck type.
-var _ = duck.VerifyType(&ClusterIngress{}, &duckv1alpha1.Conditions{})
-
-// Check that ClusterIngress implements the Generation duck type.
-var emptyGen duckv1alpha1.Generation
-var _ = duck.VerifyType(&ClusterIngress{}, &emptyGen)
-
-func (ci *ClusterIngress) GetGeneration() int64 {
-	return ci.Spec.Generation
-}
-
-func (ci *ClusterIngress) SetGeneration(generation int64) {
-	ci.Spec.Generation = generation
-}
-
-func (ci *ClusterIngress) GetSpecJSON() ([]byte, error) {
-	return json.Marshal(ci.Spec)
-}
-
 func (ci *ClusterIngress) GetGroupVersionKind() schema.GroupVersionKind {
 	return SchemeGroupVersion.WithKind("ClusterIngress")
 }

pkg/apis/networking/v1alpha1/clusteringress_types.go

@@ -16,26 +16,36 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-func TestGeneration(t *testing.T) {
-	r := ClusterIngress{}
-	if a := r.GetGeneration(); a != 0 {
-		t.Errorf("empty ClusterIngress generation should be 0 was: %d", a)
+func TestClusterIngressDuckTypes(t *testing.T) {
+	var emptyGen duckv1alpha1.Generation
+
+	tests := []struct {
+		name string
+		t    duck.Implementable
+	}{{
+		name: "generational",
+		t:    &emptyGen,
+	}, {
+		name: "conditions",
+		t:    &duckv1alpha1.Conditions{},
+	}}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			err := duck.VerifyType(&ClusterIngress{}, test.t)
+			if err != nil {
+				t.Errorf("VerifyType(ClusterIngress, %T) = %v", test.t, err)
+			}
+		})
 	}
-
-	r.SetGeneration(5)
-	if e, a := int64(5), r.GetGeneration(); e != a {
-		t.Errorf("getgeneration mismatch expected: %d got: %d", e, a)
-	}
-
 }
 
 func TestGetGroupVersionKind(t *testing.T) {
@@ -46,43 +56,6 @@ func TestGetGroupVersionKind(t *testing.T) {
 	}
 }
 
-func TestGetSpecJSON(t *testing.T) {
-	ci := ClusterIngress{
-		Spec: IngressSpec{
-			TLS: []ClusterIngressTLS{{
-				SecretNamespace: "secret-space",
-				SecretName:      "secret-name",
-			}},
-			Rules: []ClusterIngressRule{{
-				Hosts: []string{"example.com"},
-				HTTP: &HTTPClusterIngressRuleValue{
-					Paths: []HTTPClusterIngressPath{{
-						Splits: []ClusterIngressBackendSplit{{
-							Backend: &ClusterIngressBackend{
-								ServiceName:      "revision-000",
-								ServiceNamespace: "default",
-								ServicePort:      intstr.FromInt(8080),
-							},
-						}},
-						Retries: &HTTPRetry{
-							Attempts: 3,
-						},
-					}},
-				},
-			}},
-		},
-	}
-	bytes, err := ci.GetSpecJSON()
-	if err != nil {
-		t.Fatalf("Saw %v, wanted: nil", err)
-	}
-	cis := IngressSpec{}
-	json.Unmarshal(bytes, &cis)
-	if diff := cmp.Diff(ci.Spec, cis); diff != "" {
-		t.Errorf("Unexpected diff (-want, +got) = %v", diff)
-	}
-}
-
 func TestTypicalFlow(t *testing.T) {
 	r := &ClusterIngress{}
 	r.Status.InitializeConditions()

pkg/apis/networking/v1alpha1/clusteringress_types_test.go

@@ -21,7 +21,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/knative/pkg/apis"
-	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"github.com/knative/pkg/kmeta"
 )
@@ -59,13 +58,6 @@ var _ kmeta.OwnerRefable = (*Configuration)(nil)
 // Check that ConfigurationStatus may have its conditions managed.
 var _ duckv1alpha1.ConditionsAccessor = (*ConfigurationStatus)(nil)
 
-// Check that Configuration implements the Conditions duck type.
-var _ = duck.VerifyType(&Configuration{}, &duckv1alpha1.Conditions{})
-
-// Check that Configuration implements the Generation duck type.
-var emptyGenConfig duckv1alpha1.Generation
-var _ = duck.VerifyType(&Configuration{}, &emptyGenConfig)
-
 // ConfigurationSpec holds the desired state of the Configuration (from the client).
 type ConfigurationSpec struct {
 	// TODO: Generation does not work correctly with CRD. They are scrubbed

pkg/apis/serving/v1alpha1/configuration_types.go

@@ -19,20 +19,32 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-func TestConfigurationGeneration(t *testing.T) {
-	config := Configuration{}
-	if e, a := int64(0), config.GetGeneration(); e != a {
-		t.Errorf("empty revision generation should be 0 was: %d", a)
-	}
+func TestConfigurationDuckTypes(t *testing.T) {
+	var emptyGen duckv1alpha1.Generation
+	tests := []struct {
+		name string
+		t    duck.Implementable
+	}{{
+		name: "generation",
+		t:    &emptyGen,
+	}, {
+		name: "conditions",
+		t:    &duckv1alpha1.Conditions{},
+	}}
 
-	config.SetGeneration(5)
-	if e, a := int64(5), config.GetGeneration(); e != a {
-		t.Errorf("getgeneration mismatch expected: %d got: %d", e, a)
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			err := duck.VerifyType(&Configuration{}, test.t)
+			if err != nil {
+				t.Errorf("VerifyType(Configuration, %T) = %v", test.t, err)
+			}
+		})
 	}
 }
 

pkg/apis/serving/v1alpha1/configuration_types_test.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/knative/pkg/apis"
-	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"github.com/knative/pkg/kmeta"
 )
@@ -58,13 +57,6 @@ var _ apis.Immutable = (*Revision)(nil)
 // Check that RevisionStatus may have its conditions managed.
 var _ duckv1alpha1.ConditionsAccessor = (*RevisionStatus)(nil)
 
-// Check that Revision implements the Conditions duck type.
-var _ = duck.VerifyType(&Revision{}, &duckv1alpha1.Conditions{})
-
-// Check that Revision implements the Generation duck type.
-var emptyGenRev duckv1alpha1.Generation
-var _ = duck.VerifyType(&Revision{}, &emptyGenRev)
-
 // Check that we can create OwnerReferences to a Revision.
 var _ kmeta.OwnerRefable = (*Revision)(nil)
 

pkg/apis/serving/v1alpha1/revision_types.go

@@ -24,20 +24,31 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 )
 
-func TestGeneration(t *testing.T) {
-	r := Revision{}
-	if a := r.GetGeneration(); a != 0 {
-		t.Errorf("empty revision generation should be 0 was: %d", a)
-	}
+func TestRevisionDuckTypes(t *testing.T) {
+	var emptyGen duckv1alpha1.Generation
+	tests := []struct {
+		name string
+		t    duck.Implementable
+	}{{
+		name: "generation",
+		t:    &emptyGen,
+	}, {
+		name: "conditions",
+		t:    &duckv1alpha1.Conditions{},
+	}}
 
-	r.SetGeneration(5)
-	if e, a := int64(5), r.GetGeneration(); e != a {
-		t.Errorf("getgeneration mismatch expected: %d got: %d", e, a)
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			err := duck.VerifyType(&Revision{}, test.t)
+			if err != nil {
+				t.Errorf("VerifyType(Revision, %T) = %v", test.t, err)
+			}
+		})
 	}
-
 }
 
 func TestIsActivationRequired(t *testing.T) {

pkg/apis/serving/v1alpha1/revision_types_test.go

@@ -21,7 +21,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/knative/pkg/apis"
-	"github.com/knative/pkg/apis/duck"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"github.com/knative/pkg/kmeta"
 )
@@ -56,17 +55,6 @@ var _ apis.Defaultable = (*Route)(nil)
 // Check that we can create OwnerReferences to a Route.
 var _ kmeta.OwnerRefable = (*Route)(nil)
 
-// Check that Route implements the Conditions duck type.
-var _ = duck.VerifyType(&Route{}, &duckv1alpha1.Conditions{})
-
-// Check that Route implements the [Legacy]Targetable duck type.
-var _ = duck.VerifyType(&Route{}, &duckv1alpha1.LegacyTargetable{})
-var _ = duck.VerifyType(&Route{}, &duckv1alpha1.Targetable{})
-
-// Check that Route implements the Generation duck type.
-var emptyGenRoute duckv1alpha1.Generation
-var _ = duck.VerifyType(&Route{}, &emptyGenRoute)
-
 // Check that RouteStatus may have its conditions managed.
 var _ duckv1alpha1.ConditionsAccessor = (*RouteStatus)(nil)