firespring_dev_commands 1.5.0.pre.alpha.3 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/firespring_dev_commands/aws/account.rb +4 -4
- data/lib/firespring_dev_commands/aws/credentials.rb +0 -2
- data/lib/firespring_dev_commands/aws/login.rb +8 -4
- data/lib/firespring_dev_commands/docker.rb +6 -3
- data/lib/firespring_dev_commands/templates/docker/php/application.rb +1 -1
- data/lib/firespring_dev_commands/templates/docker/ruby/application.rb +1 -1
- data/lib/firespring_dev_commands/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e7cf8825c5665c98f8394203026bba4791b5daf5c8b9e685de30813caba92732
|
4
|
+
data.tar.gz: 57f2d6e7c8a53bdadc3c7eea75a0f2d7d843bfb2f23582b6774abbae836b65d2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e53587125e8d12f27cd3c69a7ac3fcf7361509e36569c5faf3621b7926fcf064663724a7cde1e5b625da7101bd964ec1ff7db7b38320a55de67973c740b22a1d
|
7
|
+
data.tar.gz: 4764d0f877a3fce2812ac1e3a487e5c7bce028a6f88a1b54f554d16ce990081a56952c8bc2e620bb2072457d83f3cccaac30f7e6c044b79c830fe5fddffdf5ac
|
@@ -85,8 +85,8 @@ module Dev
|
|
85
85
|
# it made it much more difficult to switch between different root accounts.
|
86
86
|
mfa_name_default = defaultini['mfa_serial']&.split(%r{mfa/})&.last || ENV['AWS_MFA_ARN']&.split(%r{mfa/})&.last || ENV.fetch('USERNAME', nil)
|
87
87
|
defaultini['mfa_serial_name'] = Dev::Common.new.ask('Default mfa name', mfa_name_default)
|
88
|
-
# TODO: Eventually, we should delete the mfa_serial entry from the config. Leaving it for now
|
89
|
-
# may be using older versions of the dev_commands library
|
88
|
+
# TODO: mfa_serial is deprecated. Eventually, we should delete the mfa_serial entry from the config. Leaving it for now
|
89
|
+
# because some projects may be using older versions of the dev_commands library
|
90
90
|
# defaultini.delete('mfa_serial')
|
91
91
|
|
92
92
|
session_name_default = defaultini['role_session_name'] || "#{ENV.fetch('USERNAME', nil)}_cli"
|
@@ -128,8 +128,8 @@ module Dev
|
|
128
128
|
# it made it much more difficult to switch between different accounts.
|
129
129
|
role_name_default = profileini['role_name'] || profileini['role_arn']&.split(%r{role/})&.last || self.class.config.default_login_role_name
|
130
130
|
profileini['role_name'] = Dev::Common.new.ask('Default role name', role_name_default)
|
131
|
-
# TODO: Eventually, we should delete the role_arn entry from the config. Leaving it for now
|
132
|
-
# may be using older versions of the dev_commands library
|
131
|
+
# TODO: role_arn is deprecated. Eventually, we should delete the role_arn entry from the config. Leaving it for now
|
132
|
+
# because some projects may be using older versions of the dev_commands library
|
133
133
|
# profileini.delete('role_arn')
|
134
134
|
|
135
135
|
cfgini.write
|
@@ -75,8 +75,6 @@ module Dev
|
|
75
75
|
credini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/credentials", default: 'default')
|
76
76
|
defaultini = credini['default']
|
77
77
|
|
78
|
-
# TODO: Should we allow for multiple sets of base credentials? How do I use this for both FDP and SBF?
|
79
|
-
|
80
78
|
access_key_default = defaultini['aws_access_key_id']
|
81
79
|
defaultini['aws_access_key_id'] = Dev::Common.new.ask('AWS Access Key ID', access_key_default)
|
82
80
|
|
@@ -82,7 +82,8 @@ module Dev
|
|
82
82
|
|
83
83
|
# Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
|
84
84
|
# Authroizes the docker ruby library to pull/push images from the Aws container registry
|
85
|
-
def registry_logins!(registry_ids:
|
85
|
+
def registry_logins!(registry_ids: nil, region: nil)
|
86
|
+
registry_ids ||= Dev::Aws::Account.new.ecr_registry_ids
|
86
87
|
region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
|
87
88
|
return if registry_ids.empty?
|
88
89
|
|
@@ -93,7 +94,8 @@ module Dev
|
|
93
94
|
|
94
95
|
# Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
|
95
96
|
# Authroizes the docker ruby library to pull/push images from the Aws container registry
|
96
|
-
def registry_login!(registry_id:
|
97
|
+
def registry_login!(registry_id: nil, region: nil)
|
98
|
+
registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
|
97
99
|
region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
|
98
100
|
raise 'registry_id is required' if registry_id.to_s.strip.empty?
|
99
101
|
raise 'region is required' if region.to_s.strip.empty?
|
@@ -109,7 +111,8 @@ module Dev
|
|
109
111
|
# Authroizes the docker cli to pull/push images from the Aws container registry
|
110
112
|
# (e.g. if docker compose needs to pull an image)
|
111
113
|
# @deprecated Please use {Dev::Aws::Login#registry_login!} instead
|
112
|
-
def docker_login!(registry_id:
|
114
|
+
def docker_login!(registry_id: nil, region: nil)
|
115
|
+
registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
|
113
116
|
region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
|
114
117
|
warn '[DEPRECATION] `Dev::Aws::Login#docker_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
|
115
118
|
docker_cli_login!(registry: "#{registry_id}.dkr.ecr.#{region}.amazonaws.com", region: region)
|
@@ -128,7 +131,8 @@ module Dev
|
|
128
131
|
|
129
132
|
# Authroizes the docker ruby library to pull/push images from the Aws container registry
|
130
133
|
# @deprecated Please use {Dev::Aws::Login#registry_login!} instead
|
131
|
-
def ecr_login!(registry_id:
|
134
|
+
def ecr_login!(registry_id: nil, region: nil)
|
135
|
+
registry_id ||= Dev::Aws::Account.new.ecr_registry_ids.first
|
132
136
|
region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
|
133
137
|
warn '[DEPRECATION] `Dev::Aws::Login#ecr_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
|
134
138
|
docker_lib_login!(registry_id: registry_id, region: region)
|
@@ -70,8 +70,11 @@ module Dev
|
|
70
70
|
end
|
71
71
|
|
72
72
|
# Prunes/removes all unused volumes
|
73
|
+
# Specify ALL_VOLUMES=false in your environment to only clean anonymous volumes (docker version 23.x+)
|
73
74
|
def prune_volumes
|
74
|
-
|
75
|
+
opts = {}
|
76
|
+
opts[:filters] = {all: ['true']}.to_json if Dev::Common.new.version_greater_than('22.9999.0', self.class.version) && ENV['ALL_VOLUMES'].to_s.strip != 'false'
|
77
|
+
_prune('volumes', opts: opts)
|
75
78
|
end
|
76
79
|
|
77
80
|
# Prunes/removes all unused images
|
@@ -80,8 +83,8 @@ module Dev
|
|
80
83
|
end
|
81
84
|
|
82
85
|
# Private method which actually calls the prune endpoint on the docker api connection
|
83
|
-
private def _prune(type)
|
84
|
-
response = ::Docker.connection.post("/#{type.downcase}/prune",
|
86
|
+
private def _prune(type, opts: {})
|
87
|
+
response = ::Docker.connection.post("/#{type.downcase}/prune", opts)
|
85
88
|
format_prune(type, response)
|
86
89
|
rescue ::Docker::Error::ServerError => e
|
87
90
|
# Specifically check for 'prune already running' error and retry if found
|
@@ -137,7 +137,7 @@ module Dev
|
|
137
137
|
DEV_COMMANDS_TOP_LEVEL.instance_eval do
|
138
138
|
namespace application do
|
139
139
|
namespace :php do
|
140
|
-
desc 'Install all
|
140
|
+
desc 'Install all composer packages'
|
141
141
|
task install: %w(init_docker up_no_deps) do
|
142
142
|
Dev::Docker::Compose.new(services: application).exec(*php.install_command)
|
143
143
|
end
|
@@ -93,7 +93,7 @@ module Dev
|
|
93
93
|
DEV_COMMANDS_TOP_LEVEL.instance_eval do
|
94
94
|
namespace application do
|
95
95
|
namespace :ruby do
|
96
|
-
desc 'Install all
|
96
|
+
desc 'Install all bundled gems'
|
97
97
|
task install: %w(init_docker up_no_deps) do
|
98
98
|
Dev::Docker::Compose.new(services: application).exec(*ruby.install_command)
|
99
99
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: firespring_dev_commands
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.0
|
4
|
+
version: 1.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Firespring
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-05-
|
11
|
+
date: 2023-05-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
453
453
|
version: '2.7'
|
454
454
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
455
455
|
requirements:
|
456
|
-
- - "
|
456
|
+
- - ">="
|
457
457
|
- !ruby/object:Gem::Version
|
458
|
-
version:
|
458
|
+
version: '0'
|
459
459
|
requirements: []
|
460
460
|
rubygems_version: 3.1.6
|
461
461
|
signing_key:
|