Add String only Params for Triggers

cmd/eventlistenersink/main.go

@@ -86,8 +86,6 @@ func main() {
 		DiscoveryClient:        sinkClients.DiscoveryClient,
 		DynamicClient:          dynamicCS,
 		TriggersClient:         sinkClients.TriggersClient,
-		PipelineClient:         sinkClients.PipelineClient,
-		ResourceClient:         sinkClients.ResourceClient,
 		HTTPClient:             http.DefaultClient,
 		EventListenerName:      sinkArgs.ElName,
 		EventListenerNamespace: sinkArgs.ElNamespace,

pkg/apis/triggers/v1alpha1/event_listener_types.go

@@ -19,7 +19,8 @@ package v1alpha1
 import (
 	"fmt"
 
-	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -95,7 +96,7 @@ type WebhookInterceptor struct {
 	// Header is a group of key-value pairs that can be appended to the
 	// interceptor request headers. This allows the interceptor to make
 	// decisions specific to an EventListenerTrigger.
-	Header []pipelinev1.Param `json:"header,omitempty"`
+	Header []v1beta1.Param `json:"header,omitempty"`
 }
 
 // GitHubInterceptor provides a webhook to intercept and pre-process events

pkg/apis/triggers/v1alpha1/param.go

@@ -0,0 +1,21 @@
+package v1alpha1
+
+// ParamSpec defines an arbitrary named  input whose value can be supplied by a
+// `Param`.
+type ParamSpec struct {
+	// Name declares the name by which a parameter is referenced.
+	Name string `json:"name"`
+	// Description is a user-facing description of the parameter that may be
+	// used to populate a UI.
+	// +optional
+	Description string `json:"description,omitempty"`
+	// Default is the value a parameter takes if no input value via a Param is supplied.
+	// +optional
+	Default *string `json:"default,omitempty"`
+}
+
+// Param defines a string value to be used for a ParamSpec with the same name.
+type Param struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}

pkg/apis/triggers/v1alpha1/trigger_binding_types.go

@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"knative.dev/pkg/apis"
 )
