types: group vars 👼

Signed-off-by: Vincent Demeester <[email protected]>
tektoncd · Nov 6, 2019 · 094f0e5 · 094f0e5
1 parent 96ccab9
commit 094f0e5
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 24 deletions.
diff --git a/pkg/apis/pipeline/v1alpha1/cluster_task_types.go b/pkg/apis/pipeline/v1alpha1/cluster_task_types.go
@@ -22,8 +22,10 @@ import (
 )
 
 // Check that Task may be validated and defaulted.
-var _ apis.Validatable = (*ClusterTask)(nil)
-var _ apis.Defaultable = (*ClusterTask)(nil)
+var (
+ _ apis.Validatable = (*ClusterTask)(nil)
+ _ apis.Defaultable = (*ClusterTask)(nil)
+)
 
 // +genclient
 // +genclient:noStatus

diff --git a/pkg/apis/pipeline/v1alpha1/condition_types.go b/pkg/apis/pipeline/v1alpha1/condition_types.go
@@ -24,8 +24,10 @@ import (
 )
 
 // Check that Task may be validated and defaulted.
-var _ apis.Validatable = (*Condition)(nil)
-var _ apis.Defaultable = (*Condition)(nil)
+var (
+ _ apis.Validatable = (*Condition)(nil)
+ _ apis.Defaultable = (*Condition)(nil)
+)
 
 // +genclient
 // +genclient:noStatus

diff --git a/pkg/apis/pipeline/v1alpha1/pipeline_types.go b/pkg/apis/pipeline/v1alpha1/pipeline_types.go
@@ -40,9 +40,6 @@ type PipelineStatus struct {
 }
 
 // Check that Pipeline may be validated and defaulted.
-var _ apis.Validatable = (*Pipeline)(nil)
-var _ apis.Defaultable = (*Pipeline)(nil)
-
 // TaskKind defines the type of Task used by the pipeline.
 type TaskKind string
 
@@ -53,6 +50,11 @@ const (
  ClusterTaskKind TaskKind = "ClusterTask"
 )
 
+var (
+ _ apis.Validatable = (*Pipeline)(nil)
+ _ apis.Defaultable = (*Pipeline)(nil)
+)
+
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 

diff --git a/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go b/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go
@@ -36,11 +36,11 @@ var (
  Version: SchemeGroupVersion.Version,
  Kind: pipelineRunControllerName,
  }
-)
 
-// Check that TaskRun may be validated and defaulted.
-var _ apis.Validatable = (*PipelineRun)(nil)
-var _ apis.Defaultable = (*PipelineRun)(nil)
+ // Check that TaskRun may be validated and defaulted.
+ _ apis.Validatable = (*PipelineRun)(nil)
+ _ apis.Defaultable = (*PipelineRun)(nil)
+)
 
 // PipelineRunSpec defines the desired state of PipelineRun
 type PipelineRunSpec struct {

diff --git a/pkg/apis/pipeline/v1alpha1/resource_types.go b/pkg/apis/pipeline/v1alpha1/resource_types.go
@@ -50,8 +50,14 @@ const (
  PipelineResourceTypeCloudEvent PipelineResourceType = "cloudEvent"
 )
 
-// AllResourceTypes can be used for validation to check if a provided Resource type is one of the known types.
-var AllResourceTypes = []PipelineResourceType{PipelineResourceTypeGit, PipelineResourceTypeStorage, PipelineResourceTypeImage, PipelineResourceTypeCluster, PipelineResourceTypePullRequest, PipelineResourceTypeCloudEvent}
+var (
+ // AllResourceTypes can be used for validation to check if a provided Resource type is one of the known types.
+ AllResourceTypes = []PipelineResourceType{PipelineResourceTypeGit, PipelineResourceTypeStorage, PipelineResourceTypeImage, PipelineResourceTypeCluster, PipelineResourceTypePullRequest, PipelineResourceTypeCloudEvent}
+
+ // Check that PipelineResource may be validated and defaulted.
+ _ apis.Validatable = (*PipelineResource)(nil)
+ _ apis.Defaultable = (*PipelineResource)(nil)
+)
 
 // PipelineResourceInterface interface to be implemented by different PipelineResource types
 type PipelineResourceInterface interface {
@@ -172,10 +178,6 @@ type PipelineResourceSpec struct {
 type PipelineResourceStatus struct {
 }
 
-// Check that PipelineResource may be validated and defaulted.
-var _ apis.Validatable = (*PipelineResource)(nil)
-var _ apis.Defaultable = (*PipelineResource)(nil)
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 

diff --git a/pkg/apis/pipeline/v1alpha1/task_types.go b/pkg/apis/pipeline/v1alpha1/task_types.go
@@ -22,6 +22,12 @@ import (
  "knative.dev/pkg/apis"
 )
 
+var (
+ // Check that Task may be validated and defaulted.
+ _ apis.Validatable = (*Task)(nil)
+ _ apis.Defaultable = (*Task)(nil)
+)
+
 func (t *Task) TaskSpec() TaskSpec {
  return t.Spec
 }
@@ -73,10 +79,6 @@ type Step struct {
  Script string `json:"script,omitempty"`
 }
 
-// Check that Task may be validated and defaulted.
-var _ apis.Validatable = (*Task)(nil)
-var _ apis.Defaultable = (*Task)(nil)
-
 // +genclient
 // +genclient:noStatus
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_types.go b/pkg/apis/pipeline/v1alpha1/taskrun_types.go
@@ -27,9 +27,11 @@ import (
  duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
 )
 
-// Check that TaskRun may be validated and defaulted.
-var _ apis.Validatable = (*TaskRun)(nil)
-var _ apis.Defaultable = (*TaskRun)(nil)
+var (
+ // Check that TaskRun may be validated and defaulted.
+ _ apis.Validatable = (*TaskRun)(nil)
+ _ apis.Defaultable = (*TaskRun)(nil)
+)
 
 // TaskRunSpec defines the desired state of TaskRun
 type TaskRunSpec struct {