Merge pull request #4 from IBM/cleanups

Cleanups for linting
IBM · Dec 15, 2018 · f6352da · f6352da
2 parents b73c98f + aa32052
commit f6352da
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 68 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/meta/main.yml b/meta/main.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,7 @@
 galaxy_info:
 
   author: Christopher Grote
+  description: Automates deployment and management of custom asset types for IBM Information Governance Catalog
   company: IBM
   license: Apache 2.0
 

diff --git a/tasks/assets.yml b/tasks/assets.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,13 +16,15 @@
 ###
 
 - name: upload any instances of OpenIGC assets
-  shell: >
-          curl
-          -X POST "https://{{ ibm_infosvr_openigc_services_host }}:{{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/assets/"
-          -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }}
-          {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}--cacert cache/__ibm_infosvr_cert_root.crt{% endif %}
-          --header "Content-Type:application/xml"
-          -f -d @{{ item }}
+  command: "curl -X POST \
+            'https://{{ ibm_infosvr_openigc_services_host }}:\
+            {{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/assets/' \
+            -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }} \
+            {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}
+            --cacert cache/__ibm_infosvr_cert_root.crt \
+            {% endif %}
+            --header 'Content-Type:application/xml' \
+            -f -d @{{ item }}"
   args:
     warn: False
   with_items: "{{ assets_as_xml }}"

diff --git a/tasks/assets_from_template.yml b/tasks/assets_from_template.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,21 +16,21 @@
 ###
 
 - name: ensure generated directory exists
-  local_action:
-    module: file
+  file:
     path: generated/
     state: directory
+  delegate_to: localhost
 
 - name: load variables
   include_vars:
     file: "{{ outer_item }}"
     name: __ibm_infosvr_openigc_assets
 
 - name: generate asset XML from variables
-  local_action:
-    module: template
+  template:
     src: assets.xml.j2
     dest: generated/{{ outer_item | basename }}.xml
+  delegate_to: localhost
 
 - name: load asset instances
   include_tasks: assets.yml

diff --git a/tasks/bundles.yml b/tasks/bundles.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,50 +16,56 @@
 ###
 
 - name: ensure generated directory exists
-  local_action:
-    module: file
+  file:
     path: generated/
     state: directory
+  delegate_to: localhost
 
 - name: package each bundle into a zip archive
-  local_action:
-    module: archive
+  archive:
     format: zip
     path: "{{ outer_item }}/*"
     dest: "generated/{{ outer_item | basename }}.zip"
     remove: no
+  delegate_to: localhost
 
 - name: check for existing OpenIGC bundles that are registered
-  shell: >
-          curl
-          -X GET "https://{{ ibm_infosvr_openigc_services_host }}:{{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/"
-          -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }}
-          {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}--cacert cache/__ibm_infosvr_cert_root.crt{% endif %}
-          -f
+  command: "curl -X GET \
+            'https://{{ ibm_infosvr_openigc_services_host }}:\
+            {{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/' \
+            -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }} \
+            {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}
+            --cacert cache/__ibm_infosvr_cert_root.crt \
+            {% endif %}
+            -f"
   args:
     warn: False
   delegate_to: localhost
   register: ibm_infosvr_openigc_existing_bundles
 
 - name: create OpenIGC bundles that are not registered
-  shell: >
-          curl
-          -X POST "https://{{ ibm_infosvr_openigc_services_host }}:{{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/"
-          -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }}
-          {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}--cacert cache/__ibm_infosvr_cert_root.crt{% endif %}
-          -f -F file=@generated/{{ outer_item | basename }}.zip
+  command: "curl -X POST \
+            'https://{{ ibm_infosvr_openigc_services_host }}:\
+            {{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/' \
+            -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }} \
+            {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}
+            --cacert cache/__ibm_infosvr_cert_root.crt \
+            {% endif %}
+            -f -F file=@generated/{{ outer_item | basename }}.zip"
   args:
     warn: False
   delegate_to: localhost
   when: not ((outer_item | basename) in (ibm_infosvr_openigc_existing_bundles.stdout | to_json))
 
 - name: update OpenIGC bundles that are already registered
-  shell: >
-          curl
-          -X PUT "https://{{ ibm_infosvr_openigc_services_host }}:{{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/"
-          -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }}
-          {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}--cacert cache/__ibm_infosvr_cert_root.crt{% endif %}
-          -f -F file=@generated/{{ outer_item | basename }}.zip
+  command: "curl -X PUT \
+            'https://{{ ibm_infosvr_openigc_services_host }}:\
+            {{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/bundles/' \
+            -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }} \
+            {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}
+            --cacert cache/__ibm_infosvr_cert_root.crt \
+            {% endif %}
+            -f -F file=@generated/{{ outer_item | basename }}.zip"
   args:
     warn: False
   delegate_to: localhost

diff --git a/tasks/flows.yml b/tasks/flows.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,13 +16,15 @@
 ###
 
 - name: upload any lineage flows
-  shell: >
-          curl
-          -X POST "https://{{ ibm_infosvr_openigc_services_host }}:{{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/flows/upload/"
-          -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }}
-          {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}--cacert cache/__ibm_infosvr_cert_root.crt{% endif %}
-          --header "Content-Type:application/xml"
-          -f -d @{{ item }}
+  command: "curl -X POST \
+            'https://{{ ibm_infosvr_openigc_services_host }}:\
+            {{ ibm_infosvr_openigc_services_console_port }}/ibm/iis/igc-rest/v1/flows/upload/' \
+            -u {{ ibm_infosvr_openigc_admin_user }}:{{ ibm_infosvr_openigc_admin_user_pwd }} \
+            {% if ibm_infosvr_openigc_verify_selfsigned_ssl is defined and ibm_infosvr_openigc_verify_selfsigned_ssl %}
+            --cacert cache/__ibm_infosvr_cert_root.crt \
+            {% endif %}
+            --header 'Content-Type:application/xml' \
+            -f -d @{{ item }}"
   args:
     warn: False
   with_items: "{{ flows_as_xml }}"

diff --git a/tasks/flows_from_template.yml b/tasks/flows_from_template.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,21 +16,21 @@
 ###
 
 - name: ensure generated directory exists
-  local_action:
-    module: file
+  file:
     path: generated/
     state: directory
+  delegate_to: localhost
 
 - name: load variables
   include_vars:
     file: "{{ outer_item }}"
     name: __ibm_infosvr_openigc_flows
 
 - name: generate flow XML from variables
-  local_action:
-    module: template
+  template:
     src: flow.xml.j2
     dest: generated/{{ outer_item | basename }}.xml
+  delegate_to: localhost
 
 - name: load lineage flow
   include_tasks: flows.yml

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 ###
 # Copyright 2018 IBM Corp. All Rights Reserved.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.