opswalrus 1.0.68 → 1.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35026307769aa075aa52c9fe12f3bf64b86cf06dd3d519ce0a3bed4225ce59a0
-  data.tar.gz: 7884cfd87ae0862276f941410baeb4d74540a2e5f82ffef54290de897075c1f7
+  metadata.gz: 3be927f8a6e3ff21022fce2524d475897bdb910c4c7929dae53923b418fa74b0
+  data.tar.gz: 1ba0e6af4e70a2509db80f306f2f4b9e7ab299623ec86e931c9200d30e69142a
 SHA512:
-  metadata.gz: 0df0f1a38cf9b32fc26a35e97dab8966206bec399dea45f70a527c95b40355eaacafe065010cd6c5c68550cdb300ba6c4db2bf51b289a16b5261c292e90fbb41
-  data.tar.gz: 2f3b7bb0293ad6b02a8c539ac7b22fd73c6d689f65bf7f7316aac7c25d26635074a05cce8787e77b01a504da51cde35d36e19d50a91b9183d4ccdbfab1dbd212
+  metadata.gz: 7c3955d601910ecb51c000a2d875a9012827878c0b4bf140b2c8d35b4ca80c68a5702140fb66148303d5fc4d3367456a3ecccd3849b5fc2629fa07d1709a62d2
+  data.tar.gz: b0386db476b91c429c12bce0c15d690ca35e7cb2701fe38c4b0fdaa25ed931f1bc0c19e7067f72a52d40679b541da256699fd893bea5e8ef355757b06c66e6e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.68)
+    opswalrus (1.0.70)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/app.rb

@@ -449,7 +449,7 @@ module OpsWalrus
     end
 
     def report_inventory(host_references, tags: nil)
-      selected_hosts = inventory(tags, host_references)
+      selected_hosts = inventory(tags, host_references).hosts
 
       selected_hosts.each do |host|
         puts host.summary(verbose?)
@@ -464,7 +464,7 @@ module OpsWalrus
 
       host_references = [HostsFile::DEFAULT_FILE_NAME] if (host_references.nil? || host_references.empty?) && File.exist?(HostsFile::DEFAULT_FILE_NAME)
 
-      Inventory.new(host_references, tags).hosts
+      Inventory.new(host_references, tags)
     end
 
     def edit_inventory(file_path)

data/lib/opswalrus/hosts_file.rb

@@ -54,7 +54,7 @@ module OpsWalrus
       #   "192.168.56.10"=>{"tags"=>["web", "vagrant"]}
       # }
       @yaml.map do |host_ref, host_attrs|
-        next if ['default', 'defaults', 'secrets', 'ids'].include?(host_ref)
+        next if ['default', 'defaults', 'env', 'ids', 'secrets'].include?(host_ref)
 
         host_params = host_attrs.is_a?(Hash) ? host_attrs : {}
 
@@ -122,6 +122,11 @@ module OpsWalrus
       end
     end
 
+    # returns a Hash object that may have nested structures
+    def env
+      @env ||= (@yaml["env"] || {})
+    end
+
     def tags(host)
       host_attrs = @yaml[host]
 
@@ -144,14 +149,18 @@ module OpsWalrus
       hash["secrets"] = secrets
       hash["ids"] = ids
 
-      yaml = Psych.safe_dump(hash, permitted_classes: [SecretRef, Secret, PublicKey])
+      yaml = Psych.safe_dump(hash, permitted_classes: [SecretRef, Secret, PublicKey], line_width: 500)
       yaml.sub(/^---\s*/,"")    # omit the leading line: ---\n
     end
 
+    def has_secret?(secret_name)
+      secrets[secret_name]
+    end
+
     # returns the decrypted value referenced by secret_name
     def read_secret(secret_name)
       secret = secrets[secret_name]
-      secret.decrypt(@cipher)
+      secret.decrypt(@cipher) if secret
     end
 
     def encrypt_secrets!()

data/lib/opswalrus/inventory.rb

@@ -1,6 +1,7 @@
-require "pathname"
-require "tty-editor"
-require "yaml"
+require 'active_support/core_ext/hash'
+require 'pathname'
+require 'tty-editor'
+require 'yaml'
 
 module OpsWalrus
   class Inventory
@@ -11,6 +12,18 @@ module OpsWalrus
       @tags = tags
     end
 
+    def env
+      @env ||= hosts_files.reduce({}) {|memo, hosts_file| memo.deep_merge(hosts_file.env) }
+    end
+
+    def read_secret(secret_name)
+      hosts_files.find {|hosts_file| hosts_file.has_secret?(secret_name) }&.read_secret(secret_name)
+    end
+
+    def hosts_files
+      @hosts_files ||= @host_references.select {|ref| File.exist?(ref) }.map {|file_path| HostsFile.new(file_path) }
+    end
+
     def hosts()
       hosts_files, host_strings = @host_references.partition {|ref| File.exist?(ref) }
       inventory_file_hosts = hosts_files.

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -192,7 +192,7 @@ module OpsWalrus
       kwargs = kwargs.transform_keys(&:to_s)
       tags.concat(kwargs["tags"]) if kwargs["tags"]
 
-      @runtime_env.app.inventory(tags)
+      @runtime_env.app.inventory(tags).hosts
     end
 
     def exit(exit_status, message = nil)
@@ -244,6 +244,10 @@ module OpsWalrus
       end
     end
 
+    def read_secret(secret_name)
+      @runtime_env.read_secret(secret_name)
+    end
+
     # runs the given command
     # returns the stdout from the command
     def sh(desc_or_cmd = nil, cmd = nil, input: nil, &block)

data/lib/opswalrus/patches.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext/hash'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'json'
 require 'pathname'
 

data/lib/opswalrus/runtime_environment.rb

@@ -240,8 +240,7 @@ module OpsWalrus
 
     def initialize(app)
       @app = app
-      # @env = EnvParams.new(ENV)
-      @env = ENV.to_h.with_indifferent_access.easynav
+      @env = @app.inventory.env.deep_merge(ENV.to_h).with_indifferent_access.easynav
       @bundle_load_path = LoadPath.new(self, @app.bundle_dir)
       @app_load_path = LoadPath.new(self, @app.pwd)
 
@@ -262,6 +261,10 @@ module OpsWalrus
       configure_sshkit
     end
 
+    def read_secret(secret_name)
+      @app.inventory.read_secret(secret_name.to_s)
+    end
+
     # input_mapping : Hash[ String | Regex => String ]
     # sudo_password : String
     def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, &block)

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.68"
+  VERSION = "1.0.70"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.68
+  version: 1.0.70
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport