Skip to content

Commit

Permalink
test(share): remove unnecessary hostname mangling
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Sep 21, 2020
1 parent 02ce903 commit 194aa97
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 37 deletions.
7 changes: 1 addition & 6 deletions test/integration/default/controls/_mapdata_spec.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# frozen_string_literal: true

# Replace per minion strings
replacement = {
hostname: system.hostname
}

# Keep only first 2 digits from Ubuntu finger
mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"

# 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
title 'should contain the lines'
Expand Down
1 change: 0 additions & 1 deletion test/integration/share/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Its goal is to share the libraries between all profiles.

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[:family]` provide a family name for Arch
- `system.platform[:name]` modify `amazon` to `amazonlinux`
Expand Down
30 changes: 0 additions & 30 deletions test/integration/share/libraries/system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,17 @@
# Author: 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)
name 'system'

attr_reader :platform
attr_reader :hostname

def initialize
@platform = build_platform
@hostname = found_hostname
end

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
{
family: build_platform_family,
Expand Down

0 comments on commit 194aa97

Please sign in to comment.