firespring_dev_commands 1.5.3.pre.alpha.1 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f703243393c3aeb663185817f26c14f1fd4eda7cdb671f5e8c0ee0d5ea2168b2
-  data.tar.gz: a0d3b4685a4890ee5be25c917031430c46a09cf972ccd127439691871b471a8a
+  metadata.gz: 78decb68edca360ca267232996476a6a1d4e1c2e02ed415bf6efc8c72c1df729
+  data.tar.gz: 90c624acb2d76ccb53b61c264d652771f5ae90b8f93bc18df3a0d7f46ee52095
 SHA512:
-  metadata.gz: 7ae4a74026fc432fb85eb442db2200a8ba066c85a84b64758b889e3cea0f13402fc4a00d68d7a4df7a95498dba195cb411d252c3893447b3af7f8878b47efa6b
-  data.tar.gz: 45e922ae773aafb01b318e006936780e3239ff345e7d32d515e9b6f47cfa05dccb6fedd89745ce71c0b7bc48c7fb1909c647d6c09b23327cf442d44b471d1c09
+  metadata.gz: 1f8ccdbcb9994d2be9c7140c083711f28f40f2451e2d1adfb3ca17feefd93896014d991b8870d5d88bb2a775fac6900fc24977cf7077aa343a366761844612e1
+  data.tar.gz: f61c95e4317077e6a3384e9e6fbdc850a57e0e99739f17cfd6e1d7145376b4c837318c7e861f559b1c779de782d1fd0bec95f7179afd7c4cdf855c93aeb0da4c

data/lib/firespring_dev_commands/aws/account.rb

@@ -23,6 +23,10 @@ module Dev
       # The name of the file containing the Aws settings
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/config".freeze
 
+      def self.config_ini
+        IniFile.new(filename: CONFIG_FILE, default: 'default')
+      end
+
       # TODO: registry is deprecated and should be removed on the next major release
       attr_accessor :root, :children, :default, :registry, :ecr_registry_ids
 
@@ -75,7 +79,7 @@ module Dev
         puts 'Configuring default login values'
 
         # Write region and mfa serial to config file
-        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+        cfgini = self.class.config_ini
         defaultini = cfgini['default']
 
         region_default = defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
@@ -101,7 +105,7 @@ module Dev
       # Setup Aws account specific settings
       def setup!(account)
         # Run base setup if it doesn't exist
-        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE)
+        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE) && self.class.config_ini.has_section?('default')
 
         puts
         puts "Configuring #{account} login values"
@@ -115,7 +119,7 @@ module Dev
         raise 'Configure default account settings first (rake aws:configure:default)' unless File.exist?(CONFIG_FILE)
 
         # Parse the ini file and load values
-        cfgini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        cfgini = self.class.config_ini
         defaultini = cfgini['default']
         profileini = cfgini["profile #{account}"]
 
@@ -124,13 +128,21 @@ module Dev
         region_default = profileini['region'] || defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
         profileini['region'] = Dev::Common.new.ask('Default region name', region_default)
 
-        # NOTE: We had an old config for "role_arn" which included the entire arn. We deprecated that config since
-        #       it made it much more difficult to switch between different accounts.
-        role_name_default = profileini['role_name'] || profileini['role_arn']&.split(%r{role/})&.last || self.class.config.default_login_role_name
-        profileini['role_name'] = Dev::Common.new.ask('Default role name', role_name_default)
-        # TODO: role_arn is deprecated. Eventually, we should delete the role_arn entry from the config. Leaving it for now
+        # NOTE: Turns out the role_arn is needed by the aws cli so we are changing directions here. Eventually we should remove the role_name
+        #       from the ini files and only store the role arn. However we need to still keep the functinoality so that the user is only asked
+        #       for the role name - not the entire arn
+        role_name_default = if profileini['role_name']
+                              profileini['role_name']
+                            elsif profileini['role_arn']
+                              profileini['role_arn']&.split(%r{role/})&.last
+                            else
+                              self.class.config.default_login_role_name
+                            end
+        role_name = Dev::Common.new.ask('Default role name', role_name_default)
+        profileini['role_arn'] = "arn:aws:iam::#{account}:role/#{role_name}"
+        # TODO: role_name is deprecated. Eventually, we should delete the role_name entry from the config. Leaving it for now
         #       because some projects may be using older versions of the dev_commands library
-        # profileini.delete('role_arn')
+        # profileini.delete('role_name')
 
         cfgini.write
       end

data/lib/firespring_dev_commands/aws/credentials.rb

@@ -11,6 +11,10 @@ module Dev
       # The local file where temporary credentials are stored
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/credentials".freeze
 
