Merge pull request #118 from envato/fix-deprecation-warning

Fix deprecation warnings

Author: stephenrjohnson

.fixtures.yml

@@ -12,6 +12,6 @@ fixtures:
           repo: 'git://github.com/electrical/puppet-lib-file_concat.git'
         apt:
           repo: "git://github.com/puppetlabs/puppetlabs-apt"
-          ref: "1.8.0"
+          ref: "2.2.0"
     symlinks:
         puppet: "#{source_dir}"

manifests/repo/puppetlabs.pp

@@ -7,35 +7,37 @@
   if($::osfamily == 'Debian') {
     Apt::Source {
       location    => 'http://apt.puppetlabs.com',
-      key         => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-      key_content => template('puppet/pgp.key'),
+      key         => {
+        'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+        'server' => 'pgp.mit.edu',
+      },
     }
     apt::source { 'puppetlabs':      repos => 'main' }
     apt::source { 'puppetlabs-deps': repos => 'dependencies' }
-    } elsif $::osfamily == 'Redhat' {
-      if $::operatingsystem == 'Fedora' {
-        $ostype='fedora'
-        $prefix='f'
-      } else {
-          $ostype='el'
-          $prefix=''
-      }
-      yumrepo { 'puppetlabs-deps':
-        baseurl  => "http://yum.puppetlabs.com/${ostype}/${prefix}\$releasever/dependencies/\$basearch",
-        descr    => 'Puppet Labs Dependencies $releasever - $basearch ',
-        enabled  => '1',
-        gpgcheck => '1',
-        gpgkey   => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-      }
-
-      yumrepo { 'puppetlabs':
-        baseurl  => "http://yum.puppetlabs.com/${ostype}/${prefix}\$releasever/products/\$basearch",
-        descr    => 'Puppet Labs Products $releasever - $basearch',
-        enabled  => '1',
-        gpgcheck => '1',
-        gpgkey   => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-      }
+  } elsif $::osfamily == 'Redhat' {
+    if $::operatingsystem == 'Fedora' {
+      $ostype='fedora'
+      $prefix='f'
     } else {
-      fail("Unsupported osfamily ${::osfamily}")
+        $ostype='el'
+        $prefix=''
+    }
+    yumrepo { 'puppetlabs-deps':
+      baseurl  => "http://yum.puppetlabs.com/${ostype}/${prefix}\$releasever/dependencies/\$basearch",
+      descr    => 'Puppet Labs Dependencies $releasever - $basearch ',
+      enabled  => '1',
+      gpgcheck => '1',
+      gpgkey   => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+    }
+
+    yumrepo { 'puppetlabs':
+      baseurl  => "http://yum.puppetlabs.com/${ostype}/${prefix}\$releasever/products/\$basearch",
+      descr    => 'Puppet Labs Products $releasever - $basearch',
+      enabled  => '1',
+      gpgcheck => '1',
+      gpgkey   => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
     }
+  } else {
+    fail("Unsupported osfamily ${::osfamily}")
+  }
 }

spec/classes/puppet_repo_puppetlabs_spec.rb

@@ -10,16 +10,20 @@
         :lsbdistid       => 'Ubuntu',
       }
     end
+    let(:key_hash) { {
+      'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+      'server' => 'pgp.mit.edu',
+    } }
     it 'should contain puppetlabs apt repos' do
       should contain_apt__source('puppetlabs').with(
         :repos      => 'main',
         :location   => 'http://apt.puppetlabs.com',
-        :key        => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+        :key        => key_hash,
       )
       should contain_apt__source('puppetlabs-deps').with(
         :repos      => 'dependencies',
         :location   => 'http://apt.puppetlabs.com',
-        :key        => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+        :key        => key_hash,
       )
     end
   end