feat(webhook): SImplify trigger ref in EventSource

tommy351 · Dec 15, 2020 · ac87aa8 · ac87aa8
1 parent 73a9af9
commit ac87aa8
Show file tree

Hide file tree

Showing 32 changed files with 56 additions and 221 deletions.
diff --git a/deployment/base/crds/pullup.dev_githubwebhooks.yaml b/deployment/base/crds/pullup.dev_githubwebhooks.yaml
@@ -121,25 +121,14 @@ spec:
               triggers:
                 items:
                   properties:
-                    ref:
-                      properties:
-                        apiVersion:
-                          type: string
-                        kind:
-                          type: string
-                        name:
-                          type: string
-                        namespace:
-                          type: string
-                      required:
-                      - apiVersion
-                      - kind
-                      - name
-                      type: object
+                    name:
+                      type: string
+                    namespace:
+                      type: string
                     transform:
                       x-kubernetes-preserve-unknown-fields: true
                   required:
-                  - ref
+                  - name
                   type: object
                 type: array
             required:

diff --git a/deployment/base/crds/pullup.dev_httpwebhooks.yaml b/deployment/base/crds/pullup.dev_httpwebhooks.yaml
@@ -63,25 +63,14 @@ spec:
               triggers:
                 items:
                   properties:
-                    ref:
-                      properties:
-                        apiVersion:
-                          type: string
-                        kind:
-                          type: string
-                        name:
-                          type: string
-                        namespace:
-                          type: string
-                      required:
-                      - apiVersion
-                      - kind
-                      - name
-                      type: object
+                    name:
+                      type: string
+                    namespace:
+                      type: string
                     transform:
                       x-kubernetes-preserve-unknown-fields: true
                   required:
-                  - ref
+                  - name
                   type: object
                 type: array
             type: object

diff --git a/internal/webhook/github/testdata/beta/action.yml b/internal/webhook/github/testdata/beta/action.yml
@@ -19,7 +19,4 @@ spec:
       push: {}
       pullRequest: {}
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/pull-request-branch-exclude.yml b/internal/webhook/github/testdata/beta/pull-request-branch-exclude.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/pull-request-branch-include.yml b/internal/webhook/github/testdata/beta/pull-request-branch-include.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/pull-request-label-exclude.yml b/internal/webhook/github/testdata/beta/pull-request-label-exclude.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/pull-request-label-include.yml b/internal/webhook/github/testdata/beta/pull-request-label-include.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/pull-request-type.yml b/internal/webhook/github/testdata/beta/pull-request-type.yml
@@ -23,7 +23,4 @@ spec:
         types:
           - labeled
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/push-branch-exclude.yml b/internal/webhook/github/testdata/beta/push-branch-exclude.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/push-branch-include.yml b/internal/webhook/github/testdata/beta/push-branch-include.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/push-tag-exclude.yml b/internal/webhook/github/testdata/beta/push-tag-exclude.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/push-tag-include.yml b/internal/webhook/github/testdata/beta/push-tag-include.yml
@@ -25,7 +25,4 @@ spec:
             - foo
             - /bar-\d/
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/resource-exists.yml b/internal/webhook/github/testdata/beta/resource-exists.yml
@@ -18,10 +18,7 @@ spec:
       push: {}
       pullRequest: {}
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
 ---
 apiVersion: pullup.dev/v1beta1
 kind: ResourceTemplate

