cem_acpt 0.3.5-universal-java-17 → 0.3.7-universal-java-17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b62e59f800597758c9a69bc1ede3d3f97a9a68c6c38f0d4705201ac2613feab9
-  data.tar.gz: 4d4a0ad559702df7cff661726a962b0bbc278d2cb0ecba48241a67a55345dac6
+  metadata.gz: 024fe8552168e6308e04edd5b2b3509f9b0249b140e1bbb42279eb0ad5095a3f
+  data.tar.gz: bd8da637c1179eec3ccb906e476996a5cc9f4f61194c81bbc378dcaed9e9fd14
 SHA512:
-  metadata.gz: ee72270cae3121c03597e12f91c3fd6134da4ab40ef342cc3f694ea0a5ee2dcaf37363e9430b2610539120e0cf5ea733caf191d916a926e2d29dc17ac8bc7cfb
-  data.tar.gz: 79a40b4e74935a7842bffd7b9252aa63d277cc31e49c0a3a10200f647117a1c3e51d4183a3e2e16aa9cc0e1fd185d0ee375177fdc876ca4097e8828884b55f36
+  metadata.gz: bef27a028ae54ef8aef9860bc2c59b71397f537cd5ece28a69443c9e6351f79b93986b6d24f57c3587adff5eccb7acc7a7d1c91c12842e8df7b18ae8f838c377
+  data.tar.gz: 417ca629dc9f5e1dc6c6df84c9f27a8e574d2350d96fa0887fcb33cd9bd349bb9536767a3a67db6ac99bab8ffe6428bb91e72d1cbd6713b83835381422032cdf

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.3.5-universal-java-17)
+    cem_acpt (0.3.7-universal-java-17)
       concurrent-ruby (>= 1.1, < 2.0)
       deep_merge (>= 1.2, < 2.0)
       ed25519 (>= 1.2, < 2.0)
-      net-ssh (>= 7.0, < 8.0)
+      net-ssh (>= 7.0, < 7.1)
       puppet-modulebuilder (>= 0.0.1)
       serverspec-cem-acpt
 
@@ -14,11 +14,12 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
     ed25519 (1.3.0-java)
     ffi (1.15.5-java)
+    json (2.6.3-java)
     method_source (1.0.0)
     minitar (0.9)
     multi_json (1.15.0)
@@ -27,7 +28,7 @@ GEM
     net-ssh (7.0.1)
     net-telnet (0.1.1)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     pathspec (1.0.0)
     pry (0.14.2-java)
@@ -39,36 +40,37 @@ GEM
       pathspec (>= 0.2.1, < 2.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.31.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.48.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
     serverspec-cem-acpt (2.42.0)
       multi_json
       rspec (~> 3.0)
@@ -82,7 +84,7 @@ GEM
       sfl
     spoon (0.0.6)
       ffi
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   universal-java-17

data/cem_acpt.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'concurrent-ruby', '>= 1.1', '< 2.0'
   spec.add_runtime_dependency 'deep_merge', '>= 1.2', '< 2.0'
   spec.add_runtime_dependency 'ed25519', '>= 1.2', '< 2.0'
-  spec.add_runtime_dependency 'net-ssh', '>= 7.0', '< 8.0'
+  spec.add_runtime_dependency 'net-ssh', '>= 7.0', '< 7.1'
   spec.add_runtime_dependency 'puppet-modulebuilder', '>= 0.0.1'
   spec.add_runtime_dependency 'serverspec-cem-acpt'
   spec.add_development_dependency 'rubocop'

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

@@ -241,9 +241,11 @@ module CemAcpt::Platform::Gcp
     end
 
     def create
-      # Add the test ssh key to os-login
-      logger.debug("Adding test SSH key to os-login for #{name}")
-      @cmd.local_exec("compute os-login ssh-keys add --key-file #{@cmd.ssh_key}.pub --project #{project.name} --ttl 4h")
+      unless @cmd.ssh_key.include?('google_compute_engine')
+        # Add the test ssh key to os-login
+        logger.debug("Adding test SSH key to os-login for #{name}")
+        @cmd.local_exec("compute os-login ssh-keys add --key-file #{@cmd.ssh_key}.pub --project #{project.name} --ttl 1h")
+      end
       @cmd.local_exec(create_cmd)
     rescue StandardError => e
       raise "Failed to create VM #{name} with command #{create_cmd}: #{e}"

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: universal-java-17
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '7.1'
   name: net-ssh
   prerelease: false
   type: :runtime
@@ -89,7 +89,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: