mirror of
https://github.com/saltstack-formulas/template-formula.git
synced 2025-04-17 10:10:28 +00:00
test(share): remove unnecessary hostname mangling
* https://github.com/saltstack-formulas/openssh-formula/pull/195
This commit is contained in:
parent
02ce903e2b
commit
194aa97dff
3 changed files with 1 additions and 37 deletions
|
@ -1,15 +1,10 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
# Replace per minion strings
|
|
||||||
replacement = {
|
|
||||||
hostname: system.hostname
|
|
||||||
}
|
|
||||||
|
|
||||||
# Keep only first 2 digits from Ubuntu finger
|
# Keep only first 2 digits from Ubuntu finger
|
||||||
mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"
|
mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"
|
||||||
|
|
||||||
# Load the mapdata from profile https://docs.chef.io/inspec/profiles/#profile-files
|
# Load the mapdata from profile https://docs.chef.io/inspec/profiles/#profile-files
|
||||||
mapdata_dump = inspec.profile.file(mapdata_file) % replacement
|
mapdata_dump = inspec.profile.file(mapdata_file)
|
||||||
|
|
||||||
control '`map.jinja` YAML dump' do
|
control '`map.jinja` YAML dump' do
|
||||||
title 'should contain the lines'
|
title 'should contain the lines'
|
||||||
|
|
|
@ -10,7 +10,6 @@ Its goal is to share the libraries between all profiles.
|
||||||
|
|
||||||
The `system` library provides easy access to system dependent information:
|
The `system` library provides easy access to system dependent information:
|
||||||
|
|
||||||
- `system.hostname`: return the result of `hostname -s` or `hostnamectl --static` based on the availability of either command
|
|
||||||
- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
|
- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
|
||||||
- `system.platform[:family]` provide a family name for Arch
|
- `system.platform[:family]` provide a family name for Arch
|
||||||
- `system.platform[:name]` modify `amazon` to `amazonlinux`
|
- `system.platform[:name]` modify `amazon` to `amazonlinux`
|
||||||
|
|
|
@ -4,47 +4,17 @@
|
||||||
# Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
|
# Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
|
||||||
# Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
|
# Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
|
||||||
|
|
||||||
HOSTNAME_CMDS = %w[hostname hostnamectl].freeze
|
|
||||||
HOSTNAME_CMDS_OPT = {
|
|
||||||
'hostname' => '-s',
|
|
||||||
'hostnamectl' => '--static'
|
|
||||||
}.freeze
|
|
||||||
|
|
||||||
class SystemResource < Inspec.resource(1)
|
class SystemResource < Inspec.resource(1)
|
||||||
name 'system'
|
name 'system'
|
||||||
|
|
||||||
attr_reader :platform
|
attr_reader :platform
|
||||||
attr_reader :hostname
|
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@platform = build_platform
|
@platform = build_platform
|
||||||
@hostname = found_hostname
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def found_hostname
|
|
||||||
cmd = guess_hostname_cmd
|
|
||||||
|
|
||||||
unless cmd.exit_status.zero?
|
|
||||||
raise Inspec::Exceptions::ResourceSkipped,
|
|
||||||
"Error running '#{cmd}': #{cmd.stderr}"
|
|
||||||
end
|
|
||||||
|
|
||||||
cmd.stdout.chomp
|
|
||||||
end
|
|
||||||
|
|
||||||
def guess_hostname_cmd
|
|
||||||
HOSTNAME_CMDS.each do |cmd|
|
|
||||||
if inspec.command(cmd).exist?
|
|
||||||
return inspec.command("#{cmd} #{HOSTNAME_CMDS_OPT[cmd]}")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
raise Inspec::Exceptions::ResourceSkipped,
|
|
||||||
"Error: #{@platform[:finger]}} has none of #{HOSTNAME_CMDS.join(', ')}"
|
|
||||||
end
|
|
||||||
|
|
||||||
def build_platform
|
def build_platform
|
||||||
{
|
{
|
||||||
family: build_platform_family,
|
family: build_platform_family,
|
||||||
|
|
Loading…
Add table
Reference in a new issue