kitchen-transport-train 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 133f962428df05c64cdd391b97494d38e8e63bef96ef3ee4df43927f66809516
-  data.tar.gz: 9071b6c0b96470fc32638422f3c2658e7a5dfe63c387269fd176fbf5717d3f7f
+  metadata.gz: 73b1cac962017682b0b06008f9f5d6ed0abdfda2be33a39c4cb487ad703773c2
+  data.tar.gz: faa11ed4ab87a67bc9dc6b2caffb74b2538d5166c3a742549a5524b037367b12
 SHA512:
-  metadata.gz: 361d12c68100e3ffc4ca93cba6d8ae1ea9cc4a56aa77c09ae85bd8708dbe7bc8a05dabc0edf3785aa553ea22379c27c38c8c37397adba60c22446882e0e558d1
-  data.tar.gz: 84f44ff085c7784525da0b3b2a46d54d5672aca6607190698141874c3c21b1e664ef7ab7f9e5152122687968041b96b6aeaf0329d31e78bfec47d7c9e6e03dc4
+  metadata.gz: 554fc9afd48408fd7615b616a54b4603f2bf6a2efb69f9e96157f54182686b32031005f5899cc865c388c030dc76ff8d93bb018ec5ca96f768df13cd484c5c50
+  data.tar.gz: 45f6bf81dffdf21825fa92b5f46225bd0cff7a558f033470382e0f20c05b12cb56e5205161db44e5f4d3bccb1a911b23c293a87c4dd252aec3ac316cc0fd751c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 0.2.0
+
+- Fix disparity between TestKitchen SSH wait parameters and Train
+- Fix user passing via a `train_user` override parameters
+- Add call to generate an RFC099 credentials file
+
 ## Version 0.1.0
 
 - Initial version

data/README.md

@@ -45,6 +45,10 @@ transport:
 
 Options `user`, `host` and `password` (for kitchen-ec2 and Windows instances) are set automatically.
 
+If you want to use `kitchen-ec2` with the `root` user however (as needed in Chef 19 Target Mode), you need to additionally specify `train_user: root`. This is due to a long-standing bug in Kitchen-EC2 where the standard platform's autodetected user will override manually specified `root` values.
+
+Standard and community-supported options for transports:
+
 - [AWS Session Manager Transport](https://github.com/tecracer-chef/train-awsssm/blob/master/lib/train-awsssm/transport.rb#L8-L14)
 - Docker Transport: no additional options
 - [Serial/USB Transport](https://github.com/tecracer-chef/train-serial/blob/master/lib/train-serial/transport.rb#L8-L22)

data/lib/kitchen/transport/train.rb

@@ -39,6 +39,31 @@ module Kitchen
           yield self if block_given?
         end
 
+        def train_uri
+          @connection.uri
+        end
+
+        def credentials_file
+          instance_name = @connection.transport_options[:instance_name]
+
+          config = @backend.instance_variable_get(:@connection_options)
+          config.compact!
+          config.transform_values! { |v| v.is_a?(Symbol) ? v.to_s : v }
+
+          # Some configuration variables vary between transports
+          config[:host] = config[:hostname] = @connection.transport_options[:host]
+          config[:key_files] = @connection.transport_options[:key_files]
+
+          # Due to a long-standing bug in TestKitchen, standard platforms will override
+          # kitchen.yml `user` settings, so this transport introduces an "train_user" override.
+          # See https://github.com/test-kitchen/kitchen-ec2/pull/273
+          config[:user] = config[:username] = @connection.transport_options[:train_user] || @connection.transport_options[:user]
+
+          require "toml-rb" unless defined?(TomlRB)
+
+          "['#{instance_name}']\n" + TomlRB.dump(config)
+        end
+
         def execute(command)
           return if command.nil?
 
@@ -95,6 +120,10 @@ module Kitchen
           data.delete(:ssh_key)
         end
 
+        # Adjust option defaults
+        data[:retries] = 15
+        data[:delay] = 5
+
         data
       end
     end

data/lib/kitchen-transport-train/version.rb

@@ -1,3 +1,3 @@
 module KitchenTransportTrain
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-transport-train
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Heinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Kitchen transport for any Train backend