fix(pubsub): s/artifacts/receivedArtifacts/ in Pipelines. (spinnaker#174

)
atyutyunnik · Sep 27, 2017 · cdf1a9f · cdf1a9f
1 parent 2715eba
commit cdf1a9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Pipeline.java b/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Pipeline.java
@@ -71,7 +71,7 @@
   List<Map<String, Object>> notifications;
 
   @JsonProperty
-  List<Artifact> artifacts;
+  List<Artifact> receivedArtifacts;
 
   @JsonProperty
   List<Map<String, Object>> parameterConfig;

diff --git a/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitor.java b/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitor.java
@@ -85,7 +85,7 @@ protected Function<Trigger, Pipeline> buildTrigger(Pipeline pipeline, TriggerEve
     PubsubEvent pubsubEvent = (PubsubEvent) event;
     MessageDescription description = pubsubEvent.getContent().getMessageDescription();
     return trigger -> pipeline
-        .withArtifacts(description.getArtifacts())
+        .withReceivedArtifacts(description.getArtifacts())
         .withTrigger(trigger.atMessageDescription(description.getSubscriptionName(), description.getPubsubSystem().toString()));
   }
 

diff --git a/.../test/groovy/com/netflix/spinnaker/echo/pubsub/utils/MessageArtifactTranslatorSpec.groovy b/.../test/groovy/com/netflix/spinnaker/echo/pubsub/utils/MessageArtifactTranslatorSpec.groovy
@@ -75,7 +75,7 @@ class MessageArtifactTranslatorSpec extends Specification {
   def "can deserialize several artifacts from a list with jinja magic"() {
     String template = '''
     [
-        {% for artifact in artifacts %}
+        {% for artifact in receivedArtifacts %}
         {
             "reference": "{{ artifact['id'] }}",
             "type": "{{ artifact['type'] }}"
@@ -85,7 +85,7 @@ class MessageArtifactTranslatorSpec extends Specification {
     '''
     String payload = '''
     {
-        "artifacts": [
+        "receivedArtifacts": [
             {"id": "gs://this/is/my/id1", "type": "gcs/object"},
             {"id": "gs://this/is/my/id2", "type": "tarball"},
             {"id": "gs://this/is/my/id3", "type": "binary"}