+      def self.config_ini
+        IniFile.new(filename: CONFIG_FILE, default: 'default')
+      end
+
       # The account the profile is currently logged in to
       def logged_in_account
         ::Aws::STS::Client.new.get_caller_identity.account
@@ -72,7 +76,7 @@ module Dev
         puts 'Configuring default credential values'
 
         # Write access key / secret key in the credentials file
-        credini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/credentials", default: 'default')
+        credini = self.class.config_ini
         defaultini = credini['default']
 
         access_key_default = defaultini['aws_access_key_id']
@@ -87,7 +91,7 @@ module Dev
       # Write Aws account specific settings to the credentials file
       def write!(account, creds)
         # Write access key / secret key / session token in the credentials file
-        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        credini = self.class.config_ini
         defaultini = credini[account]
 
         defaultini['aws_access_key_id'] = creds.access_key_id
@@ -132,7 +136,7 @@ module Dev
         return unless File.exist?(CONFIG_FILE)
 
         # Otherwise load access key / secret key / session token from the credentials file into the environment
-        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        credini = self.class.config_ini
         profile_credentials = credini[Dev::Aws::Profile.new.current]
         return unless profile_credentials
 

data/lib/firespring_dev_commands/aws/login.rb

@@ -42,9 +42,11 @@ module Dev
         serial = "arn:aws:iam::#{Dev::Aws::Account.new.root.id}:mfa/#{serial}" if serial
         serial ||= profileini['mfa_serial'] || defaultini['mfa_serial']
 
-        role = profileini['role_name'] || defaultini['role_name']
-        role = "arn:aws:iam::#{account}:role/#{role}" if role
-        role ||= profileini['role_arn'] || defaultini['role_arn']
+        role = profileini['role_arn'] || defaultini['role_arn']
+        # NOTE: We supported role name for a period of time but we are switching back to role_arn.
+        #       Leaving this here for a period of time until it can be deprecated
+        role ||= "arn:aws:iam::#{account}:role/#{profileini['role_name'] || defaultini['role_name']}"
+        # TODO: role_name is deprecated. Eventually, we should remove the above line
 
         session_name = profileini['role_session_name'] || defaultini['role_session_name']
         session_duration = profileini['session_duration'] || defaultini['session_duration']
@@ -72,10 +74,10 @@ module Dev
       # Returns the config ini file
       # Runs the setup for our current account if it's not already setup
       def setup_cfgini(account)
-        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+        cfgini = Dev::Aws::Account.config_ini
         unless cfgini.has_section?("profile #{account}")
           Dev::Aws::Account.new.write!(account)
-          cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+          cfgini = Dev::Aws::Account.config_ini
         end
         cfgini
       end

data/lib/firespring_dev_commands/docker/compose.rb

@@ -8,9 +8,8 @@ module Dev
     # Class containing methods for interfacing with the docker compose cli
     class Compose
       # Config object for setting top level docker compose config options
-      Config = Struct.new(:executable_name, :project_dir, :project_name, :compose_files, :min_version, :max_version) do
+      Config = Struct.new(:project_dir, :project_name, :compose_files, :min_version, :max_version) do
         def initialize
-          self.executable_name = EXECUTABLE_NAME
           self.project_dir = DEV_COMMANDS_ROOT_DIR
           self.project_name = DEV_COMMANDS_PROJECT_NAME
           self.compose_files = ["#{DEV_COMMANDS_ROOT_DIR}/docker-compose.yml"]
@@ -70,12 +69,12 @@ module Dev
       # Checks the min and max version against the current docker version if they have been configured
       def check_version
         min_version = self.class.config.min_version
-        version_too_low = min_version && !Dev::Common.new.version_greater_than(min_version, self.class.version)
-        raise "requires #{self.class.config.executable_name} version >= #{min_version} (found #{self.class.version})" if version_too_low
+        raise "requires #{EXECUTABLE_NAME} version >= #{min_version} (found #{self.class.version})" if min_version &&
+                                                                                                       !Dev::Common.new.version_greater_than(min_version, self.class.version)
 
         max_version = self.class.config.max_version
-        version_too_high = max_version && Dev::Common.new.version_greater_than(max_version, self.class.version)
-        raise "requires #{self.class.config.executable_name} version < #{max_version} (found #{self.class.version})" if version_too_high
+        raise "requires #{EXECUTABLE_NAME} version < #{max_version} (found #{self.class.version})" if max_version &&
+                                                                                                      Dev::Common.new.version_greater_than(max_version, self.class.version)
       end
 
       # Pull in supported env settings and call build
@@ -84,7 +83,6 @@ module Dev
       def build
         merge_options('--parallel')
         merge_env_pull_option
