Merge pull request #432 from ghoneycutt/fix_ssh_host_data_type

Fix data type for 'host' to allow for wildcards

.devcontainer/README.md

@@ -1,11 +1,11 @@
 # devcontainer
 
 
-For format details, see https://aka.ms/devcontainer.json. 
+For format details, see https://aka.ms/devcontainer.json.
 
 For config options, see the README at:
 https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
- 
+
 ``` json
 {
 	"name": "Puppet Development Kit (Community)",

.github/workflows/ci.yaml

@@ -68,7 +68,7 @@ jobs:
     env:
       BUNDLE_WITHOUT: development:release
       BEAKER_debug: true
-    name: 
+    name:
     steps:
       - name: Enable IPv6 on docker
         run: |

REFERENCE.md

@@ -2671,7 +2671,7 @@ Alias of
 
 ```puppet
 Struct[{
-    Optional['Host']                             => Stdlib::Host,
+    Optional['Host']                             => String[1],
     Optional['Match']                            => String[1],
     Optional['AddKeysToAgent']                   => Enum['yes', 'no', 'ask', 'confirm'],
     Optional['AddressFamily']                    => Enum['any', 'inet', 'inet6'],

manifests/config_file_client.pp

@@ -1,4 +1,4 @@
-# @summary Create config files to be used 
+# @summary Create config files to be used
 #
 # Manage an entry in ~/.ssh/config for a particular user. Lines model the
 # lines in each Host block.

manifests/config_file_server.pp

@@ -1,4 +1,4 @@
-# @summary Create config files to be used 
+# @summary Create config files to be used
 #
 # Manage an entry in ~/.ssh/config for a particular user. Lines model the
 # lines in each Host block.

spec/type_aliases/ssh_config_spec.rb

@@ -276,13 +276,18 @@
 
   context 'String[1]' do
     [
-      'Match', 'BindAddress', 'BindInterface', 'CanonicalDomains', 'CanonicalizePermittedCNAMEs', 'CASignatureAlgorithms',
-      'CertificateFile', 'Ciphers', 'ControlPath', 'ControlPersist', 'DynamicForward', 'EscapeChar', 'GlobalKnownHostsFile',
-      'HostbasedAcceptedAlgorithms', 'HostKeyAlgorithms', 'HostKeyAlias', 'Hostname', 'IdentityAgent', 'IdentityFile',
-      'IgnoreUnknown', 'Include', 'IPQoS', 'KbdInteractiveDevices', 'KexAlgorithms', 'KnownHostsCommand', 'LocalCommand',
-      'LocalForward', 'LogVerbose', 'MACs', 'PermitRemoteOpen', 'PKCS11Provider', 'PreferredAuthentications', 'ProxyCommand',
-      'ProxyJump', 'PubkeyAcceptedAlgorithms', 'RekeyLimit', 'RemoteCommand', 'RemoteForward', 'RevokedHostKeys',
-      'SecurityKeyProvider', 'SendEnv', 'SetEnv', 'TunnelDevice', 'User', 'UserKnownHostsFile', 'XAuthLocation'
+      'Match', 'BindAddress', 'BindInterface', 'CanonicalDomains',
+      'CanonicalizePermittedCNAMEs', 'CASignatureAlgorithms',
+      'CertificateFile', 'Ciphers', 'ControlPath', 'ControlPersist',
+      'DynamicForward', 'EscapeChar', 'GlobalKnownHostsFile', 'Host',
+      'HostbasedAcceptedAlgorithms', 'HostKeyAlgorithms', 'HostKeyAlias',
+      'Hostname', 'IdentityAgent', 'IdentityFile', 'IgnoreUnknown', 'Include',
+      'IPQoS', 'KbdInteractiveDevices', 'KexAlgorithms', 'KnownHostsCommand',
+      'LocalCommand', 'LocalForward', 'LogVerbose', 'MACs', 'PermitRemoteOpen',
+      'PKCS11Provider', 'PreferredAuthentications', 'ProxyCommand',
+      'ProxyJump', 'PubkeyAcceptedAlgorithms', 'RekeyLimit', 'RemoteCommand',
+      'RemoteForward', 'RevokedHostKeys', 'SecurityKeyProvider', 'SendEnv',
+      'SetEnv', 'TunnelDevice', 'User', 'UserKnownHostsFile', 'XAuthLocation'
     ].each do |directive|
       describe directive.inspect do
         [
@@ -337,25 +342,6 @@
     end
   end
 
-  context 'Stdlib::Host' do
-    [
-      'Host',
-    ].each do |directive|
-      describe directive.inspect do
-        [
-          'string', 'host.domain.tld', '242.242.242.242', '242', nil, :keyword # FIXME: unsure why nil and :keyword are actually supported
-        ].each do |valid|
-          it { is_expected.to allow_value(directive => valid) }
-        end
-        [
-          '_invalid.domain.tld', 'ネット', ['array'], { 'ha' => 'sh' }, [], '', 242, 0x242, true, false, [nil], [nil, nil]
-        ].each do |invalid|
-          it { is_expected.not_to allow_value(directive => invalid) }
-        end
-      end
-    end
-  end
-
   context 'Stdlib::Port' do
     [
       'Port',

types/ssh_config.pp

@@ -2,7 +2,7 @@
 #
 type Ssh::Ssh_Config = Struct[
   {
-    Optional['Host']                             => Stdlib::Host,
+    Optional['Host']                             => String[1],
     Optional['Match']                            => String[1],
     Optional['AddKeysToAgent']                   => Enum['yes', 'no', 'ask', 'confirm'],
     Optional['AddressFamily']                    => Enum['any', 'inet', 'inet6'],