fix(alternatives): better no alternatives support

saltstack-formulas · Jan 25, 2020 · 04caf8e · 04caf8e
1 parent c946e42
commit 04caf8e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/golang/config/alternatives/install.sls b/golang/config/alternatives/install.sls
@@ -7,7 +7,8 @@
 {%- set sls_archive_install = tplroot ~ '.archive.install' %}
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 
-  {%- if golang.kernel == 'linux' and golang.linux.altpriority|int > 0 %}
+  {%- if grains.kernel|lower == 'linux' and golang.linux.altpriority|int > 0 %}
+      {%- if grains.os_family not in ('Arch', 'FreeBSD')  %}
 
 include:
   - {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
@@ -40,7 +41,7 @@ golang-package-archive-install-home-alternative-set:
       - alternatives: golang-package-archive-install-home-alternative-install
     - unless: {{ grains.os_family in ('Suse',) }}
 
-      {% for i in ['go', 'godoc', 'gofmt'] %}
+          {% for i in ['go', 'godoc', 'gofmt'] %}
 
 golang-package-archive-install-{{ i }}-alternative-install:
   cmd.run:
@@ -66,5 +67,6 @@ golang-package-archive-install-{{ i }}-alternative-set:
       - alternatives: golang-package-archive-install-{{ i }}-alternative-install
     - unless: {{ grains.os_family in ('Suse',) }}
 
-     {% endfor %}
+         {% endfor %}
+      {%- endif %}
   {%- endif %}
diff --git a/golang/config/environ.sls b/golang/config/environ.sls
@@ -27,3 +27,20 @@ golang-config-file-managed-environ_file:
         golang: {{ golang|json }}
     - require:
       - sls: {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
+
+
+    {% for i in ('go', 'godoc', 'gofmt') %}
+
+       # create symlink under certain conditions
+       # archlinux, freebsd, macos for now
+golang-config-file-symlink-{{ i }}-golang-binary:
+  file.symlink:
+    - name: /usr/local/bin/{{ i }}
+    - target: {{ golang.linux.base_dir }}/ {{ i }}
+    - mode: '0755'
+    - force: True
+    - onlyif:
+      - {{ grains.os_family in ('Arch', 'FreeBSD', 'MacOS') }}
+      - test -x {{ golang.linux.base_dir }}/ {{ i }}
+
+    {%- endfor %}
diff --git a/pillar.example b/pillar.example
@@ -14,6 +14,7 @@ golang:
 
   linux:
     # 'Alternatives system' priority: zero disables (default)
+    base_dir: ''
     altpriority: 9100
 
   cmd:

diff --git a/test/integration/default/controls/archives_spec.rb b/test/integration/default/controls/archives_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 control 'golang tar archive' do
   impact 1.0
   title 'should be installed'
@@ -16,25 +17,25 @@
   binary = file('/usr/local/go1.10.1.linux-amd64/go/bin/go').content
   sha256sum = Digest::SHA256.hexdigest(binary)
   describe file('/usr/local/go1.10.1.linux-amd64/go/bin/go') do
-# rubocop:disable LineLength
+    # rubocop:disable LineLength
     its('sha256sum') { should eq '11438a2d41e257519e8c0ad098c287f9f73f1b8382a012a0c10e1dee5fb1e8ae' }
-# rubocop:enable LineLength
+    # rubocop:enable LineLength
   end
 
   binary = file('/usr/local/go1.10.1.linux-amd64/go/bin/godoc').content
   sha256sum = Digest::SHA256.hexdigest(binary)
   describe file('/usr/local/go1.10.1.linux-amd64/go/bin/godoc') do
-# rubocop:disable LineLength
+    # rubocop:disable LineLength
     its('sha256sum') { should eq '4076bb73349f253c04e5ef214934938760eefb26529f22d2e6fdbd61b99bb4b5' }
-# rubocop:enable LineLength
+    # rubocop:enable LineLength
   end
 
   binary = file('/usr/local/go1.10.1.linux-amd64/go/bin/gofmt').content
   sha256sum = Digest::SHA256.hexdigest(binary)
   describe file('/usr/local/go1.10.1.linux-amd64/go/bin/gofmt') do
-# rubocop:disable LineLength
-    its('sha256sum') { should eq '5673f5914f195331322b20aee026f1882dac7c92b61c41bae23a04fb803b3e2c'}
-# rubocop:enable LineLength
+    # rubocop:disable LineLength
+    its('sha256sum') { should eq '5673f5914f195331322b20aee026f1882dac7c92b61c41bae23a04fb803b3e2c' }
+    # rubocop:enable LineLength
   end
 
 end