firespring_dev_commands 1.5.0.pre.alpha.4 → 1.5.1.pre.alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/firespring_dev_commands/audit/report.rb +3 -1
- 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/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5d51e212a8400122ffc51b71c211012d10a787878a4ba23e44cd5236ecb27b85
|
4
|
+
data.tar.gz: c09ea9cce609c9328f0f851bfaa49032380f2c2f55acc7cc5f33d62a295fdad0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fef3154ccd47c74c96db052499a10bb78b8d3415d193aee75dff9078719d286e1c19aa07d9ab05ff085e1ad95f9b79c2c69e2138e2535f3f2c0fadd311c0db61
|
7
|
+
data.tar.gz: cba0a6fb666cb598cfa6e068a19edc607087200b9d7ba044afa8fa1b7da3f6451259554f9c9018ff3895f35396ee147e2f6f025b89b19e3fb687c16aa915eb61
|
@@ -32,7 +32,9 @@ module Dev
|
|
32
32
|
# Exit with a non-zero status if any vulnerabilities were found
|
33
33
|
def check
|
34
34
|
puts(to_s)
|
35
|
-
|
35
|
+
return if filtered_items.empty?
|
36
|
+
|
37
|
+
at_exit { exit(1) }
|
36
38
|
end
|
37
39
|
|
38
40
|
# Returns a string representation of this audit report
|
@@ -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)
|
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.
|
4
|
+
version: 1.5.1.pre.alpha.1
|
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-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -457,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
457
457
|
- !ruby/object:Gem::Version
|
458
458
|
version: 1.3.1
|
459
459
|
requirements: []
|
460
|
-
rubygems_version: 3.
|
460
|
+
rubygems_version: 3.3.25
|
461
461
|
signing_key:
|
462
462
|
specification_version: 4
|
463
463
|
summary: Development environment maintenance command library
|