-        merge_env_push_option
         merge_env_cache_option
         execute_command(build_command('build'))
       end
@@ -183,13 +181,6 @@ module Dev
         merge_options('--pull') if ENV['PULL'].to_s.strip == 'true'
       end
 
-      # Merge --push option if PUSH is set to true and no existing push options are present
-      private def merge_env_push_option
-        return if @options.any? { |it| it.include?('push') }
-
-        merge_options('--push') if ENV['PUSH'].to_s.strip == 'true'
-      end
-
       # Merge --no-build option unless BUILD is set to true and no existing build options are present
       private def merge_env_build_option
         return if @options.any? { |it| it.include?('build') }
@@ -239,7 +230,7 @@ module Dev
 
       # Build the compose command with the given inputs
       private def build_command(action, *cmd)
-        command = self.class.config.executable_name.split(/\s+/)
+        command = [EXECUTABLE_NAME]
         command << '--project-directory' << project_dir
         command << '-p' << project_name if project_name
         Array(compose_files).compact.each { |file| command << '-f' << file }

data/lib/firespring_dev_commands/docker.rb

@@ -201,6 +201,8 @@ module Dev
     private def image_info(image)
       [].tap do |ary|
         arch = image.json&.dig('Architecture')
+        variant = image.json&.dig('Variant')
+        arch = "#{arch}/#{variant}" if variant
         id = image.info&.dig('id')&.split(':')&.last&.slice(0..11)
         created = timesince(Time.at(image.info&.dig('Created')))
         size = filesize(image.info&.dig('Size'))
@@ -253,7 +255,10 @@ module Dev
     private def container_info(container)
       id = container.id&.slice(0..11)
       image = container.info&.dig('Image')
-      arch = ::Docker::Image.get(image).json&.dig('Architecture')
+      image_json = ::Docker::Image.get(image).json
+      arch = image_json&.dig('Architecture')
+      variant = image_json&.dig('Variant')
+      arch = "#{arch}/#{variant}" if variant
       command = container.info&.dig('Command')
       created = timesince(Time.at(container.info&.dig('Created')))
       status = container.info&.dig('Status')

data/lib/firespring_dev_commands/slack/global.rb

@@ -0,0 +1,32 @@
+# Load any existing slack auth if we haven't set one in the environment
+require 'dotenv'
+
+module Dev
+  class Slack
+    class Global
+      # The filename where we store the local auth information
+      CONFIG_FILE = "#{Dir.home}/.env.slack".freeze
+
+      SLACK_API_TOKEN = 'SLACK_API_TOKEN'.freeze
+
+      def configure
+        # Always load the env slack auth
+        Dotenv.load(CONFIG_FILE) if File.exist?(CONFIG_FILE)
+
+        ::Slack.configure do |c|
+          c.token = ENV.fetch('SLACK_API_TOKEN', nil)
+          c.logger = LOG if ENV['ENABLE_SLACK_DEBUG'].to_s.strip == 'true'
+        end
+      end
+      new.configure
+
+      # Write the new slack auth value to the env file
+      def write!(api_token)
+        override = Dev::Env.new(CONFIG_FILE)
+        override.set(SLACK_API_TOKEN, api_token)
+        override.write
+        configure
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/slack.rb

@@ -0,0 +1,23 @@
+require 'slack'
+
+module Dev
+  class Slack
+    attr_accessor :client
+
+    def initialize
+      @client = ::Slack::Web::Client.new
+      @client.auth_test
+    end
+
+    def post(channel:, text:)
+      client.chat_postMessage(channel: channel, text: text)
+    end
+
+    def upload_text(channel:, text:, title: 'Text File', filename: 'file.txt')
+      raise 'text should be a string' unless text.is_a?(String)
+
+      file = Faraday::UploadIO.new(StringIO.new(text), 'text/plain')
+      client.files_upload(channels: channel, title: title, file: file, filename: filename, filetype: 'text')
+    end
+  end
+end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '1.5.3.pre.alpha.1'.freeze
+    VERSION = '1.5.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.3.pre.alpha.1
+  version: 1.5.4
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.0
+- !ruby/object:Gem::Dependency
+  name: slack-ruby-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -423,6 +437,8 @@ files:
 - lib/firespring_dev_commands/ruby.rb
 - lib/firespring_dev_commands/ruby/audit.rb
 - lib/firespring_dev_commands/second.rb
+- lib/firespring_dev_commands/slack.rb
+- lib/firespring_dev_commands/slack/global.rb
 - lib/firespring_dev_commands/tar.rb
 - lib/firespring_dev_commands/tar/pax_header.rb
 - lib/firespring_dev_commands/tar/type_flag.rb
@@ -453,9 +469,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: