ufo 5.0.3 → 5.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +13 -0
- data/README.md +2 -0
- data/docs/.gitignore +1 -0
- data/docs/Gemfile +1 -0
- data/docs/_config.yml +2 -0
- data/docs/_includes/banner/foot.html +2 -0
- data/docs/_includes/banner/head.html +5 -0
- data/docs/_includes/cfn-customize.md +14 -0
- data/docs/_includes/footer.html +0 -7
- data/docs/_layouts/default.html +2 -0
- data/docs/bin/web +1 -1
- data/lib/template/.ufo/settings.yml.tt +2 -2
- data/lib/ufo/setting/profile.rb +17 -1
- data/lib/ufo/stack/helper.rb +8 -1
- data/lib/ufo/version.rb +1 -1
- data/lib/ufo.rb +1 -0
- metadata +5 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e11b921dfd30c66a4207c1dd61a0b4861465fd1b99657f54c71f7b6556b14a60
|
4
|
+
data.tar.gz: e904b55c7d413f5ba941fd71ea79bc72f492faf94e7484b13be5edb966e0b63c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bfa6504eccbac3d06a264d0e719195d896ecaaf7b4a86f4e9267b3665bbb986b92fca0b16f45f117d670e891223fbe5df88236e3ef3bc8812fcad4274e221b51
|
7
|
+
data.tar.gz: 1eb60fe3d3661c39e37c610b3a22d987ecc71b681bb3d4429fde26e19bfe706d03ee8e16602917c739258ab01331e2bac1219e7f78a2586b5a4d7bf69c368ee2
|
data/CHANGELOG.md
CHANGED
@@ -3,6 +3,19 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
|
5
5
|
|
6
|
+
## [5.0.7] - 2021-12-18
|
7
|
+
- [#123](https://github.com/tongueroo/ufo/pull/123) fix activesupport require
|
8
|
+
|
9
|
+
## [5.0.6] - 2021-12-16
|
10
|
+
- [#120](https://github.com/tongueroo/ufo/pull/120) new stack_naming: append_ufo_env default to fix append_env bug
|
11
|
+
- [#122](https://github.com/tongueroo/ufo/pull/122) require active_support all
|
12
|
+
|
13
|
+
## [5.0.5] - 2021-01-23
|
14
|
+
- allow base profile without a default profile
|
15
|
+
|
16
|
+
## [5.0.4] - 2021-01-23
|
17
|
+
- [#119](https://github.com/tongueroo/ufo/pull/119) layer base profiles with env-specific or default profile
|
18
|
+
|
6
19
|
## [5.0.3] - 2020-12-10
|
7
20
|
- [#118](https://github.com/tongueroo/ufo/pull/118) update aws-mfa-secure with require singleton fix
|
8
21
|
|
data/README.md
CHANGED
@@ -10,6 +10,8 @@
|
|
10
10
|
|
11
11
|
[![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
|
12
12
|
|
13
|
+
Please **watch/star** this repo to help grow and support the project.
|
14
|
+
|
13
15
|
Ufo is a tool that builds Docker images and deploys them to [AWS ECS](https://aws.amazon.com/ecs/). The main command is `ufo ship`. Here's summary of what it does:
|
14
16
|
|
15
17
|
1. Builds a docker image.
|
data/docs/.gitignore
CHANGED
data/docs/Gemfile
CHANGED
data/docs/_config.yml
CHANGED
@@ -0,0 +1,5 @@
|
|
1
|
+
{% assign buildtime = "now" | date: "%Y%m%d%H%M%S" %}
|
2
|
+
<link rel="preload" href="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js" as="script" />
|
3
|
+
<script data-cfasync="false" async src="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js"></script>
|
4
|
+
|
5
|
+
<div id="head-banner" class="head-banner"></div>
|
@@ -36,4 +36,18 @@ Here's a list of the resources in the [cfn/stack.yml](https://github.com/tonguer
|
|
36
36
|
* Listener
|
37
37
|
* TargetGroup
|
38
38
|
|
39
|
+
## Layering Support
|
40
|
+
|
41
|
+
The `base.yml` profile files always get evaluated and env-specific ENV.yml file are layered or merged together. This miminizes duplication. For example, these files are merged:
|
42
|
+
|
43
|
+
* .ufo/settings/cfn/base.yml
|
44
|
+
* .ufo/settings/cfn/development.yml
|
45
|
+
|
46
|
+
The settings in `development.yml` override the settings in `base.yml`. Here's another example:
|
47
|
+
|
48
|
+
* .ufo/settings/network/base.yml
|
49
|
+
* .ufo/settings/network/development.yml
|
50
|
+
|
51
|
+
Note, this feature is available in v5.0.5+.
|
52
|
+
|
39
53
|
For the most up to date list check out the [cfn/stack.yml](https://github.com/tongueroo/ufo/blob/master/lib/cfn/stack.yml) source code directly.
|
data/docs/_includes/footer.html
CHANGED
@@ -42,10 +42,3 @@
|
|
42
42
|
</div>
|
43
43
|
</div>
|
44
44
|
</footer>
|
45
|
-
|
46
|
-
<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
|
47
|
-
<div class="scroll-top page-scroll visible-xs visible-sm">
|
48
|
-
<a id="next" class="btn btn-primary" href="#page-top">
|
49
|
-
<i class="fa fa-chevron-up"></i>
|
50
|
-
</a>
|
51
|
-
</div>
|
data/docs/_layouts/default.html
CHANGED
@@ -2,10 +2,12 @@
|
|
2
2
|
<html>
|
3
3
|
{% include head.html %}
|
4
4
|
<body id="page-top" class="index">
|
5
|
+
{% include banner/head.html %}
|
5
6
|
{% include nav.html %}
|
6
7
|
{% include content.html %}
|
7
8
|
{% include footer.html %}
|
8
9
|
{% include modals.html %}
|
10
|
+
{% include banner/foot.html %}
|
9
11
|
{% include js.html %}
|
10
12
|
</body>
|
11
13
|
</html>
|
data/docs/bin/web
CHANGED
@@ -12,8 +12,8 @@ base:
|
|
12
12
|
# There are some cavaets with this. Updating properties on resources that require
|
13
13
|
# replacment might not work. For example, adding and removing a load balancer.
|
14
14
|
# In these cases, you must delete the entire ecs service and recreate it.
|
15
|
-
stack_naming:
|
16
|
-
auto_camelize: false
|
15
|
+
stack_naming: append_ufo_env # new default setting in ufo v5.0.6
|
16
|
+
auto_camelize: false # new default setting in ufo v5
|
17
17
|
|
18
18
|
development:
|
19
19
|
# cluster: development
|
data/lib/ufo/setting/profile.rb
CHANGED
@@ -12,6 +12,7 @@ class Ufo::Setting
|
|
12
12
|
@profile, # user specified
|
13
13
|
Ufo.env, # conventional based on env
|
14
14
|
"default", # fallback to default
|
15
|
+
"base", # finally fallback to base
|
15
16
|
].compact.uniq
|
16
17
|
paths = names.map { |name| "#{Ufo.root}/.ufo/settings/#{@type}/#{name}.yml" }
|
17
18
|
found = paths.find { |p| File.exist?(p) }
|
@@ -21,8 +22,23 @@ class Ufo::Setting
|
|
21
22
|
end
|
22
23
|
|
23
24
|
text = RenderMePretty.result(found)
|
24
|
-
|
25
|
+
specific_data = yaml_load(text)
|
26
|
+
|
27
|
+
base = "#{Ufo.root}/.ufo/settings/#{@type}/base.yml"
|
28
|
+
base_data = if File.exist?(base)
|
29
|
+
text = RenderMePretty.result(base)
|
30
|
+
yaml_load(text)
|
31
|
+
else
|
32
|
+
{}
|
33
|
+
end
|
34
|
+
|
35
|
+
base_data.deep_merge(specific_data)
|
25
36
|
end
|
26
37
|
memoize :data
|
38
|
+
|
39
|
+
def yaml_load(text)
|
40
|
+
result = YAML.load(text) # yaml file can contain nothing but comments
|
41
|
+
result.is_a?(Hash) ? result.deep_symbolize_keys : {}
|
42
|
+
end
|
27
43
|
end
|
28
44
|
end
|
data/lib/ufo/stack/helper.rb
CHANGED
@@ -28,10 +28,17 @@ class Ufo::Stack
|
|
28
28
|
parts = case settings[:stack_naming]
|
29
29
|
when "prepend_cluster" # ufo v4.3 and below
|
30
30
|
[cluster, service, Ufo.env_extra] # legacy
|
31
|
-
when "
|
31
|
+
when "append_cluster" # ufo v4.5
|
32
32
|
# append_env will be removed in the next major version in favor of append_cluster to avoid confusion with
|
33
33
|
# append_ufo_env
|
34
34
|
[service, cluster, Ufo.env_extra]
|
35
|
+
when "append_env" # ufo v5.0.3 and below: append_env is a bug, it appends cluster name instead of env name
|
36
|
+
puts "WARN: Deprecation: The append_env is depreciated .ufo/settings.yaml".color(:yellow)
|
37
|
+
puts "It appends the cluster env instead of the UFO_ENV env. This is unexpected behavior. "
|
38
|
+
puts "To been fix this, please `stack_naming: append_ufo_env` instead. "
|
39
|
+
[service, cluster, Ufo.env_extra] # bug - kept for backward compatibility
|
40
|
+
when "append_ufo_env" # v5.1.0 fixes bug where append_env would append cluster name instead
|
41
|
+
[service, Ufo.env, Ufo.env_extra]
|
35
42
|
when "append_nothing", "prepend_nothing"
|
36
43
|
[service, Ufo.env_extra]
|
37
44
|
else # new default. ufo v4.5 and above
|
data/lib/ufo/version.rb
CHANGED
data/lib/ufo.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ufo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.0.
|
4
|
+
version: 5.0.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tung Nguyen
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-12-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-logs
|
@@ -398,6 +398,8 @@ files:
|
|
398
398
|
- docs/_docs/upgrading/upgrade5.md
|
399
399
|
- docs/_docs/variables.md
|
400
400
|
- docs/_includes/about.html
|
401
|
+
- docs/_includes/banner/foot.html
|
402
|
+
- docs/_includes/banner/head.html
|
401
403
|
- docs/_includes/cfn-customize.md
|
402
404
|
- docs/_includes/commands.html
|
403
405
|
- docs/_includes/contact.html
|
@@ -715,7 +717,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
715
717
|
- !ruby/object:Gem::Version
|
716
718
|
version: '0'
|
717
719
|
requirements: []
|
718
|
-
rubygems_version: 3.
|
720
|
+
rubygems_version: 3.2.32
|
719
721
|
signing_key:
|
720
722
|
specification_version: 4
|
721
723
|
summary: AWS ECS Deploy Tool
|