diff --git a/.rubocop.yml b/.rubocop.yml index 47b1aadbe6..e6da9335a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -51,6 +51,8 @@ Style/FormatStringToken: Description: Following the main puppet project's style, prefer the simpler template tokens over annotated ones. EnforcedStyle: template +Style/HashSyntax: + Enabled: false Style/Lambda: Description: Prefer the keyword for easier discoverability. EnforcedStyle: literal diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index 176e0590c5..0f0abfdc4e 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -54,7 +54,7 @@ def self.instances short: line_hash[:key_short], long: line_hash[:key_long], ensure: :present, - expired:, + expired: expired, expiry: line_hash[:key_expiry].nil? ? nil : line_hash[:key_expiry].strftime('%Y-%m-%d'), size: line_hash[:key_size], type: line_hash[:key_type], diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb index 2ebef212a1..e1d3f15c2a 100644 --- a/spec/classes/apt_backports_spec.rb +++ b/spec/classes/apt_backports_spec.rb @@ -18,7 +18,7 @@ full: release_full }, distro: { - codename:, + codename: codename, id: 'Ubuntu' } } @@ -50,7 +50,7 @@ full: release_full }, distro: { - codename:, + codename: codename, id: 'Ubuntu' } } @@ -88,7 +88,7 @@ full: release_full }, distro: { - codename:, + codename: codename, id: 'Ubuntu' } } @@ -127,7 +127,7 @@ full: release_full }, distro: { - codename:, + codename: codename, id: 'Ubuntu' } } diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index b93485c8ab..72330e0e01 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -4,7 +4,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = []) [ - environment:, + environment: environment, command: "/opt/puppetlabs/puppet/cache/add-apt-repository-#{user}-ubuntu-#{repo}-#{distro}.sh", logoutput: 'on_failure', ] diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb index a864bdb73a..4d18c7f157 100644 --- a/spec/defines/source_spec.rb +++ b/spec/defines/source_spec.rb @@ -109,7 +109,7 @@ it { expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'present', - id:) + id: id) } end @@ -147,7 +147,7 @@ it { expect(subject).to contain_apt__key("Add key: #{id} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with(ensure: 'refreshed', - id:, + id: id, server: 'pgp.mit.edu', content: 'GPG key content', source: 'http://apt.puppetlabs.com/pubkey.gpg',