@@ -41,7 +40,7 @@ func (tb *TriggerBinding) Copy() TriggerBindingInterface {
 // TriggerBindingSpec defines the desired state of the TriggerBinding.
 type TriggerBindingSpec struct {
 	// Params defines the parameter mapping from the given input event.
-	Params []pipelinev1.Param `json:"params,omitempty"`
+	Params []Param `json:"params,omitempty"`
 }
 
 // TriggerBindingStatus defines the observed state of TriggerBinding.

pkg/apis/triggers/v1alpha1/trigger_binding_validation.go

@@ -19,7 +19,6 @@ package v1alpha1
 import (
 	"context"
 
-	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"knative.dev/pkg/apis"
 )
 
@@ -36,7 +35,7 @@ func (s *TriggerBindingSpec) Validate(ctx context.Context) *apis.FieldError {
 	return nil
 }
 
-func validateParams(params []v1beta1.Param) *apis.FieldError {
+func validateParams(params []Param) *apis.FieldError {
 	// Ensure there aren't multiple params with the same name.
 	seen := map[string]struct{}{}
 	for _, param := range params {

pkg/apis/triggers/v1alpha1/trigger_template_types.go

@@ -45,8 +45,8 @@ func init() {
 
 // TriggerTemplateSpec holds the desired state of TriggerTemplate
 type TriggerTemplateSpec struct {
-	Params            []pipelinev1beta1.ParamSpec `json:"params,omitempty"`
-	ResourceTemplates []TriggerResourceTemplate   `json:"resourcetemplates,omitempty"`
+	Params            []ParamSpec               `json:"params,omitempty"`
+	ResourceTemplates []TriggerResourceTemplate `json:"resourcetemplates,omitempty"`
 }
 
 // TriggerResourceTemplate describes a resource to create

pkg/apis/triggers/v1alpha1/trigger_template_validation.go

@@ -22,7 +22,6 @@ import (
 	"regexp"
 	"strings"
 
-	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	"github.com/tektoncd/pipeline/pkg/apis/validate"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -86,7 +85,7 @@ func validateResourceTemplates(templates []TriggerResourceTemplate) *apis.FieldE
 }
 
 // Verify every param in the ResourceTemplates is declared with a ParamSpec
-func verifyParamDeclarations(params []pipelinev1.ParamSpec, templates []TriggerResourceTemplate) *apis.FieldError {
+func verifyParamDeclarations(params []ParamSpec, templates []TriggerResourceTemplate) *apis.FieldError {
 	declaredParamNames := map[string]struct{}{}
 	for _, param := range params {
 		declaredParamNames[param.Name] = struct{}{}

pkg/logging/logging.go

@@ -20,7 +20,7 @@ import (
 	"flag"
 	"log"
 
-	"github.com/tektoncd/pipeline/pkg/system"
+	"github.com/tektoncd/triggers/pkg/system"
 	"go.uber.org/zap"
 	"k8s.io/client-go/kubernetes"
 	"knative.dev/pkg/configmap"

pkg/reconciler/reconciler.go

@@ -19,8 +19,6 @@ package reconciler
 import (
 	"time"
 
-	pipelineclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned"
-	resourceclientset "github.com/tektoncd/pipeline/pkg/client/resource/clientset/versioned"
 	triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned"
 	triggersScheme "github.com/tektoncd/triggers/pkg/client/clientset/versioned/scheme"
 	"go.uber.org/zap"
@@ -39,8 +37,6 @@ import (
 // creating our controllers.
 type Options struct {
 	KubeClientSet     kubernetes.Interface
-	PipelineClientSet pipelineclientset.Interface
-	ResourceClientSet resourceclientset.Interface
 	TriggersClientSet triggersclientset.Interface
 	CachingClientSet  cachingclientset.Interface
 
@@ -64,12 +60,6 @@ type Base struct {
 	// KubeClientSet allows us to talk to the k8s for core APIs
 	KubeClientSet kubernetes.Interface
 
-	// PipelineClientSet allows us to configure pipeline objects
-	PipelineClientSet pipelineclientset.Interface
-
-	// ResourceClientSet allows us to configure pipeline resource objects
-	ResourceClientSet resourceclientset.Interface
-
 	// TriggersClientSet allows us to configure triggers objects
 	TriggersClientSet triggersclientset.Interface
 
@@ -114,8 +104,6 @@ func NewBase(opt Options, controllerAgentName string) *Base {
 
 	base := &Base{
 		KubeClientSet:     opt.KubeClientSet,
-		PipelineClientSet: opt.PipelineClientSet,
-		ResourceClientSet: opt.ResourceClientSet,
 		TriggersClientSet: opt.TriggersClientSet,
 		CachingClientSet:  opt.CachingClientSet,
 		ConfigMapWatcher:  opt.ConfigMapWatcher,

pkg/reconciler/v1alpha1/eventlistener/controller.go

@@ -21,8 +21,6 @@ import (
 	"os"
 	"time"
 
-	pipelineclient "github.com/tektoncd/pipeline/pkg/client/injection/client"
-	resourceclient "github.com/tektoncd/pipeline/pkg/client/resource/injection/client"
 	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
 	triggersclient "github.com/tektoncd/triggers/pkg/client/injection/client"
 	eventlistenerinformer "github.com/tektoncd/triggers/pkg/client/injection/informers/triggers/v1alpha1/eventlistener"
@@ -44,17 +42,13 @@ const (
 func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
 	logger := logging.FromContext(ctx)
 	kubeclientset := kubeclient.Get(ctx)
-	pipelineclientset := pipelineclient.Get(ctx)
-	resourceclientset := resourceclient.Get(ctx)
 	triggersclientset := triggersclient.Get(ctx)
 	eventListenerInformer := eventlistenerinformer.Get(ctx)
 	deploymentInformer := deployinformer.Get(ctx)
 	serviceInformer := serviceinformer.Get(ctx)
 
 	opt := reconciler.Options{
 		KubeClientSet:     kubeclientset,
-		PipelineClientSet: pipelineclientset,
-		ResourceClientSet: resourceclientset,
 		TriggersClientSet: triggersclientset,
 		ConfigMapWatcher:  cmw,
 		Logger:            logger,

pkg/reconciler/v1alpha1/eventlistener/eventlistener_test.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/tektoncd/pipeline/pkg/system"
 	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	"github.com/tektoncd/triggers/pkg/system"
 	"github.com/tektoncd/triggers/test"
 	bldr "github.com/tektoncd/triggers/test/builder"
 	appsv1 "k8s.io/api/apps/v1"

pkg/sink/initialization.go

@@ -19,8 +19,6 @@ package sink
 import (
 	"flag"
 
-	pipelineclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned"
-	resourceclientset "github.com/tektoncd/pipeline/pkg/client/resource/clientset/versioned"
 	triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned"
 	"golang.org/x/xerrors"
 	discoveryclient "k8s.io/client-go/discovery"
@@ -60,8 +58,6 @@ type Clients struct {
 	DiscoveryClient discoveryclient.DiscoveryInterface
 	RESTClient      restclient.Interface
 	TriggersClient  triggersclientset.Interface
-	PipelineClient  pipelineclientset.Interface
-	ResourceClient  resourceclientset.Interface
 }
 
 // GetArgs returns the flagged Args
@@ -97,20 +93,10 @@ func ConfigureClients() (Clients, error) {
 	if err != nil {
 		return Clients{}, xerrors.Errorf("Failed to create TriggersClient: %s", err)
 	}
-	pipelineclient, err := pipelineclientset.NewForConfig(clusterConfig)
-	if err != nil {
-		return Clients{}, xerrors.Errorf("Failed to create PipelineClient: %s", err)
-	}
-	resourceclient, err := resourceclientset.NewForConfig(clusterConfig)
-	if err != nil {
-		return Clients{}, xerrors.Errorf("Failed to create ResourceClient: %s", err)
-	}
 
 	return Clients{
 		DiscoveryClient: kubeClient.Discovery(),
 		RESTClient:      kubeClient.RESTClient(),
 		TriggersClient:  triggersClient,
-		PipelineClient:  pipelineclient,
-		ResourceClient:  resourceclient,
 	}, nil
 }

pkg/sink/sink.go

@@ -24,8 +24,6 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	pipelineclientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned"
-	resourceclientset "github.com/tektoncd/pipeline/pkg/client/resource/clientset/versioned"
 	triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
 	triggersclientset "github.com/tektoncd/triggers/pkg/client/clientset/versioned"
 	"github.com/tektoncd/triggers/pkg/interceptors"
@@ -50,8 +48,6 @@ type Sink struct {
 	TriggersClient         triggersclientset.Interface
 	DiscoveryClient        discoveryclient.ServerResourcesInterface
 	DynamicClient          dynamic.Interface
-	PipelineClient         pipelineclientset.Interface
-	ResourceClient         resourceclientset.Interface
 	HTTPClient             *http.Client
 	EventListenerName      string
 	EventListenerNamespace string
@@ -164,7 +160,8 @@ func (r Sink) processTrigger(t *triggersv1.EventListenerTrigger, request *http.R
 		log.Error(err)
 		return err
 	}
-	log.Info("params: %+v", params)
+
+	log.Infof("ResolvedParams : %+v", params)
 	resources := template.ResolveResources(rt.TriggerTemplate, params)
 	token, err := r.retrieveAuthToken(t.ServiceAccount, eventLog)
 	if err != nil {