Skip to content

Commit

Permalink
Update default version from 1.16.3->1.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastelfreak
bastelfreak committed Oct 30, 2024
1 parent b1ede8b commit 271f218
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion REFERENCE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ Data type: `String[1]`

Specify version of consul binary to download.

Default value: `'1.16.3'`
Default value: `'1.20.0'`

##### <a name="-consul--watches"></a>`watches`

Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
Enum['stopped', 'running'] $service_ensure = 'running',
Hash $services = {},
String[1] $user = $consul::params::user,
String[1] $version = '1.16.3',
String[1] $version = '1.20.0',
Hash $watches = {},
Optional[String[1]] $shell = $consul::params::shell,
Boolean $enable_beta_ui = false,
Expand Down
12 changes: 5 additions & 7 deletions spec/acceptance/class_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
pp = <<-EOS
package { 'unzip': ensure => present }
-> class { 'consul':
version => '1.16.0',
version => '1.16.3',
manage_service => true,
config_hash => {
'data_dir' => '/opt/consul',
Expand All @@ -32,7 +32,7 @@
end

describe command('consul version') do
its(:stdout) { is_expected.to match %r{Consul v1.16.0} }
its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
end

describe file('/etc/consul/config.json') do
Expand All @@ -46,7 +46,7 @@
pp = <<-EOS
package { 'unzip': ensure => present }
-> class { 'consul':
version => '1.16.3',
version => '1.20.0',
manage_service => true,
config_hash => {
'datacenter' => 'east-aws',
Expand All @@ -73,7 +73,7 @@
end

describe command('consul version') do
its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
its(:stdout) { is_expected.to match %r{Consul v1.20.0} }
end

describe file('/etc/consul/config.json') do
Expand All @@ -87,7 +87,6 @@
pp = <<-EOS
package { 'unzip': ensure => present }
-> class { 'consul':
version => '1.16.3',
manage_service => true,
config_hash => {
'datacenter' => 'east-aws',
Expand Down Expand Up @@ -133,7 +132,6 @@
pp = <<-EOS
package { 'unzip': ensure => present }
-> class { 'consul':
version => '1.16.3',
manage_service => true,
config_hash => {
'datacenter' => 'east-aws',
Expand Down Expand Up @@ -207,7 +205,7 @@
end

describe command('consul version') do
its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
its(:stdout) { is_expected.to match %r{Consul v1.20.0} }
end

describe command("consul acl token list --token #{acl_master_token} | grep Description") do
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/init_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
end

context 'When installing via URL by default' do
it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
it { is_expected.to contain_archive('/opt/consul/archives/consul-1.20.0.zip').with(source: 'https://releases.hashicorp.com/consul/1.20.0/consul_1.20.0_linux_amd64.zip') }
it { is_expected.to contain_file('/opt/consul/archives').with(ensure: 'directory') }
it { is_expected.to contain_file('/opt/consul/archives/consul-1.16.3').with(ensure: 'directory') }
it { is_expected.to contain_file('/opt/consul/archives/consul-1.20.0').with(ensure: 'directory') }
it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
end

Expand All @@ -158,20 +158,20 @@
}
end

it { is_expected.to contain_archive('/usr/share/puppet-archive/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
it { is_expected.to contain_archive('/usr/share/puppet-archive/consul-1.20.0.zip').with(source: 'https://releases.hashicorp.com/consul/1.20.0/consul_1.20.0_linux_amd64.zip') }
it { is_expected.to contain_file('/usr/share/puppet-archive').with(ensure: 'directory') }
it { is_expected.to contain_file('/usr/share/puppet-archive/consul-1.16.3').with(ensure: 'directory') }
it { is_expected.to contain_file('/usr/share/puppet-archive/consul-1.20.0').with(ensure: 'directory') }
it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
end

context 'When installing by archive via URL and current version is already installed' do
let(:facts) do
os_facts.merge({
consul_version: '1.16.3'
consul_version: '1.20.0'
})
end

it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
it { is_expected.to contain_archive('/opt/consul/archives/consul-1.20.0.zip').with(source: 'https://releases.hashicorp.com/consul/1.20.0/consul_1.20.0_linux_amd64.zip') }
it { is_expected.to contain_file('/usr/local/bin/consul') }
it { is_expected.not_to contain_notify(['Class[consul::run_service]']) }
end
Expand All @@ -194,7 +194,7 @@
}
end

it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'http://myurl') }
it { is_expected.to contain_archive('/opt/consul/archives/consul-1.20.0.zip').with(source: 'http://myurl') }
it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
end

Expand Down

0 comments on commit 271f218

Please sign in to comment.