fix(cdevents-webhooks) : Adding support for Artifact Constraints and Parameters using CDEvents data

gate-core/src/main/java/com/netflix/spinnaker/gate/services/internal/EchoService.java

@@ -24,6 +24,7 @@ public interface EchoService {
   ResponseEntity<Void> webhooks(
       @Path("source") String source,
       @Body CloudEvent cdevent,
+      @Header("Ce-Data") String ceDataJsonString,
       @Header("Ce-Id") String cdId,
       @Header("Ce-Specversion") String cdSpecVersion,
       @Header("Ce-Type") String cdType,

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/WebhookController.groovy

@@ -29,6 +29,8 @@ import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
 import io.cloudevents.CloudEvent
 
+import java.nio.charset.StandardCharsets
+
 @RestController
 @RequestMapping("/webhooks")
 class WebhookController {
@@ -54,10 +56,10 @@ class WebhookController {
   @ApiOperation(value = "Endpoint for posting webhooks to Spinnaker's CDEvents webhook service")
   @RequestMapping(value = "/cdevents/{source}", method = RequestMethod.POST)
   ResponseEntity<Void> webhooks(@PathVariable String source,
-                                @RequestBody CloudEvent cdevent,
-                                @RequestHeader HttpHeaders headers)
+                                @RequestBody CloudEvent cdEvent)
   {
-    webhookService.webhooks(source, cdevent, headers)
+    String ceDataJsonString = new String(cdEvent.getData().toBytes(), StandardCharsets.UTF_8);
+    webhookService.webhooks(source, cdEvent, ceDataJsonString)
   }
 
   @ApiOperation(value = "Retrieve a list of preconfigured webhooks in Orca")

gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/WebhookService.groovy

@@ -56,9 +56,9 @@ class WebhookService {
     })
   }
 
-  ResponseEntity<Void> webhooks(String source, CloudEvent cdevent, HttpHeaders headers) {
+  ResponseEntity<Void> webhooks(String source, CloudEvent cdEvent, String ceDataJsonString) {
     return AuthenticatedRequest.allowAnonymous( {
-      echoService.webhooks(source, cdevent, headers.get("Ce-Id").get(0), headers.get("Ce-Specversion").get(0), headers.get("Ce-Type").get(0), headers.get("Ce-Source").get(0))
+      echoService.webhooks(source, cdEvent, ceDataJsonString, cdEvent.getId(), cdEvent.getSpecVersion().V1.toString(), cdEvent.getType(), cdEvent.getSource().toString())
     })
   }
 

gate-web/src/test/groovy/com/netflix/spinnaker/gate/controllers/WebhookControllerSpec.groovy

@@ -118,13 +118,30 @@ class WebhooksControllerSpec extends Specification {
     headers.add("Ce-Type", "dev.cdevents.artifact.packaged")
     headers.add("Ce-Source", "spinnaker.test.io")
     headers.add("Content-Type", "application/cloudevents+json")
-    String payload = "{\"id\": \"1234\", \"subject\": \"event\"}"
+    String cdEventData = "{\n" +
+      "  \"context\": {\n" +
+      "    \"version\": \"0.1.2\",\n" +
+      "    \"id\": \"c046b63b-a340-4847-bc39-ee408ad666d9\",\n" +
+      "    \"source\": \"http://dev.cdevents\",\n" +
+      "    \"type\": \"dev.cdevents.artifact.published.0.1.0\",\n" +
+      "    \"timestamp\": \"2023-11-28T15:33:03Z\"\n" +
+      "  },\n" +
+      "  \"subject\": {\n" +
+      "    \"id\": \"pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b\",\n" +
+      "    \"source\": \"/dev/artifact/source\",\n" +
+      "    \"type\": \"artifact\",\n" +
+      "    \"content\": {\n" +
+      "    }\n" +
+      "  },\n" +
+      "  \"customData\": {},\n" +
+      "  \"customDataContentType\": \"application/json\"\n" +
+      "}"
     Map<String, Object> cdEvent = [
       specversion: "1.0",
       type: "dev.cdevents.artifact.packaged",
       source: "/spinnaker.test.io",
       id: "12345",
-      data: payload
+      data: cdEventData
     ]
 
     when: