chore(symlinks): keep legacy interface support

noelmcloughlin · noelmcloughlin · commit 20d60d054ba1 · 2020-04-05T18:00:30.000+01:00
diff --git a/node/binary/install.sls b/node/binary/install.sls
@@ -7,6 +7,12 @@
 {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
 node-package-binary-install:
+  pkg.installed:
+    - names:
+      - tar
+      - gzip
+    - require_in:
+      - file: node-package-binary-install
   file.directory:
     - name: {{ node.pkg.binary.name }}
     - user: {{ node.rootuser }}
diff --git a/node/clean.sls b/node/clean.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-    {%- if grains.os_family not in ('FreeBSD', 'Windows', 'MacOS',) %}
+    {%- if grains.os_family not in ('FreeBSD', 'Windows',) %}
 
 include:
   - .config.clean
diff --git a/node/config.sls b/node/config.sls
@@ -0,0 +1 @@
+config/init.sls
diff --git a/node/config/init.sls b/node/config/init.sls
@@ -2,5 +2,5 @@
 # vim: ft=sls
 
 include:
-  - .file
-  - .environ
+  - node.config.file   # full path for legacy symlinks
+  - node.config.environ
diff --git a/node/defaults.yaml b/node/defaults.yaml
@@ -27,6 +27,8 @@ node:
       - git
       - curl
       - make
+      - tar
+      - gzip
       - gcc
     repo: {}
     suffix: tar.gz
diff --git a/node/map.jinja b/node/map.jinja
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
-{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osmap %}
+{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
 {%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap %}
 
 {%- set _config = salt['config.get'](tplroot, default={}) %}
diff --git a/node/osmap.yaml b/node/osmap.yaml
@@ -14,11 +14,6 @@ Amazon:
   pkg:
     use_upstream_binary: true
 
-Ubuntu:
-  pkg:
-    deps:
-      - make
-
 # os_family: Gentoo
 Funtoo: {}
 
diff --git a/node/package/init.sls b/node/package/init.sls
@@ -2,4 +2,4 @@
 # vim: ft=sls
 
 include:
-  - .install
+  - node.package.install   # full path for legacy symlinks
diff --git a/node/package/install.sls b/node/package/install.sls
@@ -8,7 +8,7 @@
     {%- if node.pkg.repo and node.pkg.use_upstream_repo %}
 
 include:
-  - .repo
+  - node.package.repo  # full path for legacy symlink
 
     {%- endif %}
 
diff --git a/node/package/repo/init.sls b/node/package/repo/init.sls
@@ -2,4 +2,4 @@
 # vim: ft=sls
 
 include:
-  - .install
+  - node.package.repo.install
diff --git a/node/pkg.sls b/node/pkg.sls
@@ -0,0 +1 @@
+package/init.sls
diff --git a/node/source/install.sls b/node/source/install.sls
@@ -6,12 +6,12 @@
 {%- from tplroot ~ "/map.jinja" import node with context %}
 {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
-node-package-source-install-prerequisites:
+node-package-source-install:
       {%- if node.pkg.deps %}
   pkg.installed:
     - names: {{ node.pkg.deps }}
     - require_in:
-      - file: node-package-source-install-prerequisites
+      - file: node-package-source-install
       {%- endif %}
   file.directory:
     - name: {{ node.pkg.source.name }}
@@ -21,7 +21,7 @@ node-package-source-install-prerequisites:
     - clean: True
     - makedirs: True
     - require_in:
-      - source: node-package-source-install-prerequisites
+      - source: node-package-source-install
     - recurse:
         - user
         - group
@@ -35,14 +35,14 @@ node-package-source-install-prerequisites:
         - user
         - group
     - require:
-      - file: node-package-source-install-prerequisites
+      - file: node-package-source-install
   cmd.run:
     - cwd: {{ node.dir.source }}/node-{{ node.version }}
     - names:
       - ./configure
       - make -j 4
     - require:
-      - archive: node-package-source-install-prerequisites
+      - archive: node-package-source-install
 
     {% if grains.os_family in ('RedHat',) %}
 
@@ -55,7 +55,7 @@ node-package-source-install-make:
       - make install DESTDIR=./tmp
       - fpm -s dir -t rpm -C ./tmp -n node -v {{ node.version }} --iteration 1 --description "Node v{{ node.version }} (fpm)" -f
     - onchanges:
-      - cmd: node-package-source-install-prerequisites
+      - cmd: node-package-source-install
   pkg.installed:
     - sources:
       - node: {{ node.dir.source }}/node-{{ node.version }}/node-{{ node.version }}-1.x86_64.rpm
@@ -69,6 +69,6 @@ node-package-source-install-checkinstall:
     - cwd: {{ node.dir.source }}/node-{{ node.version }}
     - name: checkinstall --install=yes --pkgname=node --pkgversion "{{ node.version }}" --default
     - onchanges:
-      - cmd: node-package-source-install-prerequisites
+      - cmd: node-package-source-install
 
     {% endif %}
diff --git a/test/integration/binary/controls/binary_spec.rb b/test/integration/binary/controls/binary_spec.rb
@@ -6,7 +6,7 @@
   impact 1.0
   title 'should be installed'
 
-  describe file('/opt/local/bin/node') do
+  describe file('/usr/local/bin/node') do
     it { should exist }
   end
 end
diff --git a/test/salt/source/pillar/node.sls b/test/salt/source/pillar/node.sls
@@ -5,8 +5,6 @@ node:
   version: 13.12.0
   pkg:
     use_upstream_source: true
-    deps:
-      - vim                     # example for source install
     source:
       uri: https://github.com/nodejs/node/archive
       source_hash: 37aff6cc2f451d1dbe693d18ad87fad352ed4f74f7b8e232590dd7f2f6b5d525
