Fixes required for MacOS

Author: noelmcloughlin

pillar.example

@@ -5,18 +5,21 @@ sqlplus:
     uri: http://download.example.com/oracle/instantclient/
     version: 12.2.0.1.0
     md5:
+ {% if grains.os == 'MacOS' %}
+      ##macos.x64 package cksums
+      basic: md5=537713092a123b3f43d6f1a2be0fe53f
+      sdk: md5=6791925e182d534a8143847263157d8f
+      sqlplus: md5=0c23f99617f6c2d11ac6df1704c7cd85
+ {% else %}
       #linux.x64 package cksums
       basic: md5=d9639092e3dea2e023272e52e2bd42da
       sqlplus: md5=93ae87df1d08bb31da57443a416edc8c
       sdk: md5=077fa2f215185377ccb670de9ca1678f
-      ##macos.x64 package cksums
-      #basic: md5=537713092a123b3f43d6f1a2be0fe53f
-      #sdk: md5=6791925e182d534a8143847263157d8f'
-      #sqlplus: md5=0c23f99617f6c2d11ac6df1704c7cd85
   linux:
     #Enable Debian alternatives feature by setting nonzero 'altpriority' value here.
     #Increase same value on each subsequent software installation.
-    #altpriority: 170
+    altpriority: 170
+ {% endif %}
   dl:
     retries: 1
     interval: 30

sqlplus/defaults.yaml

@@ -1,25 +1,33 @@
 #Default Look Dictionary
 sqlplus:
-  prefix: /usr/share/oracle
+  prefix: /usr/local/oracle
   tmpdir: /tmp/oracletmp/
   command: /sqlplus
   arch: linux.x64
 
   oracle:
     home: /opt/oracle/12_2
-    #Override 'uri' (pillar) to avoid oracle login
+    #Override "uri" (pillar) to avoid oracle login
     uri: http://download.oracle.com/otn/linux/instantclient/122010/
     #See oracle numbering: https://docs.oracle.com/cd/B28359_01/server.111/b28310/dba004.htm
     version: 12.2.0.1.0
     #See available packages: http://www.oracle.com/partners/campaign/index-100365.html
     pkgs: ['basic', 'sdk', 'sqlplus']
+    md5:
+      basic: md5=d9639092e3dea2e023272e52e2bd42da
+      sdk: md5=077fa2f215185377ccb670de9ca1678f
+      sqlplus: md5=93ae87df1d08bb31da57443a416edc8c
+      basiclite: md5=b024039f518975f5a5b6473130c74e43
+      jdbc: md5=3e6cdc6686b44160a8a5e4af0cacf5fd
+      odbc: md5=8d82fa4d6f96fae458c2af16e70a5985
+      tools: md5=5e258c34f947c31f0cf0e6322da8fe2c
 
   dl:
+    archive_type: zip
+    suffix: zip
     opts: -s -L
-    #'unpack_opts z' not working (unzip complains "caution: not extracting; -d ignored").
     interval: 30
     retries: 1
-    suffix: zip
     skip_hashcheck:
 
   linux:

sqlplus/init.sls

@@ -5,7 +5,7 @@ sqlplus-create-extract-dirs:
     - names:
       - '{{ sqlplus.tmpdir }}'
       - '{{ sqlplus.oracle.home }}'
-  {% if grains.os not in ('MacOS', 'Windows',) %}
+  {% if grains.os not in ('Windows', 'MacOS',) %}
       - '{{ sqlplus.oracle.realhome }}'
     - user: root
     - group: root
@@ -20,43 +20,56 @@ sqlplus-create-extract-dirs:
 
 sqlplus-extract-{{ pkg }}:
   cmd.run:
-    - name: curl {{sqlplus.dl.opts}} -o '{{sqlplus.tmpdir}}/{{ pkg }}.{{sqlplus.dl.suffix}}' {{ url }}
-      {% if grains['saltversioninfo'] >= [2017, 7, 0] %}
+    - name: curl {{sqlplus.dl.opts}} -o '{{ sqlplus.tmpdir }}{{ pkg }}.{{sqlplus.dl.suffix}}' {{ url }}
+    {% if grains['saltversioninfo'] >= [2017, 7, 0] %}
     - retry:
-        attempts: {{ sqlplus.dl.retries }}
-        interval: {{ sqlplus.dl.interval }}
-      {% endif %}
-    - require:
-      - sqlplus-create-extract-dirs
-    - require_in:
-      - archive: sqlplus-extract-{{ pkg }}
-  {% if sqlplus.dl.skip_hashcheck not in ('True', True,) %}
+      attempts: {{ sqlplus.dl.retries }}
+      interval: {{ sqlplus.dl.interval }}
+    {% endif %}
+    {%- if grains['saltversioninfo'] <= [2016, 11, 6] %}
+      # Check local archive using hashstring for older Salt
+      # (see https://github.com/saltstack/salt/pull/41914).
   module.run:
     - name: file.check_hash
-    - path: '{{ sqlplus.tmpdir }}/{{ pkg }}.{{ sqlplus.dl.suffix }}'
+    - path: '{{ sqlplus.tmpdir }}{{ pkg }}.{{ sqlplus.dl.suffix }}'
     - file_hash: {{ sqlplus.oracle.md5[ pkg ] }}
     - onchanges:
       - cmd: sqlplus-extract-{{ pkg }}
     - require_in:
       - archive: sqlplus-extract-{{ pkg }}
-  {% endif %}
+    {%- endif %}
   archive.extracted:
-    - source: 'file://{{ sqlplus.tmpdir }}{{ pkg }}.{{ sqlplus.dl.suffix }}'
+    - source: file://{{ sqlplus.tmpdir }}{{ pkg }}.{{sqlplus.dl.suffix}}
     - name: '{{ sqlplus.prefix }}'
-    - archive_format: {{ sqlplus.dl.suffix }}
-       {% if grains['saltversioninfo'] >= [2016, 11, 0] %}
+    - archive_format: {{ sqlplus.dl.archive_type }}
+        {% if grains['saltversioninfo'] < [2016, 11, 0] %}
+    - if_missing: '{{ sqlplus.oracle.realcmd }}'
+        {% endif %}
+        {% if grains['saltversioninfo'] >= [2016, 11, 0] %}
     - enforce_toplevel: False
-       {% endif %}
+        {% endif %}
+        {%- if grains['saltversioninfo'] > [2016, 11, 6] %}
+         #Check local archive using hashstring or hashurl
+    - source_hash: {{ sqlplus.oracle.md5[ pkg ] }}
+        {% endif %}
+    - onchanges:
+      - cmd: sqlplus-extract-{{ pkg }}
+    - require_in:
+      - file: sqlplus-extract-{{ pkg }}
+  file.absent:
+    - name: '{{sqlplus.tmpdir}}/{{ pkg }}.{{sqlplus.dl.suffix}}'
+    - onchanges:
+      - archive: sqlplus-extract-{{ pkg }}
     - require_in:
-      - file: sqlplus-complete-instantclient
+      - sqlplus-install-instantclient  
  
 {% endfor %}
 
-sqlplus-complete-instantclient:
+sqlplus-install-instantclient:
   file.absent:
     - name: {{ sqlplus.oracle.realhome }}
   cmd.run:
     - name: mv '{{ sqlplus.prefix }}instantclient_12_2' '{{ sqlplus.oracle.realhome }}'
     - require:
-      - file: sqlplus-complete-instantclient
+      - file: sqlplus-install-instantclient
 

sqlplus/map.jinja

@@ -6,46 +6,53 @@
 
 {% set version = salt['pillar.get']('sqlplus:oracle:version', defs.sqlplus.oracle.version ) %}
 {% set release = version.split('.')[0] ~ '_' ~ version.split('.')[1] %} 
