redhat_access 2.2.9 → 2.2.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/services/redhat_access/telemetry/look_ups.rb +14 -5
  3. data/lib/redhat_access/version.rb +1 -1
  4. data/redhat_access.gemspec +3 -1
  5. metadata +31 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 763ecb0aee7ff050cb54b292349af94c946bbd41fc15ae51b7e171e8afc53f7e
4
- data.tar.gz: 4b90e6187c78d7ba070c4e0246e1e756aee83962317ddf1af6f5678380755e63
3
+ metadata.gz: 67e8e666255e81f7ceb89434135c64a904a772adad60369a9d24e0770000c1ae
4
+ data.tar.gz: 99124c4b5f76163caff0d015f0d0344210283e40421a5175696419b3f297edfa
5
5
  SHA512:
6
- metadata.gz: 8a56a0a729bec186c354eae196f6b79eb214f62b5a9771ccf4a9a0e3e38c8821cc04977ed01988bb1a5c6fb826e0014babc67109f585b22b3dcc72e96576139d
7
- data.tar.gz: 31f28733074e6014228011af824b7e4d4c0645e977cf4deacd6426bc901750441f770b5083ea22aa158a58c3ef6db8eb4c492f1a5405bc513fad63f6c2c76e9d
6
+ metadata.gz: 187cc7495cc438df0c718dcb0a809c4ec48170e3d1fee9afcf731d0734d67429a92ea615ee69a08815a8d4ce8d5b1722f148dd98c56388f0a2a48991824b04ec
7
+ data.tar.gz: '089e0155d72b586a7cb3b988842e07c05e160103e3620e33163ac875d22005ec5dfbe9079005b2e6c7cb44693270be91012b1360f3d519c74ffbef491554d267'
data/app/services/redhat_access/telemetry/look_ups.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  module RedhatAccess
2
2
  module Telemetry
3
3
  module LookUps
4
- include Katello::Util::HttpProxy
5
-
6
4
  class RecordNotFound < StandardError
7
5
  end
8
6
 
@@ -194,9 +192,20 @@ module RedhatAccess
194
192
  end
195
193
 
196
194
  def get_portal_http_proxy
197
- # switching to Katello::Util::HttpProxy's proxy_uri, which has a workaround for rest-client's poor handling
198
- # of special characters in proxy passwords (see https://github.com/Katello/katello/commit/bea53437509f68ceeff0eabfde88f69810876307)
199
- proxy_uri
195
+ proxy = nil
196
+ if SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host]
197
+ proxy_config = SETTINGS[:katello][:cdn_proxy]
198
+ scheme = URI.parse(proxy_config[:host]).scheme
199
+ uri = URI('')
200
+ uri.scheme = 'proxy' if scheme == 'http'
201
+ uri.scheme = 'proxys' if scheme == 'https'
202
+ uri.host = URI.parse(proxy_config[:host]).host
203
+ uri.port = proxy_config[:port] if proxy_config[:port]
204
+ uri.user = CGI.escape(proxy_config[:user]) if proxy_config[:user]
205
+ uri.password = CGI.escape(proxy_config[:password]) if proxy_config[:password]
206
+ proxy = uri.to_s
207
+ end
208
+ proxy
200
209
  end
201
210
 
202
211
  def get_http_user_agent
data/lib/redhat_access/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RedhatAccess
2
- VERSION = "2.2.9"
2
+ VERSION = "2.2.10"
3
3
  end
data/redhat_access.gemspec CHANGED
@@ -7,7 +7,7 @@ require "redhat_access/version"
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "redhat_access"
9
9
  s.version = RedhatAccess::VERSION
10
- s.authors = ["Lindani Phiri"]
10
+ s.authors = ["Lindani Phiri", "Rex White"]
11
11
  s.email = ["lphiri@redhat.com"]
12
12
  s.homepage = "https://github.com/redhataccess/foreman-plugin"
13
13
  s.license = 'GPLv3'
@@ -19,5 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.test_files = Dir["test/**/*"]
20
20
  s.add_dependency "redhat_access_lib" , ">=1.1.5"
21
21
  s.add_dependency "angular-rails-templates", ">=0.0.4"
22
+ s.add_dependency "foreman-tasks"
23
+ s.add_dependency "katello"
22
24
 
23
25
  end
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redhat_access
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.9
4
+ version: 2.2.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lindani Phiri
8
+ - Rex White
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2019-09-27 00:00:00.000000000 Z
12
+ date: 2020-01-27 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: redhat_access_lib
@@ -38,6 +39,34 @@ dependencies:
38
39
  - - ">="
39
40
  - !ruby/object:Gem::Version
40
41
  version: 0.0.4
42
+ - !ruby/object:Gem::Dependency
43
+ name: foreman-tasks
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
49
+ type: :runtime
50
+ prerelease: false
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: katello
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ type: :runtime
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
41
70
  description: This plugin adds Red Hat Access knowledge base search, case management
42
71
  and diagnostics to Foreman
43
72
  email: