fhcap-cli 0.4.15 → 0.4.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/fhcap/tasks/chef/cookbook/list_artifacts.rb +2 -1
- data/lib/fhcap/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e584144d84497de4ad703db079c1d0a6e3e3f8f7
|
4
|
+
data.tar.gz: 5ab3f266c1bb04f5b90c73664cabf542357e6930
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bf6dd18b5c078dc0007fb97f830ee151ee737f99ee6bf3514245facd9353642b544695681411d9e3505080b979c3cabf598bc708aa5a7b5ab8b31c95fa391127
|
7
|
+
data.tar.gz: 7da39ef50b014f81c31a727bbdb7388acbbe68d876bfca69de545107cf9a5ba244114affcde5dc4656a06b0ed8541f062761b01d55531816388962b8005d2a9f
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
## Unreleased
|
2
2
|
|
3
|
+
## 0.4.16
|
4
|
+
|
5
|
+
* [RHMAP-17757] - Update list artifacts to check component config for s3 bucket override, otherwise uses default
|
6
|
+
|
3
7
|
## 0.4.15
|
4
8
|
|
5
9
|
* [RHMAP-17998] - Add remote-query option to provider add. Allows skipping querying the remote provider for config data.
|
@@ -23,7 +23,6 @@ module Fhcap
|
|
23
23
|
results = print_table? ? [table_header("Component", "Version", "Build", "Artifact", "Available")] : []
|
24
24
|
|
25
25
|
artifact_meta = get_cookbook_meta(['fh-artifact'], 'artifacts')
|
26
|
-
artifact_s3_bucket = artifact_meta['artifact']['s3']['bucket']
|
27
26
|
# Provider must be fheng to have access to S3 artifact buckets
|
28
27
|
s3_provider_name = "aws:fheng"
|
29
28
|
s3_provider_region = "eu-west-1"
|
@@ -38,6 +37,8 @@ module Fhcap
|
|
38
37
|
component_artifact_filename = component_cfg['artifact_filename'] || "#{component_name}-%s-%s-ubuntu.x64.tar.gz"
|
39
38
|
component_artifact = component_artifact_filename % [component_version, component_build]
|
40
39
|
|
40
|
+
artifact_s3_bucket = component_cfg['artifact']['s3']['bucket'] rescue nil || artifact_meta['artifact']['s3']['bucket']
|
41
|
+
|
41
42
|
# Trying to handle naming inconsistencies between components and S3 directories
|
42
43
|
case component_name
|
43
44
|
when "unifiedpush", "unifiedpush-auth-server"
|
data/lib/fhcap/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fhcap-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Nairn
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-10-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|