-{% set osmap = salt['grains.filter_by']({
 
-    'Linux'  : { 'prefix'     : defs.sqlplus.prefix ~ '/' ~ release ~ '/',
-                 'oracle:md5' : { 'basic'    : 'md5=d9639092e3dea2e023272e52e2bd42da',
-                                  'sdk'      : 'md5=077fa2f215185377ccb670de9ca1678f',
-                                  'sqlplus'  : 'md5=93ae87df1d08bb31da57443a416edc8c',
-                                  'basiclite': 'md5=b024039f518975f5a5b6473130c74e43',
-                                  'jdbc'     : 'md5=3e6cdc6686b44160a8a5e4af0cacf5fd',
-                                  'odbc'     : 'md5=8d82fa4d6f96fae458c2af16e70a5985',
-                                  'tools'    : 'md5=5e258c34f947c31f0cf0e6322da8fe2c',
-                  },
-     },
+{% set osmap = salt['grains.filter_by']({
+    'Linux':   { 'prefix' : defs.sqlplus.prefix ~ '/' ~ release ~ '/',
+                   },
     'Windows': { 'prefix' : 'C:\\oracle\\' ~ release ~ '\\',
                  'tmpdir' : 'C:\\temp\\' ~ release ~ '\\',
                  'command': '\\sqlplus',
                  'arch'   : 'windows.x64',
-                 'oracle:md5': { 'basic'    : 'md5=958f0f3780bac4443eb6b36dc3b83c15',
-                                 'sdk'      : 'md5=3324d1cf419654495378df1fa2841f69',
-                                 'sqlplus'  : 'md5=7a6c499522a40ab49f42f96dfa7de5b7',
-                                 'basiclite': 'md5=8ce431a2837439a88f8381432411d529',
-                                 'jdbc'     : 'md5=172d3aa46ba4544c3af123bc305a354d',
-                                 'odbc'     : 'md5=30c995d80f4427b77b7e422075f94169',
-                                 'tools'    : 'md5=1cdc2fe9d9fd1fc7c546372f17d044e6',
+                   },
+    'Darwin' : { 'prefix' : defs.sqlplus.prefix ~ '/' ~ release ~ '/',
+                 'arch' : 'macos.x64',
+                   }, 
+  }, grain='kernel', default='Linux')
+%}
+
+{% set md5map = salt['grains.filter_by']({
+    'Linux'  : {  'basic'    : 'md5=d9639092e3dea2e023272e52e2bd42da',
+                  'sdk'      : 'md5=077fa2f215185377ccb670de9ca1678f',
+                  'sqlplus'  : 'md5=93ae87df1d08bb31da57443a416edc8c',
+                  'basiclite': 'md5=b024039f518975f5a5b6473130c74e43',
+                  'jdbc'     : 'md5=3e6cdc6686b44160a8a5e4af0cacf5fd',
+                  'odbc'     : 'md5=8d82fa4d6f96fae458c2af16e70a5985',
+                  'tools'    : 'md5=5e258c34f947c31f0cf0e6322da8fe2c',
+                   },
+    'Windows': { 'basic'    : 'md5=958f0f3780bac4443eb6b36dc3b83c15',
+                 'sdk'      : 'md5=3324d1cf419654495378df1fa2841f69',
+                 'sqlplus'  : 'md5=7a6c499522a40ab49f42f96dfa7de5b7',
+                 'basiclite': 'md5=8ce431a2837439a88f8381432411d529',
+                 'jdbc'     : 'md5=172d3aa46ba4544c3af123bc305a354d',
+                 'odbc'     : 'md5=30c995d80f4427b77b7e422075f94169',
+                 'tools'    : 'md5=1cdc2fe9d9fd1fc7c546372f17d044e6',
                   },
-     },
-    'Darwin' : { 'arch' : 'macosx.x64',
-                 'oracle:md5' : { 'basic'    : 'md5=537713092a123b3f43d6f1a2be0fe53f',
-                                  'sdk'      : 'md5=6791925e182d534a8143847263157d8f',
-                                  'sqlplus'  : 'md5=0c23f99617f6c2d11ac6df1704c7cd85',
-                                  'basiclite': 'md5=0a9e73d79c107f528640c4c757afefa3',
-                                  'jdbc'     : 'md5=7403db299df66e4f44c080e16417f3ba',
-                                  'odbc'     : 'md5=b5e9292c7c8936ae94bdc76228f816ad',
-                                  'tools'    : 'md5=f668d97d300dae39c9907c55a91d1a05',
+    'Darwin' : { 'basic'    : 'md5=537713092a123b3f43d6f1a2be0fe53f',
+                  'sdk'      : 'md5=6791925e182d534a8143847263157d8f',
+                  'sqlplus'  : 'md5=0c23f99617f6c2d11ac6df1704c7cd85',
+                  'basiclite': 'md5=0a9e73d79c107f528640c4c757afefa3',
+                  'jdbc'     : 'md5=7403db299df66e4f44c080e16417f3ba',
+                  'odbc'     : 'md5=b5e9292c7c8936ae94bdc76228f816ad',
+                  'tools'    : 'md5=f668d97d300dae39c9907c55a91d1a05',
                   },
-     },
   }, grain='kernel', default='Linux')
 %} 
 
 # Merge osmap onto defaults before merging pillars
-{% do defs.sqlplus.update(osmap) %}
+{% do defs.sqlplus.update( osmap ) %}
+{% do defs.sqlplus.oracle.md5.update( md5map ) %}
+
 {% set sqlplus = salt['pillar.get']( 'sqlplus', default=defs.sqlplus, merge=True) %}
 {% do sqlplus.oracle.update({ 'release' : release,
                               'uri'     : sqlplus.oracle.uri,