Merge pull request #194 from NHSDigital/master

matt-mercer · web-flow · commit 41b3e975847b · 2021-01-13T13:01:34.000Z
APM-1733 Fix Apidoc bugs
diff --git a/ansible/roles/deploy-apigee-product-and-spec/tasks/deploy-product-and-apidoc.yml b/ansible/roles/deploy-apigee-product-and-spec/tasks/deploy-product-and-apidoc.yml
@@ -105,4 +105,4 @@
 
     - name: update remote snapshot
       include: update-snapshot.yml
-      when: true
+      when: SPEC_FILE
diff --git a/ansible/roles/deploy-apigee-product-and-spec/tasks/update-api-doc.yml b/ansible/roles/deploy-apigee-product-and-spec/tasks/update-api-doc.yml
@@ -50,10 +50,6 @@
           - "status: {{ update_apidoc.status }}"
           - "error: {{ update_apidoc.msg }}"
 
-    - name: update local apidoc
-      set_fact:
-        apidoc: "{{ existing_apidocs[0] | default(update_apidoc.json.data) }}"
-
   rescue:
     - fail:
         msg: Maximum retries of create api docs been reached tasks reached
diff --git a/ansible/roles/deploy-apigee-product-and-spec/tasks/update-snapshot.yml b/ansible/roles/deploy-apigee-product-and-spec/tasks/update-snapshot.yml
@@ -8,6 +8,10 @@
         msg: "Retry count: {{ snapshot_retry_count }}"
       when: snapshot_retry_count | int > 0
 
+    - name: update local apidoc
+      set_fact:
+        apidoc: "{{ create_apidoc.json.data | default(update_apidoc.json.data) }}"
+
     - name: Update remote snapshot
       uri:
         url: "{{ portals_base_uri }}/{{ portal_id }}/apidocs/{{ apidoc.id }}/snapshot"
