cem_acpt 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9526e4b417c867511e5d9c6ffe4ba78d826df1ab62a119c716c51e3ee435c7
-  data.tar.gz: 1ff8eb2952649b6e8d8543f8387c01d45db742572542116b1fd409a5908c0a9b
+  metadata.gz: 7b36c525ca6904813988ad305cc4a89607dff2edcdc8d749e347660047174b37
+  data.tar.gz: ed7e418fbcfadd8773f25f026afa0341119ab28c5e3cc91976f46c42e83af5aa
 SHA512:
-  metadata.gz: efbce7fcd14347831829087444f9f37968e953dc507720a12d946c2f7bebde8d724b23b658f0274c1ecc392252ed23067d31199715ea01d73beb7b19a021d9ec
-  data.tar.gz: 329b184d58d4681c19102d4b75514ab60f93e20f95d4b4d3eeee15dcc821a1ca9e13019fca2fe0cf47b4ac2ebf78a64108eacb9999bd7028f4c25b59452117da
+  metadata.gz: ee9ccfe1841b755c0f8df1937d66d0e04e62efe29326f16df33af5d9d66fe47441177098a2ffaffd1f843397d19d2f5cf95dcb1b4e536568d0d52cc5848aa052
+  data.tar.gz: c1c4f2b3a96134009552f9d464b407b64abef6d37f19df28f99b18b17445a492872a77116e924164c38aa65d1b8a96cb089ae7eff58f7414fbc5d7376f24e5cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.2.2)
+    cem_acpt (0.2.5)
       concurrent-ruby (~> 1.1.9)
       deep_merge (~> 1.2.2)
       net-ssh (~> 7.0.0.beta1)

data/lib/cem_acpt/platform/gcp/cmd.rb

@@ -337,17 +337,9 @@ module CemAcpt::Platform::Gcp
 
     # This function returns the currently authenticated user's name sanitized for use in SSH
     def authenticated_user_name
-      uname = nil
-      begin
-        uname = local_exec('config get-value account', out_format: nil, project_flag: false)
-      rescue RuntimeError
-        auth_json = local_exec('auth list')
-        uname = auth_json.find { |x| x['status'] == 'ACTIVE' }['account']
-      end
-
-      raise 'failed to find authenticated user name' unless uname
-
-      uname.gsub(/[^a-zA-Z0-9_]/, '_')
+      local_exec('compute os-login describe-profile', project_flag: false)['posixAccounts'][0]['username']
+    rescue StandardError => e
+      raise "failed to find authenticated user name from os-login profile: #{e.message}"
     end
   end
 end

data/lib/cem_acpt/utils.rb

@@ -82,10 +82,12 @@ module CemAcpt
     # SSH-related utilities
     module SSH
       def self.ssh_keygen
-        bin_path = `command -v ssh-keygen`.chomp
+        bin_path = `#{ENV['SHELL']} -c 'command -v ssh-keygen'`.chomp
         raise 'Cannot find ssh-keygen! Install it and verify PATH' unless bin_path
 
         bin_path
+      rescue StandardError => e
+        raise "Cannot find ssh-keygen! Install it and verify PATH. Orignal error: #{e}"
       end
 
       def self.default_keydir
@@ -98,7 +100,7 @@ module CemAcpt
       def self.ephemeral_ssh_key(type: 'rsa', bits: '4096', comment: nil, keydir: default_keydir)
         raise ArgumentError, 'keydir does not exist' unless ::File.directory?(keydir)
 
-        keyfile = ::File.join(keydir, SecureRandom.hex(16))
+        keyfile = ::File.join(keydir, 'acpt_test_key')
         keygen_cmd = [ssh_keygen, "-t #{type}", "-b #{bits}", "-f #{keyfile}", '-N ""']
         keygen_cmd << "-C \"#{comment}\"" if comment
         _, stderr, status = Open3.capture3(keygen_cmd.join(' '))

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement