(MODULES-6923) replace staging module with archive

Author: tphoney

.fixtures.yml

@@ -1,7 +1,7 @@
 fixtures:
   repositories:
+    "archive": "https://github.com/voxpupuli/puppet-archive"
     "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
-    "staging": "https://github.com/voxpupuli/puppet-staging"
     "translate": "https://github.com/puppetlabs/puppetlabs-translate"
   symlinks:
     "mysql": "#{source_dir}"

manifests/server/mysqltuner.pp

@@ -7,58 +7,31 @@
 #   The version to install from the major/MySQLTuner-perl github repository. Must be a valid tag. Defaults to 'v1.3.0'.
 # @param source
 #   Source path for the mysqltuner package.
-# @param environment
-#   Environment variables active during download, e.g. to download via proxies: environment => 'https_proxy=http://proxy.example.com:80'
-#
 class mysql::server::mysqltuner(
   $ensure  = 'present',
   $version = 'v1.3.0',
   $source  = undef,
-  $environment = undef, # environment for staging::file
 ) {
-
+  $tuner_location = '/usr/local/bin/mysqltuner'
   if $source {
     $_version = $source
     $_source  = $source
   } else {
     $_version = $version
     $_source  = "https://github.com/major/MySQLTuner-perl/raw/${version}/mysqltuner.pl"
   }
-
   if $ensure == 'present' {
-    # $::puppetversion doesn't exist in puppet 4.x so would break strict
-    # variables
-    if ! $::settings::strict_variables {
-      $_puppetversion = $::puppetversion
-    } else {
-      # defined only works with puppet >= 3.5.0, so don't use it unless we're
-      # actually using strict variables
-      $_puppetversion = defined('$puppetversion') ? {
-        true    => $::puppetversion,
-        default => undef,
-      }
-    }
-    # see https://tickets.puppetlabs.com/browse/ENTERPRISE-258
-    if $_puppetversion and $_puppetversion =~ /Puppet Enterprise/ and versioncmp($_puppetversion, '3.8.0') < 0 {
-      class { '::staging':
-        path => '/opt/mysql_staging',
-      }
-    } else {
-      class { '::staging': }
-    }
-
-    staging::file { "mysqltuner-${_version}":
-      source      => $_source,
-      environment => $environment,
+    archive { $tuner_location:
+      ensure => $ensure,
+      source => $_source,
     }
-    file { '/usr/local/bin/mysqltuner':
+    file { $tuner_location:
       ensure  => $ensure,
       mode    => '0550',
-      source  => "${::staging::path}/mysql/mysqltuner-${_version}",
-      require => Staging::File["mysqltuner-${_version}"],
+      require => Archive[$tuner_location],
     }
   } else {
-    file { '/usr/local/bin/mysqltuner':
+    file { $tuner_location:
       ensure => $ensure,
     }
   }

metadata.json

@@ -9,16 +9,16 @@
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {
-      "name": "puppetlabs/translate",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
+      "name": "puppet/archive",
+      "version_requirement": ">= 3.2.0 < 4.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 3.2.0 < 5.0.0"
     },
     {
-      "name": "puppet/staging",
-      "version_requirement": ">= 1.0.1 < 4.0.0"
+      "name": "puppetlabs/translate",
+      "version_requirement": ">= 1.0.0 < 2.0.0"
     }
   ],
   "operatingsystem_support": [

spec/classes/mysql_server_mysqltuner_spec.rb

@@ -1,44 +1,35 @@
 require 'spec_helper'
 
 describe 'mysql::server::mysqltuner' do
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) do
-        facts.merge(staging_http_get: 'curl',
-                    root_home: '/root')
-      end
-
-      context 'ensure => present' do
-        it { is_expected.to compile }
-        it {
-          is_expected.to contain_staging__file('mysqltuner-v1.3.0').with(source: 'https://github.com/major/MySQLTuner-perl/raw/v1.3.0/mysqltuner.pl')
-        }
-      end
+  context 'ensure => present' do
+    it { is_expected.to compile }
+    it {
+      is_expected.to contain_archive('/usr/local/bin/mysqltuner')
+    }
+  end
 
-      context 'ensure => absent' do
-        let(:params) { { ensure: 'absent' } }
+  context 'ensure => absent' do
+    let(:params) { { ensure: 'absent' } }
 
-        it { is_expected.to compile }
-        it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(ensure: 'absent') }
-      end
+    it { is_expected.to compile }
+    it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(ensure: 'absent') }
+  end
 
-      context 'custom version' do
-        let(:params) { { version: 'v1.2.0' } }
+  context 'custom version' do
+    let(:params) { { version: 'v1.2.0' } }
 
-        it { is_expected.to compile }
-        it {
-          is_expected.to contain_staging__file('mysqltuner-v1.2.0').with(source: 'https://github.com/major/MySQLTuner-perl/raw/v1.2.0/mysqltuner.pl')
-        }
-      end
+    it { is_expected.to compile }
+    it {
+      is_expected.to contain_archive('/usr/local/bin/mysqltuner')
+    }
+  end
 
-      context 'custom source' do
-        let(:params) { { source: '/tmp/foo' } }
+  context 'custom source' do
+    let(:params) { { source: '/tmp/foo' } }
 
-        it { is_expected.to compile }
-        it {
-          is_expected.to contain_staging__file('mysqltuner-/tmp/foo').with(source: '/tmp/foo')
-        }
-      end
-    end
+    it { is_expected.to compile }
+    it {
+      is_expected.to contain_archive('/usr/local/bin/mysqltuner')
+    }
   end
 end