fix(cleanup): tidyup few loose ends

noelmcloughlin · noelmcloughlin · commit febeb4cea1c1 · 2020-04-06T18:15:14.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -61,28 +61,24 @@ jobs:
     - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
+    - env: INSTANCE=default-fedora-31-master-py3
+    # env: INSTANCE=default-opensuse-leap-151-master-py3
+    # env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-arch-base-latest-master-py2
     # - env: INSTANCE=default-debian-10-3000-1-py3
-    - env: INSTANCE=default-ubuntu-1804-3000-1-py3
-    - env: INSTANCE=source-ubuntu-1804-3000-1-py3
-    - env: INSTANCE=repo-ubuntu-1804-3000-1-py3
+    - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=default-centos-8-3000-1-py3
     # - env: INSTANCE=default-fedora-31-3000-1-py3
     # - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
-    - env: INSTANCE=binary-opensuse-leap-151-3000-1-py3
     # - env: INSTANCE=default-amazonlinux-2-3000-1-py3
-    - env: INSTANCE=binary-amazonlinux-2-3000-1-py3
     # - env: INSTANCE=default-arch-base-latest-3000-1-py2
     # - env: INSTANCE=default-debian-10-2019-2-py3
     # - env: INSTANCE=default-debian-9-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=default-centos-8-2019-2-py3
     # - env: INSTANCE=default-centos-7-2019-2-py3
-    - env: INSTANCE=default-fedora-31-2019-2-py3
+    # - env: INSTANCE=default-fedora-31-2019-2-py3
     # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1804-2019-2-py2
@@ -97,8 +93,7 @@ jobs:
     # - env: INSTANCE=default-centos-6-2018-3-py2
     # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
     # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    - env: INSTANCE=binary-arch-base-latest-2018-3-py2
+    - env: INSTANCE=default-arch-base-latest-2018-3-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/docs/README.rst b/docs/README.rst
@@ -69,10 +69,10 @@ starts the associated node service.
 
 This state will install Node package only.
 
-``node.binary``
+``node.archive``
 ^^^^^^^^^^^^^^^
 
-This state will install Node from binary only.
+This state will install Node from archive only.
 
 ``node.source``
 ^^^^^^^^^^^^^^^
@@ -112,7 +112,7 @@ This state will remove Node package and has a dependency on
 This state will remove Node package and has a dependency on
 ``node.config.clean`` via include list.
 
-``node.binary.clean``
+``node.archive.clean``
 ^^^^^^^^^^^^^^^^^^^^^
 
 This state will remove Node package and has a dependency on
diff --git a/kitchen.yml b/kitchen.yml
@@ -189,7 +189,7 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
-  - name: binary
+  - name: archive
     provisioner:
       state_top:
         base:
@@ -201,10 +201,10 @@ suites:
             '*':
               - node
       pillars_from_files:
-        node.sls: test/salt/pillar/binary.sls
+        node.sls: test/salt/pillar/archive.sls
     verifier:
       inspec_tests:
-        - path: test/integration/binary
+        - path: test/integration/archive
   - name: source
     provisioner:
       state_top:
diff --git a/node/archive/clean.sls b/node/archive/clean.sls
@@ -5,12 +5,12 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import node with context %}
 
-node-package-binary-clean-file-absent:
+node-package-archive-clean-file-absent:
   file.absent:
     - names:
-      - {{ node.pkg.binary.name }}
+      - {{ node.pkg.archive.name }}
            {%- if node.linux.altpriority|int == 0 and node.kernel in ('linux', 'darwin') %}
-      - {{ node.dir.binary }}/bin/node
-      - {{ node.dir.binary }}/bin/npm
-      - {{ node.dir.binary }}/bin/npx
+      - {{ node.dir.archive }}/bin/node
+      - {{ node.dir.archive }}/bin/npm
+      - {{ node.dir.archive }}/bin/npx
            {%- endif %}
diff --git a/node/archive/init.sls b/node/archive/init.sls
diff --git a/node/archive/install.sls b/node/archive/install.sls
@@ -4,49 +4,49 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import node as node with context %}
-{%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+{%- from tplroot ~ "/macros.jinja" import format_kwargs with context %}
 
-node-package-binary-install:
+node-package-archive-install:
   pkg.installed:
     - names:
       - tar
       - gzip
     - require_in:
-      - file: node-package-binary-install
+      - file: node-package-archive-install
   file.directory:
-    - name: {{ node.pkg.binary.name }}
+    - name: {{ node.pkg.archive.name }}
     - user: {{ node.rootuser }}
     - group: {{ node.rootgroup }}
     - mode: 755
     - makedirs: True
     - clean: True
     - require_in:
-      - archive: node-package-binary-install
+      - archive: node-package-archive-install
     - recurse:
         - user
         - group
         - mode
   archive.extracted:
-    {{- format_kwargs(node.pkg.binary) }}
+    {{- format_kwargs(node.pkg.archive) }}
     - retry: {{ node.retry_option }}
     - user: {{ node.rootuser }}
     - group: {{ node.rootgroup }}
     - recurse:
         - user
         - group
     - require:
-      - file: node-package-binary-install
+      - file: node-package-archive-install
 
     {%- if node.linux.altpriority|int == 0 %}
         {%- for cmd in ('node', 'npx', 'npm',) %}
 
-node-binary-install-file-symlink-{{ cmd }}:
+node-archive-install-file-symlink-{{ cmd }}:
   file.symlink:
     - name: /usr/local/bin/{{ cmd }}
-    - target: {{ node.pkg.binary.name }}/bin/{{ cmd }}
+    - target: {{ node.pkg.archive.name }}/bin/{{ cmd }}
     - force: True
     - onlyif: {{ node.kernel not in ('windows',) }}
     - require:
-      - archive: node-package-binary-install
+      - archive: node-package-archive-install
         {%- endfor %}
     {%- endif %}
diff --git a/node/clean.sls b/node/clean.sls
@@ -7,7 +7,7 @@ include:
   - .config.clean
   - .package.clean
   - .source.clean
-  - .binary.clean
+  - .archive.clean
 
     {%- else %}
 
diff --git a/node/config/clean.sls b/node/config/clean.sls
@@ -9,8 +9,8 @@
 
     {%- if node.pkg.use_upstream_source %}
         {%- set sls_package_clean = tplroot ~ '.source.clean' %}
-    {%- elif node.pkg.use_upstream_binary %}
-        {%- set sls_package_clean = tplroot ~ '.binary.clean' %}
+    {%- elif node.pkg.use_upstream_archive %}
+        {%- set sls_package_clean = tplroot ~ '.archive.clean' %}
     {%- else %}
         {%- set sls_package_clean = tplroot ~ '.package.clean' %}
     {%- endif %}
diff --git a/node/config/environ.sls b/node/config/environ.sls
@@ -10,8 +10,8 @@
 
     {%- if node.pkg.use_upstream_source %}
         {%- set sls_package_install = tplroot ~ '.source.install' %}
-    {%- elif node.pkg.use_upstream_binary %}
-        {%- set sls_package_install = tplroot ~ '.binary.install' %}
+    {%- elif node.pkg.use_upstream_archive %}
+        {%- set sls_package_install = tplroot ~ '.archive.install' %}
     {%- else %}
         {%- set sls_package_install = tplroot ~ '.package.install' %}
     {%- endif %}
diff --git a/node/config/file.sls b/node/config/file.sls
@@ -9,8 +9,8 @@
 
     {%- if node.pkg.use_upstream_source %}
         {%- set sls_package_install = tplroot ~ '.source.install' %}
-    {%- elif node.pkg.use_upstream_binary %}
-        {%- set sls_package_install = tplroot ~ '.binary.install' %}
+    {%- elif node.pkg.use_upstream_archive %}
+        {%- set sls_package_install = tplroot ~ '.archive.install' %}
     {%- else %}
         {%- set sls_package_install = tplroot ~ '.package.install' %}
     {%- endif %}
diff --git a/node/defaults.yaml b/node/defaults.yaml
@@ -15,13 +15,13 @@ node:
     altpriority: 0
 
   dir:
-    binary: /usr/local
+    archive: /usr/local
     source: /usr/local/src
   pkg:
     name: nodejs
     version: None
     use_upstream_repo: false
-    use_upstream_binary: false
+    use_upstream_archive: false
     use_upstream_source: false
     deps:
       - git
@@ -32,7 +32,7 @@ node:
       - gcc
     repo: {}
     suffix: tar.gz
-    binary:
+    archive:
       uri: https://nodejs.org/dist
       source_hash: 3e66b14bbeb9ea1ba129fae7c65374844f4ddaf1e48e2bc19b3b2570e158e362
       enforce_toplevel: false
@@ -53,7 +53,7 @@ node:
     splay: 10
 
   # legacy flags
-  install_from_source: false  # use_upstream_binary
+  install_from_source: false  # use_upstream_archive
   install_from_ppa: false     # use_upstream_repo
   node_pkg: nodejs
   npm_pkg: npm
diff --git a/node/init.sls b/node/init.sls
@@ -9,7 +9,7 @@
            {%- set p = node.pkg %}
 
 include:
-  - {{ '.source' if p.use_upstream_source else '.binary' if p.use_upstream_binary else '.package' }}
+  - {{ '.source' if p.use_upstream_source else '.archive' if p.use_upstream_archive else '.package' }}
   - .config
 
     {%- else %}
diff --git a/node/macros.jinja b/node/macros.jinja
diff --git a/node/map.jinja b/node/map.jinja
@@ -27,12 +27,12 @@
     {%- do node.pkg.source.update({ 'name': node.dir.source ~ '/node-' ~ node.version,
            'source': '%s/v%s.%s'|format(node.pkg.source.uri, node.version, node.pkg.suffix) }) %}
 {%- endif %}
-{%- if node.pkg.use_upstream_binary %}
+{%- if node.pkg.use_upstream_archive %}
     {%- set dirname = 'node-v%s-%s-%s'|format( node.version, node.kernel, node.arch ) %}
-    {%- do node.pkg.binary.update({
-           'name': node.dir.binary ~ '/' ~ dirname,
-           'source_hash': node.pkg.binary.uri ~ '/v' ~ node.version ~ '/SHASUMS256.txt',
-           'source': '%s/v%s/%s.%s'|format(node.pkg.binary.uri, node.version, dirname, node.pkg.suffix)}) %}
+    {%- do node.pkg.archive.update({
+           'name': node.dir.archive ~ '/' ~ dirname,
+           'source_hash': node.pkg.archive.uri ~ '/v' ~ node.version ~ '/SHASUMS256.txt',
+           'source': '%s/v%s/%s.%s'|format(node.pkg.archive.uri, node.version, dirname, node.pkg.suffix)}) %}
 {%- endif %}
 
 ## Legacy support (remove on/after Jan 2021) ##
@@ -49,9 +49,9 @@
               {%- do node.pkg.source.update({ 'source_hash': salt['pillar.get']('node:checksum') }) %}
        {%- endif %}
 {%- endif %}
-{%- if salt['pillar.get']('node:install_from_binary') %}
-       {%- do node.pkg.update({ 'use_upstream_binary': True }) %}
+{%- if salt['pillar.get']('node:install_from_archive') %}
+       {%- do node.pkg.update({ 'use_upstream_archive': True }) %}
        {%- if salt['pillar.get']('node:checksum') %}
-              {%- do node.pkg.binary.update({ 'source_hash': salt['pillar.get']('node:checksum') }) %}
+              {%- do node.pkg.archive.update({ 'source_hash': salt['pillar.get']('node:checksum') }) %}
        {%- endif %}
 {%- endif %}
diff --git a/node/osfamilymap.yaml b/node/osfamilymap.yaml
@@ -54,7 +54,7 @@ Suse:
 
 Gentoo:
   pkg:
-    use_upstream_binary: true
+    use_upstream_archive: true
 
 Arch: {}
 
diff --git a/node/osmap.yaml b/node/osmap.yaml
@@ -12,7 +12,7 @@
 ---
 Amazon:
   pkg:
-    use_upstream_binary: true
+    use_upstream_archive: true
 
 # os_family: Gentoo
 Funtoo: {}
diff --git a/node/package/repo/install.sls b/node/package/repo/install.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import node with context %}
-{%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+{%- from tplroot ~ "/macros.jinja" import format_kwargs with context %}
 
 node-package-repo-pkgrepo-managed:
   pkgrepo.managed:
diff --git a/node/source/install.sls b/node/source/install.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import node with context %}
-{%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+{%- from tplroot ~ "/macros.jinja" import format_kwargs with context %}
 
 node-package-source-install:
       {%- if node.pkg.deps %}
diff --git a/pillar.example b/pillar.example
@@ -4,14 +4,14 @@
 node:
   version: 13.12.0
   config:
-    prefix: '${HOME}/.npm-packages'
+    prefix: '/home/vagrant/.npm-packages'
   environ:
     a: b
   pkg:
     use_upstream_repo: false
-    use_upstream_binary: false
+    use_upstream_archive: false
     use_upstream_source: false
-    binary:
+    archive:
       uri: https://nodejs.org/dist
       source_hash: 3e66b14bbeb9ea1ba129fae7c65374844f4ddaf1e48e2bc19b3b2570e158e362
     source:
diff --git a/test/integration/archive/README.md b/test/integration/archive/README.md
@@ -1,16 +1,16 @@
-# InSpec Profile: `binary`
+# InSpec Profile: `archive`
 
-This shows the implementation of the `binary` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+This shows the implementation of the `archive` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 
 ## Verify a profile
 
 InSpec ships with built-in features to verify a profile structure.
 
 ```bash
-$ inspec check binary
+$ inspec check archive
 Summary
 -------
-Location: binary
+Location: archive
 Profile: profile
 Controls: 4
 Timestamp: 2019-06-24T23:09:01+00:00
@@ -28,7 +28,7 @@ Warnings
 To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
 
 ```bash
-$ inspec exec binary
+$ inspec exec archive
 ..
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
@@ -40,7 +40,7 @@ Finished in 0.0025 seconds (files took 0.12449 seconds to load)
 To run one control from the profile use `inspec exec /path/to/profile --controls name`.
 
 ```bash
-$ inspec exec binary --controls package
+$ inspec exec archive --controls package
 .
 
 Finished in 0.0025 seconds (files took 0.12449 seconds to load)
diff --git a/test/integration/archive/controls/binary_spec.rb b/test/integration/archive/controls/binary_spec.rb
@@ -2,7 +2,7 @@
 
 title 'node archives profile'
 
-control 'node binary archive' do
+control 'node archive' do
   impact 1.0
   title 'should be installed'
 
diff --git a/test/integration/archive/controls/config_spec.rb b/test/integration/archive/controls/config_spec.rb
@@ -8,6 +8,6 @@
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
     its('mode') { should cmp '0640' }
-    its('content') { should include 'prefix = ${HOME}/.npm-packages' }
+    its('content') { should include 'prefix = /home/vagrant/.npm-packages' }
   end
 end
diff --git a/test/integration/archive/controls/environ_spec.rb b/test/integration/archive/controls/environ_spec.rb
diff --git a/test/integration/archive/inspec.yml b/test/integration/archive/inspec.yml
diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
diff --git a/test/integration/source/controls/config_spec.rb b/test/integration/source/controls/config_spec.rb
diff --git a/test/salt/pillar/archive.sls b/test/salt/pillar/archive.sls
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
diff --git a/test/salt/pillar/repo.sls b/test/salt/pillar/repo.sls
diff --git a/test/salt/pillar/source.sls b/test/salt/pillar/source.sls
