Merge pull request #122 from sstone1/issue-120

Find components by display name in software (resolves #118)

Author: Simon Stone

tasks/saas/create-orderer.yml

@@ -42,8 +42,7 @@
       ibp_components.json |
       selectattr('cluster_name', 'defined') |
       selectattr('cluster_name', 'eq', orderer.ibp.cluster_name) |
-      list |
-      length
+      list
     }}"
 
 - name: Create orderer
@@ -54,7 +53,7 @@
       Authorization: "Bearer {{ ibp.saas.access_token }}"
     body_format: json
     body: "{{ lookup('template', 'saas/create-orderer.json.j2') }}"
-  when: ibp_orderer_count == "0"
+  when: not ibp_orderer_count
 
 - name: Get the list of components
   uri:

tasks/software/create-ca.yml

@@ -2,18 +2,24 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
-- name: Check for certificate authority
+- name: Get the list of components
   uri:
-    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components/{{ ca.id }}"
+    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components"
     url_username: "{{ infrastructure.software.api_key }}"
     url_password: "{{ infrastructure.software.api_secret }}"
-    method: HEAD
+    method: GET
     return_content: yes
-    status_code:
-    - "200"
-    - "404"
     validate_certs: no
-  register: ibp_ca
+  register: ibp_components
+
+- name: Check for certificate authority
+  set_fact:
+    ibp_ca_count: "{{
+      ibp_components.json |
+      selectattr('display_name', 'defined') |
+      selectattr('display_name', 'eq', ca.ibp.display_name) |
+      list
+    }}"
 
 - name: Create certificate authority
   uri:
@@ -24,21 +30,30 @@
     body_format: json
     body: "{{ lookup('template', 'software/create-ca.json.j2') }}"
     validate_certs: no
-  when: ibp_ca.status == 404
+  when: not ibp_ca_count
 
-- name: Get certificate authority
+- name: Get the list of components
   uri:
-    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components/{{ ca.id }}"
+    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components"
     url_username: "{{ infrastructure.software.api_key }}"
     url_password: "{{ infrastructure.software.api_secret }}"
     method: GET
     return_content: yes
     validate_certs: no
-  register: ibp_ca
+  register: ibp_components
+
+- name: Get certificate authority
+  set_fact:
+    ibp_ca: "{{
+      ibp_components.json |
+      selectattr('display_name', 'defined') |
+      selectattr('display_name', 'eq', ca.ibp.display_name) |
+      first
+    }}"
 
 - name: Wait for certificate authority to start
   uri:
-    url: "{{ ibp_ca.json.api_url }}/cainfo"
+    url: "{{ ibp_ca.api_url }}/cainfo"
     status_code: "200"
     validate_certs: no
   register: result
@@ -53,7 +68,7 @@
 
 - name: Wait for TLS certificate authority to start
   uri:
-    url: "{{ ibp_ca.json.api_url }}/cainfo?ca={{ ibp_ca.json.tlsca_name }}"
+    url: "{{ ibp_ca.api_url }}/cainfo?ca={{ ibp_ca.tlsca_name }}"
     status_code: "200"
     validate_certs: no
   register: result
@@ -68,7 +83,7 @@
 
 - name: Copy the TLS CA root certificate (for the certificate authority component)
   copy:
-    content: "{{ ibp_ca.json.tls_cert | b64decode }}"
+    content: "{{ ibp_ca.tls_cert | b64decode }}"
     dest: "{{ organization.wallet }}/ca-tls-root.pem"
   when: ca.tls.enabled
 
@@ -78,11 +93,11 @@
       ibp |
       combine({
         ca.id: {
-          'protocol': ibp_ca.json.api_url | urlsplit('scheme'),
-          'hostname': ibp_ca.json.api_url | urlsplit('hostname'),
-          'port': ibp_ca.json.api_url | urlsplit('port'),
+          'protocol': ibp_ca.api_url | urlsplit('scheme'),
+          'hostname': ibp_ca.api_url | urlsplit('hostname'),
+          'port': ibp_ca.api_url | urlsplit('port'),
           'pem': organization.wallet + '/tls-root.pem' if ca.tls.enabled else '',
-          'caname': ibp_ca.json.ca_name, 'tlscaname': ibp_ca.json.tlsca_name
+          'caname': ibp_ca.ca_name, 'tlscaname': ibp_ca.tlsca_name
         }
       }, recursive=True)
     }}"

tasks/software/create-msp.yml

@@ -2,18 +2,24 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 ---
-- name: Check for MSP
+- name: Get the list of components
   uri:
-    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components/{{ organization.msp.id }}"
+    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components"
     url_username: "{{ infrastructure.software.api_key }}"
     url_password: "{{ infrastructure.software.api_secret }}"
