Default to Elastic Stack version 7

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Release 7.0.0
+- Default to Elastic Stack version 7
+- Drop support for Puppet version < 4.10.0
+
 ## Release 6.3.2
  - Allow puppetlabs-apt version 7.x
  - Allow puppetlabs-stdlib version 6.x

manifests/repo.pp

@@ -16,7 +16,7 @@
   Boolean           $prerelease    = false,
   Optional[Integer] $priority      = undef,
   String            $proxy         = 'absent',
-  Integer           $version       = 6,
+  Integer           $version       = 7,
   Optional[String]  $base_repo_url = undef,
 ) {
   if $prerelease {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "elastic-elastic_stack",
-  "version": "6.3.2",
+  "version": "7.0.0",
   "author": "toby@jarpy.net",
   "summary": "Helpers for installing and configuring components of the Elastic Stack.",
   "license": "Apache-2.0",
@@ -65,7 +65,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.6.1 < 7.0.0"
+      "version_requirement": ">= 4.10.0 < 7.0.0"
     }
   ],
   "pdk-version": "1.0.1",

spec/classes/repo_spec.rb

@@ -10,17 +10,17 @@ def url(format, version)
   end
 end
 
-def declare_apt(version: '6.x', **params)
+def declare_apt(version: '7.x', **params)
   params[:location] ||= url('apt', version)
   contain_apt__source('elastic').with(params)
 end
 
-def declare_yum(version: '6.x', **params)
+def declare_yum(version: '7.x', **params)
   params[:baseurl] ||= url('yum', version)
   contain_yumrepo('elastic').with(params)
 end
 
-def declare_zypper(version: '6.x', **params)
+def declare_zypper(version: '7.x', **params)
   params[:baseurl] ||= url('yum', version)
   contain_zypprepo('elastic').with(params)
 end
@@ -70,6 +70,19 @@ def declare_zypper(version: '6.x', **params)
         end
       end
 
+      context 'with "version => 6"' do
+        let(:params) { default_params.merge(version: 6) }
+
+        case facts[:os]['family']
+        when 'Debian'
+          it { is_expected.to declare_apt(version: '6.x') }
+        when 'RedHat'
+          it { is_expected.to declare_yum(version: '6.x') }
+        when 'Suse'
+          it { is_expected.to declare_zypper(version: '6.x') }
+        end
+      end
+
       context 'with "priority => 99"' do
         let(:params) { default_params.merge(priority: 99) }
 
@@ -88,11 +101,11 @@ def declare_zypper(version: '6.x', **params)
 
         case facts[:os]['family']
         when 'Debian'
-          it { is_expected.to declare_apt(version: '6.x-prerelease') }
+          it { is_expected.to declare_apt(version: '7.x-prerelease') }
         when 'RedHat'
-          it { is_expected.to declare_yum(version: '6.x-prerelease') }
+          it { is_expected.to declare_yum(version: '7.x-prerelease') }
         when 'Suse'
-          it { is_expected.to declare_zypper(version: '6.x-prerelease') }
+          it { is_expected.to declare_zypper(version: '7.x-prerelease') }
         end
       end
 
@@ -101,11 +114,11 @@ def declare_zypper(version: '6.x', **params)
 
         case facts[:os]['family']
         when 'Debian'
-          it { is_expected.to declare_apt(version: 'oss-6.x') }
+          it { is_expected.to declare_apt(version: 'oss-7.x') }
         when 'RedHat'
-          it { is_expected.to declare_yum(version: 'oss-6.x') }
+          it { is_expected.to declare_yum(version: 'oss-7.x') }
         when 'Suse'
-          it { is_expected.to declare_zypper(version: 'oss-6.x') }
+          it { is_expected.to declare_zypper(version: 'oss-7.x') }
         end
       end
 
@@ -114,11 +127,11 @@ def declare_zypper(version: '6.x', **params)
 
         case facts[:os]['family']
         when 'Debian'
-          it { is_expected.to declare_apt(version: 'oss-6.x-prerelease') }
+          it { is_expected.to declare_apt(version: 'oss-7.x-prerelease') }
         when 'RedHat'
-          it { is_expected.to declare_yum(version: 'oss-6.x-prerelease') }
+          it { is_expected.to declare_yum(version: 'oss-7.x-prerelease') }
         when 'Suse'
-          it { is_expected.to declare_zypper(version: 'oss-6.x-prerelease') }
+          it { is_expected.to declare_zypper(version: 'oss-7.x-prerelease') }
         end
       end
 
@@ -127,11 +140,11 @@ def declare_zypper(version: '6.x', **params)
 
         case facts[:os]['family']
         when 'Debian'
-          it { is_expected.to declare_apt(location: 'https://mymirror.example.org/elastic-artifacts/packages/6.x/apt') }
+          it { is_expected.to declare_apt(location: 'https://mymirror.example.org/elastic-artifacts/packages/7.x/apt') }
         when 'RedHat'
-          it { is_expected.to declare_yum(baseurl: 'https://mymirror.example.org/elastic-artifacts/packages/6.x/yum') }
+          it { is_expected.to declare_yum(baseurl: 'https://mymirror.example.org/elastic-artifacts/packages/7.x/yum') }
         when 'Suse'
-          it { is_expected.to declare_zypper(baseurl: 'https://mymirror.example.org/elastic-artifacts/packages/6.x/yum') }
+          it { is_expected.to declare_zypper(baseurl: 'https://mymirror.example.org/elastic-artifacts/packages/7.x/yum') }
         end
       end