avm 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea575c3e0ebcc43678325a4a682ea17c915ecae1eb6d133335b3e94ace56ca3
-  data.tar.gz: 2ed8fc21068a44f5ae816aa098a866650f32511b09afca2e75af2b620cd89f9b
+  metadata.gz: fc4f095582fb4fb51a80f667437b95281791bf218ba89e43ff402e337baaeb3a
+  data.tar.gz: 3b4a59e42bf16ab8ace7031604f43f7e9efb876836c4b3bc33342b1862ba7fa9
 SHA512:
-  metadata.gz: 3c87d398c755f55f71a827167bfbe0131d08d5df55af5497ccc7fd239cd059e59c9f251dbe448ca13df30c31da76e147dc2bd8e0d1501130000a219313b5e39d
-  data.tar.gz: e188963cfc504522f52eb86e7de7490427c194496c61e2d6771bdfdd697de9d9e6647cc0c1c772c6f19b3799bdd05c3054f999caa8168708a29e910d19398431
+  metadata.gz: ab5e8effc7ce4575c18922fa0c777b2e61bd97cf20cfdb40981a81b166970e00b7fdd3d49b16b3155715743b59b063585e5d8bbc4b7c6edab7c2927597dc36e7
+  data.tar.gz: 7cfaaaf7877b87c4a5de68d4c84ae70c1424f6287635b97b26468f97350d9000e858c1559758eabb8004b98765574cf63d928d8c6f3f609129c68bf5f4a19a98

data/lib/avm/instances/base/auto_values/admin.rb

@@ -6,11 +6,11 @@ module Avm
       module AutoValues
         module Admin
           def auto_admin_email
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.email')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.email')
           end
 
           def auto_admin_name
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.name')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.name')
           end
         end
       end

data/lib/avm/instances/base/auto_values/database.rb

@@ -61,7 +61,7 @@ module Avm
           def database_auto_common(suffix)
             database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
-              inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, database_key)
+              inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, database_key)
           end
 
           def database_port_by_system

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -8,29 +8,30 @@ module Avm
       module AutoValues
         module Filesystem
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url
-            auto_fs_url_with_ssh || auto_fs_url_without_ssh
+            auto_fs_url_with_install || auto_fs_url_without_install
           end
 
-          def auto_fs_url_with_ssh
-            read_entry_optional('ssh.url').if_present do |ssh_url|
+          def auto_fs_url_with_install
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL)
+              .if_present do |install_url|
               read_entry_optional('fs_path').if_present do |fs_path|
-                "#{ssh_url}#{fs_path}"
+                "#{install_url}#{fs_path}"
               end
             end
           end
 
-          def auto_fs_url_without_ssh
-            return nil if read_entry_optional('ssh.url').present?
+          def auto_fs_url_without_install
+            return nil if read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present?
 
             read_entry_optional('fs_path').if_present do |fs_path|
               "file://#{fs_path}"

data/lib/avm/instances/base/auto_values/install.rb

@@ -12,22 +12,22 @@ module Avm
           end
 
           def auto_install_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
           end
 
           def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
           end
 
           def auto_install_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_install_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_URL) ||
               auto_install_url_by_parts
           end

data/lib/avm/instances/base/auto_values/mailer.rb

@@ -17,9 +17,9 @@ module Avm
           end
 
           def auto_mailer_id
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::MAILER_ID) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::HOST_ID)
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_ID)
           end
 
           private

data/lib/avm/instances/base/auto_values/ruby.rb

@@ -6,7 +6,7 @@ module Avm
       module AutoValues
         module Ruby
           def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ruby.version')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
           end
         end
       end

data/lib/avm/instances/base/auto_values/system.rb

@@ -8,12 +8,12 @@ module Avm
       module AutoValues
         module System
           def auto_system_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.username') ||
-              read_entry_optional('ssh.username')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.username') ||
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_system_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.groupname') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.groupname') ||
               read_entry_optional('system.username')
           end
         end

data/lib/avm/instances/base/auto_values.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     class Base
       module AutoValues
-        extend ::ActiveSupport::Concern
+        require_sub __FILE__
 
-        included do
+        common_concern do
           %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
             .each do |class_name|
             include const_get(class_name)

data/lib/avm/instances/base.rb

@@ -51,11 +51,11 @@ module Avm
       end
 
       def host_env_uncached
-        access = read_entry(:access, list: ::Avm::Instances::Base.lists.access.values)
-        case access
+        install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
+        case install_uri.scheme
         when 'local' then ::EacRubyUtils::Envs.local
-        when 'ssh' then ::EacRubyUtils::Envs.ssh(read_entry('ssh.url'))
-        else raise("Unmapped access value: \"#{access}\"")
+        when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
+        else raise("Unmapped access value: \"#{install_uri}\"")
         end
       end
 

data/lib/avm/instances/entry_keys.rb

@@ -44,12 +44,12 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        '' => %w[data_fs_path fs_path name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS,
+        install: URI_FIELDS + %w[id],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

data/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.31.0'
+  VERSION = '0.32.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli