manageiq-appliance_console 7.0.5 → 7.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/manageiq/appliance_console/database_configuration.rb +1 -1
  3. data/lib/manageiq/appliance_console/utilities.rb +6 -1
  4. data/lib/manageiq/appliance_console/version.rb +1 -1
  5. data/manageiq-appliance_console.gemspec +3 -3
  6. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 48202f6a4a14265802a0e34ffcdd359715b8b07191f9dbe0a0a6b3e14ad017fd
4
- data.tar.gz: 463a257b562ec85eccc15fcc5268079014448272d807c7b31694884e2daf0dae
3
+ metadata.gz: 5a87349bf14d9211aa40088c39668407f50545de717a9da552e74430a44750e5
4
+ data.tar.gz: 4f3a63c811e3e0e4db435fa96a476c8d5988cd4b70eab125abe5fa0a9812c976
5
5
  SHA512:
6
- metadata.gz: 7afe58fd0ccd9153ea88aac7e7420255ac1239c8e976d2ff1b6f6a88e436c81363296225b82435504b895ec67203d63a4988f7117e9e1b16092ca57e852d8fc6
7
- data.tar.gz: 69f6c08a40e9222e1902faf180156e88e686b3e320d0bf5be12fb67cfe649c6da814360c976254b75a9122dd45b6f9c0d651c554e11537ca9a6f86d44b4c7dd3
6
+ metadata.gz: e620e0826634427b14394181875562130e9997d7969fd8a6886124b2b1ba5d61f936a293b37c886b771e3f4f1d5529150dfe2a65ed12a3dd753bfe7f2c2ee3ad
7
+ data.tar.gz: b17e8214b2a508c01107281d1177517af80c839fbb1cc64ec5cff696383029b11e54319eac18078a324ec2e04bec7e9bd90d3a9f9d6855ef1979fbd2d63ed480
data/lib/manageiq/appliance_console/database_configuration.rb CHANGED
@@ -89,7 +89,7 @@ module ApplianceConsole
89
89
  hint = "Please stop the EVM server process on all appliances in the region"
90
90
  ManageIQ::ApplianceConsole::Utilities.bail_if_db_connections("preventing the setup of a database region.\n#{hint}")
91
91
  log_and_feedback(__method__) do
92
- ManageIQ::ApplianceConsole::Utilities.rake("evm:db:region", {}, {'REGION' => region, 'VERBOSE' => 'false'})
92
+ ManageIQ::ApplianceConsole::Utilities.rake("evm:db:region", {}, {'REGION' => region.to_s, 'VERBOSE' => 'false'})
93
93
  end
94
94
  end
95
95
 
data/lib/manageiq/appliance_console/utilities.rb CHANGED
@@ -27,8 +27,13 @@ module ApplianceConsole
27
27
  end
28
28
 
29
29
  def self.db_connections
30
+ # TODO: this is impossible to test right now because we need to shell out and run our rails app which isn't a direct dependency here.
31
+ # We have the settings from the database_configuration, so we should pass them here and simplify this and make it testable.
32
+ # Basically, we're doing a lot of work to run this 1 query:
33
+ # psql -U username -h host postgres -c "select count(*) from pg_stat_activity where datname = 'vmdb_production';"
34
+ # We shouldn't need to subtract our 1 "connection" in "bail_if_db_connections" if we connect to the postgres db.
30
35
  code = [
31
- "database ||= ActiveRecord::Base.configurations[Rails.env]['database']",
36
+ "database ||= ActiveRecord::Base.configurations.configs_for(:env_name => Rails.env).first.database",
32
37
  "conn = ActiveRecord::Base.connection",
33
38
  "exit conn.client_connections.count { |c| c['database'] == database }"
34
39
  ]
data/lib/manageiq/appliance_console/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module ManageIQ
2
2
  module ApplianceConsole
3
- VERSION = '7.0.5'.freeze
3
+ VERSION = '7.1.1'.freeze
4
4
  end
5
5
  end
data/manageiq-appliance_console.gemspec CHANGED
@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
20
20
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
21
21
  spec.require_paths = ["lib"]
22
22
 
23
- spec.add_runtime_dependency "activerecord", "~> 6.0.4", ">= 6.0.4.1"
24
- spec.add_runtime_dependency "activesupport", "~> 6.0.4", ">= 6.0.4.1"
23
+ spec.add_runtime_dependency "activerecord", "~> 6.1.6", ">= 6.1.6.1"
24
+ spec.add_runtime_dependency "activesupport", "~> 6.1.6", ">= 6.1.6.1"
25
25
  spec.add_runtime_dependency "awesome_spawn", "~> 1.4"
26
26
  spec.add_runtime_dependency "bcrypt", "~> 3.1.10"
27
27
  spec.add_runtime_dependency "bcrypt_pbkdf", ">= 1.0", "< 2.0"
28
28
  spec.add_runtime_dependency "highline", "~> 1.6.21"
29
- spec.add_runtime_dependency "i18n", "~> 0.8"
29
+ spec.add_runtime_dependency "i18n", ">= 0.8"
30
30
  spec.add_runtime_dependency "linux_admin", "~> 2.0"
31
31
  spec.add_runtime_dependency "manageiq-password", "< 2"
32
32
  spec.add_runtime_dependency "net-scp", "~> 1.2.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manageiq-appliance_console
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.5
4
+ version: 7.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - ManageIQ Developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-13 00:00:00.000000000 Z
11
+ date: 2022-09-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -16,40 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 6.0.4
19
+ version: 6.1.6
20
20
  - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: 6.0.4.1
22
+ version: 6.1.6.1
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - "~>"
28
28
  - !ruby/object:Gem::Version
29
- version: 6.0.4
29
+ version: 6.1.6
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: 6.0.4.1
32
+ version: 6.1.6.1
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: activesupport
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: 6.0.4
39
+ version: 6.1.6
40
40
  - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: 6.0.4.1
42
+ version: 6.1.6.1
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: 6.0.4
49
+ version: 6.1.6
50
50
  - - ">="
51
51
  - !ruby/object:Gem::Version
52
- version: 6.0.4.1
52
+ version: 6.1.6.1
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: awesome_spawn
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
116
116
  name: i18n
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
- - - "~>"
119
+ - - ">="
120
120
  - !ruby/object:Gem::Version
121
121
  version: '0.8'
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
- - - "~>"
126
+ - - ">="
127
127
  - !ruby/object:Gem::Version
128
128
  version: '0.8'
129
129
  - !ruby/object:Gem::Dependency
@@ -410,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
410
410
  - !ruby/object:Gem::Version
411
411
  version: '0'
412
412
  requirements: []
413
- rubygems_version: 3.3.17
413
+ rubygems_version: 3.3.18
414
414
  signing_key:
415
415
  specification_version: 4
416
416
  summary: ManageIQ Appliance Console