Merge pull request #59 from Yoda-BZH/fix-deb-build-nopillar-uri

fix(debian): don't rely on pillar.get, build repo.name when needed

Author: javierbertoli

node/config/clean.sls

@@ -24,5 +24,5 @@ node-config-clean-file-absent:
       - {{ node.environ_file }}
     - require:
       - sls: {{ sls_package_clean }}
-      
+
 {%- endif %}

node/map.jinja

@@ -34,6 +34,11 @@
            '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 %}
+{%- if node.pkg.use_upstream_repo -%}
+    {%- set full_repo_name = 'deb %s/node_%s.x %s'|format(node.pkg.repo.url, node.pkg.version, node.pkg.repo.dist) -%}
+    {%- do node.pkg.repo.update({
+           'name': full_repo_name}) -%}
+{%- endif -%}
 
 ## Legacy support (remove on/after Jan 2021) ##
 

node/osfamilymap.yaml

@@ -28,8 +28,9 @@ Debian:
             {%- if 'oscodename' in grains %}
     repo:
       humanname: NodeSource Node.js Repository
-      name: deb https://deb.nodesource.com/node_{{ salt['pillar.get']('node:pkg:version') }}.x {{ grains.oscodename }} main
+      url: https://deb.nodesource.com
       dist: {{ grains['oscodename'] }}
+      comps: "main"
       file: /etc/apt/sources.list.d/nodesource.list
       key_url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
       keyserver: keyserver.ubuntu.com