feat(windows): add support to work with the default suite

saltstack-formulas · Mar 24, 2022 · f1066d6 · f1066d6
1 parent 1d97949
commit f1066d6
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 8 deletions.
diff --git a/node/config/environ.sls b/node/config/environ.sls
@@ -6,7 +6,7 @@
 {%- from tplroot ~ "/map.jinja" import node with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
-{%- if 'environ' in node and node.environ %}
+{%- if 'environ' in node and node.environ and grains.os_family != 'Windows' %}
 
     {%- if node.pkg.use_upstream_source %}
         {%- set sls_package_install = tplroot ~ '.source.install' %}

diff --git a/node/config/file.sls b/node/config/file.sls
@@ -24,9 +24,11 @@ node-config-npmrc-file-managed-config_file:
                               lookup='node-config-file-file-managed-config_file'
                  )
               }}
+    {%- if grains.os_family != 'Windows' %}
     - mode: 640
     - user: {{ node.rootuser }}
     - group: {{ node.rootgroup }}
+    {%- endif %}
     - makedirs: True
     - template: jinja
     - context:

diff --git a/node/init.sls b/node/init.sls
@@ -5,7 +5,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import node with context %}
 
-    {%- if grains.os_family not in ('Windows', 'MacOS',) %}
+    {%- if grains.os_family not in ('MacOS',) %}
            {%- set p = node.pkg %}
 
 include:

diff --git a/node/osfamilymap.yaml b/node/osfamilymap.yaml
@@ -84,7 +84,11 @@ OpenBSD:
 Solaris: {}
 
 Windows:
+  config_file: C:\Program Files\nodejs\node_modules\npm\npmrc
+  config:
+    prefix: '${APPDATA}\\npm'
   pkg:
+    name: node.js
     source:
       # win-x64/node.exe
       source_hash: 7fca04f83b0e2169e41b2e1845e8da0f07d66cf9c3a1b4150767bf3ffddccf62

diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 # Overide by Platform
+npmrc_file, config_prefix =
+  case platform[:family]
+  when 'windows'
+    ['C:\\Program Files\\nodejs\\node_modules\\npm\\npmrc', '${APPDATA}\\npm']
+  else
+    %w[/etc/npmrc /home/vagrant/.npm-packages]
+  end
+
 root_group =
   case platform[:family]
   when 'bsd'
@@ -12,11 +20,13 @@
 control 'node configuration' do
   title 'should match desired lines'
 
-  describe file('/etc/npmrc') do
+  describe file(npmrc_file) do
     it { should be_file }
-    it { should be_owned_by 'root' }
-    it { should be_grouped_into root_group }
-    its('mode') { should cmp '0640' }
-    its('content') { should include 'prefix = /home/vagrant/.npm-packages' }
+    unless %w[windows].include?(platform[:family])
+      it { should be_owned_by 'root' }
+      it { should be_grouped_into root_group }
+      its('mode') { should cmp '0640' }
+    end
+    its('content') { should include "prefix = #{config_prefix}" }
   end
 end
diff --git a/test/integration/default/controls/environ_spec.rb b/test/integration/default/controls/environ_spec.rb
@@ -12,6 +12,10 @@
 control 'node configuration environment' do
   title 'should match desired lines'
 
+  only_if('Environment file not managed on Windows') do
+    !%w[windows].include?(system.platform[:name])
+  end
+
   describe file('/etc/default/node.sh') do
     it { should be_file }
     it { should be_owned_by 'root' }

diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb
@@ -20,6 +20,8 @@
       else
         'nodejs'
       end
+    when 'windows'
+      'node.js'
     else
       'nodejs'
     end

diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
@@ -4,7 +4,8 @@
 node:
   version: 16.13.0
   config:
-    prefix: '/home/vagrant/.npm-packages'
+    # yamllint disable-line rule:line-length
+    prefix: '{{ "${APPDATA}\\npm" if grains.os == "Windows" else "/home/vagrant/.npm-packages" }}'
   environ:
     a: b
   pkg: