Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/apt_key/apt_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/apt_backports_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
full: release_full
},
distro: {
codename:,
codename: codename,
id: 'Ubuntu'
}
}
Expand Down Expand Up @@ -50,7 +50,7 @@
full: release_full
},
distro: {
codename:,
codename: codename,
id: 'Ubuntu'
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@
full: release_full
},
distro: {
codename:,
codename: codename,
id: 'Ubuntu'
}
}
Expand Down Expand Up @@ -127,7 +127,7 @@
full: release_full
},
distro: {
codename:,
codename: codename,
id: 'Ubuntu'
}
}
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/ppa_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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',
Expand Down
Loading