-    method: HEAD
+    method: GET
     return_content: yes
-    status_code:
-    - "200"
-    - "404"
     validate_certs: no
-  register: ibp_msp
+  register: ibp_components
+
+- name: Check for MSP
+  set_fact:
+    ibp_msp_count: "{{
+      ibp_components.json |
+      selectattr('display_name', 'defined') |
+      selectattr('display_name', 'eq', organization.msp.ibp.display_name) |
+      list
+    }}"
 
 - name: Create MSP
   uri:
@@ -24,4 +30,4 @@
     body_format: json
     body: "{{ lookup('template', 'software/create-msp.json.j2') }}"
     validate_certs: no
-  when: ibp_msp.status == 404
+  when: not ibp_msp_count

tasks/software/create-orderer.yml

@@ -43,8 +43,7 @@
       ibp_components.json |
       selectattr('cluster_name', 'defined') |
       selectattr('cluster_name', 'eq', orderer.ibp.cluster_name) |
-      list |
-      length
+      list
     }}"
 
 - name: Create orderer
@@ -56,7 +55,7 @@
     body_format: json
     body: "{{ lookup('template', 'software/create-orderer.json.j2') }}"
     validate_certs: no
-  when: ibp_orderer_count == "0"
+  when: not ibp_orderer_count
 
 - name: Get the list of components
   uri:
@@ -70,7 +69,12 @@
 
 - name: Get orderer
   set_fact:
-    ibp_orderer: "{{ ibp_components.json | selectattr('cluster_name', 'defined') | selectattr('cluster_name', 'eq', orderer.ibp.cluster_name) | first }}"
+    ibp_orderer: "{{
+      ibp_components.json |
+      selectattr('cluster_name', 'defined') |
+      selectattr('cluster_name', 'eq', orderer.ibp.cluster_name) |
+      first
+    }}"
 
 - name: Wait for orderer to start
   uri:

tasks/software/create-peer.yml

@@ -27,18 +27,24 @@
     registrar: "{{ organization.ca.admin_identity }}"
   when: peer.tls.enabled
 
-- name: Check for peer
+- name: Get the list of components
   uri:
-    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components/{{ peer.id }}"
+    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components"
     url_username: "{{ infrastructure.software.api_key }}"
     url_password: "{{ infrastructure.software.api_secret }}"
-    method: HEAD
+    method: GET
     return_content: yes
-    status_code:
-    - "200"
-    - "404"
     validate_certs: no
-  register: ibp_peer
+  register: ibp_components
+
+- name: Check for peer
+  set_fact:
+    ibp_peer_count: "{{
+      ibp_components.json |
+      selectattr('display_name', 'defined') |
+      selectattr('display_name', 'eq', peer.ibp.display_name) |
+      list
+    }}"
 
 - name: Create peer
   uri:
@@ -49,21 +55,30 @@
     body_format: json
     body: "{{ lookup('template', 'software/create-peer.json.j2') }}"
     validate_certs: no
-  when: ibp_peer.status == 404
+  when: not ibp_peer_count
 
-- name: Get peer
+- name: Get the list of components
   uri:
-    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components/{{ peer.id }}"
+    url: "{{ infrastructure.software.api_endpoint }}/ak/api/v1/components"
     url_username: "{{ infrastructure.software.api_key }}"
     url_password: "{{ infrastructure.software.api_secret }}"
     method: GET
     return_content: yes
     validate_certs: no
-  register: ibp_peer
+  register: ibp_components
+
+- name: Get peer
+  set_fact:
+    ibp_peer: "{{
+      ibp_components.json |
+      selectattr('display_name', 'defined') |
+      selectattr('display_name', 'eq', peer.ibp.display_name) |
+      first
+    }}"
 
 - name: Wait for peer to start
   uri:
-    url: "{{ ibp_peer.json.operations_url }}/healthz"
+    url: "{{ ibp_peer.operations_url }}/healthz"
     status_code: "200"
     validate_certs: no
   register: result
@@ -77,9 +92,9 @@
       ibp |
       combine({
         peer.id: {
-          'protocol': ibp_peer.json.api_url | urlsplit('scheme'),
-          'hostname': ibp_peer.json.api_url | urlsplit('hostname'),
-          'port': ibp_peer.json.api_url | urlsplit('port'),
+          'protocol': ibp_peer.api_url | urlsplit('scheme'),
+          'hostname': ibp_peer.api_url | urlsplit('hostname'),
+          'port': ibp_peer.api_url | urlsplit('port'),
           'pem': organization.wallet + '/tls-root.pem' if peer.tls.enabled else ''
         }
       }, recursive=True)