diff --git a/internal/webhook/github/testdata/beta/resource-not-exist.yml b/internal/webhook/github/testdata/beta/resource-not-exist.yml
@@ -18,7 +18,4 @@ spec:
       push: {}
       pullRequest: {}
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/github/testdata/beta/without-event-filters.yml b/internal/webhook/github/testdata/beta/without-event-filters.yml
@@ -14,7 +14,4 @@ spec:
   repositories:
     - name: foo/bar
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/hookutil/trigger.go b/internal/webhook/hookutil/trigger.go
@@ -127,7 +127,10 @@ func (t *TriggerHandler) renderAction(options *TriggerOptions) (v1beta1.Action,
 
 func (t *TriggerHandler) renderTrigger(ctx context.Context, st *v1beta1.EventSourceTrigger, options *TriggerOptions) (*RenderedTrigger, error) {
 	trigger := new(v1beta1.Trigger)
-	triggerKey := st.Ref.NamespacedName()
+	triggerKey := types.NamespacedName{
+		Name:      st.Name,
+		Namespace: st.Namespace,
+	}
 
 	if triggerKey.Namespace == "" {
 		triggerKey.Namespace = options.Source.GetNamespace()

diff --git a/internal/webhook/hookutil/trigger_test.go b/internal/webhook/hookutil/trigger_test.go
@@ -116,13 +116,7 @@ var _ = Describe("TriggerHandler", func() {
 			options = &TriggerOptions{
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})
@@ -277,13 +271,7 @@ var _ = Describe("TriggerHandler", func() {
 				Action: v1beta1.ActionApply,
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-xyz",
-						},
-					},
+					{Name: "trigger-xyz"},
 				},
 			}
 		})
@@ -305,20 +293,8 @@ var _ = Describe("TriggerHandler", func() {
 				Action: v1beta1.ActionApply,
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-b",
-						},
-					},
+					{Name: "trigger-a"},
+					{Name: "trigger-b"},
 				},
 			}
 		})
@@ -362,12 +338,8 @@ var _ = Describe("TriggerHandler", func() {
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
 					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "foobar",
-							Namespace:  namespaceMap.GetRandom("test2"),
-						},
+						Name:      "foobar",
+						Namespace: namespaceMap.GetRandom("test2"),
 					},
 				},
 			}
@@ -386,13 +358,7 @@ var _ = Describe("TriggerHandler", func() {
 				Action: v1beta1.ActionApply,
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})
@@ -450,13 +416,7 @@ var _ = Describe("TriggerHandler", func() {
 				Action: v1beta1.ActionApply,
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})
@@ -482,11 +442,7 @@ var _ = Describe("TriggerHandler", func() {
 				},
 				Triggers: []v1beta1.EventSourceTrigger{
 					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
+						Name: "trigger-a",
 						Transform: &extv1.JSON{Raw: testutil.MustMarshalJSON(map[string]interface{}{
 							"foo": "{{ .event.bar }}",
 							"bar": "{{ .event.foo }}",
@@ -509,13 +465,7 @@ var _ = Describe("TriggerHandler", func() {
 				Action: "foo",
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})
@@ -535,13 +485,7 @@ var _ = Describe("TriggerHandler", func() {
 				DefaultAction: v1beta1.ActionCreate,
 				Source:        webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})
@@ -580,13 +524,7 @@ var _ = Describe("TriggerHandler", func() {
 				Action: "{{ .event.foo }}",
 				Source: webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 				Event: map[string]interface{}{
 					"foo": "create",
@@ -615,13 +553,7 @@ var _ = Describe("TriggerHandler", func() {
 				DefaultAction: v1beta1.ActionCreate,
 				Source:        webhook,
 				Triggers: []v1beta1.EventSourceTrigger{
-					{
-						Ref: v1beta1.ObjectReference{
-							APIVersion: "pullup.dev/v1beta1",
-							Kind:       "Trigger",
-							Name:       "trigger-a",
-						},
-					},
+					{Name: "trigger-a"},
 				},
 			}
 		})

diff --git a/internal/webhook/http/testdata/action.yml b/internal/webhook/http/testdata/action.yml
@@ -19,7 +19,4 @@ metadata:
 spec:
   action: update
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
diff --git a/internal/webhook/http/testdata/resource-template-exists.yml b/internal/webhook/http/testdata/resource-template-exists.yml
@@ -18,10 +18,7 @@ metadata:
   namespace: test
 spec:
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar
 ---
 apiVersion: pullup.dev/v1beta1
 kind: ResourceTemplate

diff --git a/internal/webhook/http/testdata/resource-template-not-exist.yml b/internal/webhook/http/testdata/resource-template-not-exist.yml
@@ -18,7 +18,4 @@ metadata:
   namespace: test
 spec:
   triggers:
-    - ref:
-        apiVersion: pullup.dev/v1beta1
-        kind: Trigger
-        name: foobar
+    - name: foobar