Merge pull request #498 from JoshVanL/consul-backinator-binary

Download backinator binary in consul puppet module

Author: jetstack-bot

puppet/modules/consul/manifests/init.pp

@@ -39,6 +39,9 @@
   String $sha256sums_url = $consul::params::sha256sums_url,
   String $exporter_download_url = $consul::params::exporter_download_url,
   String $exporter_signature_url = $consul::params::exporter_signature_url,
+  String $backinator_version = $consul::params::backinator_version,
+  String $backinator_download_url = $consul::params::backinator_download_url,
+  String $backinator_sha256 = $consul::params::backinator_sha256,
   Integer $uid = 871,
   Integer $gid = 871,
   String $user = 'consul',
@@ -73,11 +76,12 @@
   Exec { path => $path }
 
   $_dest_dir = "${dest_dir}/${app_name}-${version}"
+  $_backinator_dest_dir = "${dest_dir}/${app_name}-backinator-${backinator_version}"
   $bin_path = "${_dest_dir}/${app_name}"
   $link_path = "${dest_dir}/bin"
   $config_path = "${config_dir}/consul.json"
 
-  $exporter_dest_dir = "${dest_dir}/${app_name}_exporter-${exporter_version}"
+  $exporter_dest_dir = "${dest_dir}/${app_name}-exporter-${exporter_version}"
   $exporter_bin_path = "${exporter_dest_dir}/${app_name}_exporter"
 
   $_consul_master_token = $consul_master_token ? {

puppet/modules/consul/manifests/install.pp

@@ -23,6 +23,13 @@
     'G'
   )
 
+  $backinator_download_url = regsubst(
+    $consul::backinator_download_url,
+    '#VERSION#',
+    $consul::backinator_version,
+    'G'
+  )
+
   # install unzip if necessary
   ensure_resource('package', 'unzip', {})
 
@@ -84,13 +91,44 @@
       extract_path      => $consul::exporter_dest_dir,
       extract_command   => 'tar xfz %s --strip-components=1'
     }
+    -> file {$consul::exporter_bin_path:
+      ensure => file,
+      mode   => '0755',
+    }
+    -> file {"${consul::link_path}/${consul::app_name}_exporter":
+      ensure => link,
+      target => $consul::exporter_bin_path,
+    }
   }
   else {
     file {$consul::exporter_dest_dir:
       ensure => absent,
     }
   }
 
+
+  file {$consul::_backinator_dest_dir:
+    ensure => directory,
+    mode   => '0755',
+  }
+  -> archive {"${consul::_dest_dir}/consul-backinator":
+    ensure        => present,
+    extract       => false,
+    source        => $backinator_download_url,
+    checksum      => $consul::backinator_sha256,
+    checksum_type => 'sha256',
+    cleanup       => false,
+    creates       => "${consul::_backinator_dest_dir}/consul-backinator",
+  }
+  -> file {"${consul::_backinator_dest_dir}/consul-backinator":
+    ensure => file,
+    mode   => '0755',
+  }
+  -> file {"${consul::link_path}/${consul::app_name}-backinator":
+    ensure => link,
+    target => "${consul::_backinator_dest_dir}/consul-backinator",
+  }
+
   file { "${consul::_dest_dir}/consul-backup.sh":
     ensure  => file,
     content => file('consul/consul-backup.sh'),

puppet/modules/consul/manifests/params.pp

@@ -6,15 +6,18 @@
 class consul::params {
   $app_name = 'consul'
   $version = '1.2.1'
+  $exporter_version = '0.3.0'
+  $backinator_version = '1.3'
   $download_dir = '/tmp'
   $systemd_dir = '/etc/systemd/system'
   $data_dir = '/var/lib/consul'
   $config_dir = '/etc/consul'
   $dest_dir = '/opt'
-  $exporter_version = '0.3.0'
   $download_url = 'https://releases.hashicorp.com/consul/#VERSION#/consul_#VERSION#_linux_amd64.zip'
   $sha256sums_url = 'https://releases.hashicorp.com/consul/#VERSION#/consul_#VERSION#_SHA256SUMS'
   $signature_url = 'https://releases.hashicorp.com/consul/#VERSION#/consul_#VERSION#_SHA256SUMS.sig'
   $exporter_download_url = 'https://github.com/prometheus/consul_exporter/releases/download/v#VERSION#/consul_exporter-#VERSION#.linux-amd64.tar.gz'
   $exporter_signature_url = 'https://releases.tarmak.io/signatures/consul_exporter/#VERSION#/consul_exporter-#VERSION#.linux-amd64.tar.gz.asc'
+  $backinator_download_url = 'https://github.com/myENA/consul-backinator/releases/download/v#VERSION#/consul-backinator-#VERSION#-amd64-linux.tar.gz'
+  $backinator_sha256 = '8ea624487a86007825884685dbc978ba87f7a448f11d59b9eb29fd5b1b2a0e87'
 }

puppet/modules/consul/spec/classes/install_spec.rb

@@ -28,9 +28,17 @@
     end
 
     it 'should install consul exporter' do
-      should contain_file('/opt/consul_exporter-0.3.0').with(
+      should contain_file('/opt/consul-exporter-0.3.0').with(
         :ensure => 'directory',
       )
+      should contain_file('/opt/consul-exporter-0.3.0/consul_exporter').with(
+        :ensure => 'file',
+        :mode => '0755',
+      )
+      should contain_file('/opt/bin/consul_exporter').with(
+        :ensure => 'link',
+        :target => '/opt/consul-exporter-0.3.0/consul_exporter',
+      )
     end
 
     it 'should install consul backup script' do
@@ -43,5 +51,19 @@
         :target => '/opt/consul-1.2.1/consul-backup.sh',
       )
     end
+
+    it 'should install consul backinator' do
+      should contain_file('/opt/consul-backinator-1.3').with(
+        :ensure => 'directory',
+      )
+      should contain_file('/opt/consul-backinator-1.3/consul-backinator').with(
+        :ensure => 'file',
+        :mode => '0755',
+      )
+      should contain_file('/opt/bin/consul-backinator').with(
+        :ensure => 'link',
+        :target => '/opt/consul-backinator-1.3/consul-backinator',
+      )
+    end
   end
 end