firespring_dev_commands 2.1.32.pre.alpha.6 → 2.1.34.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 781981f7124ed8478708915fa0539f9f8d6c21993a707ac712b8d8f27b020ce7
-  data.tar.gz: a974f5d4aae9aeeb5ed044ab69ce46a6e95d518cd685583788d0728dd0b20fb7
+  metadata.gz: 1251774a637562a4014393d263701a1317968a8dba1bcbe28a0de22bdaf2a511
+  data.tar.gz: ff05d96253f15ce2f2929d56458b246898805668987157f1afcaac26c5bab506
 SHA512:
-  metadata.gz: 0fc54a00a5e86b124183319ccfaaeb56237db467ead8ba5ae2b6bf9c94156dae4f01b27df2fdafe48159bc342b9bb94613fa68105fc1d9265f341f058b186c37
-  data.tar.gz: c564197a7cb19604caee3e38e05bf553574164f3e3b58733676f619282ce64851e08739c85940c0d6b9a3cd2652f4b79f383583d555f5cb6e0028f23e62fbe63
+  metadata.gz: a26483191cfb4cd36b32e21df7bd0f8936859984de7cde12cb95f65a8d6131529d1f67800c00f681f6e4632c9b988e5929e6212349d8075d4dd276cb312faa93
+  data.tar.gz: a135d944fa18bef746dfd1f7be0123ed4971affea00189878425b184dcc00669bd284fd342dc22a8cd578724750a6f541b0048b1f6cfe4c5a93a42fe9be02f5d

data/README.md

@@ -28,7 +28,7 @@ Dev::Template::Docker::Node::Application.new('foo')
 ```
 * If you run `rake -T` now, you should have base rake commands and application rake commands for an app called `foo`
 
-* (optional) Add AWS login template commands
+* (optinoal) Add AWS login template commands
 ```
 # Configure AWS accounts and create tasks
 Dev::Aws::Account::configure do |c|

data/lib/firespring_dev_commands/aws/cloudformation.rb

@@ -21,9 +21,10 @@ module Dev
       # Finished status
       FINISHED = :finished
 
-      attr_accessor :client, :name, :template_filename, :parameters, :capabilities, :failure_behavior, :state
+      attr_accessor :client, :name, :template_filename, :parameters, :capabilities, :failure_behavior, :preserve_parameters_on_update, :state
 
-      def initialize(name, template_filename, parameters: Dev::Aws::Cloudformation::Parameters.new, capabilities: [], failure_behavior: 'ROLLBACK')
+      def initialize(name, template_filename, parameters: Dev::Aws::Cloudformation::Parameters.new, capabilities: [], failure_behavior: 'ROLLBACK',
+                     preserve_parameters_on_update: false)
         raise 'parameters must be an intsance of parameters' unless parameters.is_a?(Dev::Aws::Cloudformation::Parameters)
 
         @client = nil
@@ -32,6 +33,7 @@ module Dev
         @parameters = parameters
         @capabilities = capabilities
         @failure_behavior = failure_behavior
+        @preserve_parameters_on_update = preserve_parameters_on_update
         @state = NOT_STARTED
       end
 
@@ -81,11 +83,16 @@ module Dev
         # Call upload function to get the s3 url
         template_url = upload(template_filename)
 
+        update_parameters = if preserve_parameters_on_update
+                              parameters.preserve
+                            else
+                              parameters.default
+                            end
         # Update the cloudformation stack
         client.update_stack(
           stack_name: name,
           template_url:,
-          parameters: parameters.preserve,
+          parameters: update_parameters,
           capabilities:
         )
         @state = STARTED

data/lib/firespring_dev_commands/eol/aws.rb

@@ -72,19 +72,23 @@ module Dev
       # Queries and returns product versions for rds instance products
       def rds_instance_products
         aws_engines = %w(mysql postgresql)
+        aws_sqlserver_engines = %w(sqlserver-ee sqlserver-ex sqlserver-se sqlserver-web)
         client = ::Aws::RDS::Client.new
 
         [].tap do |ary|
           Dev::Aws.each_page(client, :describe_db_instances) do |response|
             response.db_instances.each do |instance|
               name = instance.db_instance_identifier
-              engine = instance.engine.tr('aurora-', '')
+              engine = instance.engine.gsub('aurora-', '')
               product = if aws_engines.include?(engine)
                           "amazon-rds-#{engine}"
+                        elsif aws_sqlserver_engines.include?(engine)
+                          'mssqlserver'
                         else
                           engine
                         end
               version = instance.engine_version.reverse.split('.')[-2..].join('.').reverse
+              version.chop! if version.end_with?('.00')
               ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
             end
           end
@@ -94,19 +98,23 @@ module Dev
       # Queries and returns product versions for rds cluster products
       def rds_cluster_products
         aws_engines = %w(mysql postgresql)
+        aws_sqlserver_engines = %w(sqlserver-ee sqlserver-ex sqlserver-se sqlserver-web)
         client = ::Aws::RDS::Client.new
 
         [].tap do |ary|
           Dev::Aws.each_page(client, :describe_db_clusters) do |response|
             response.db_clusters.each do |cluster|
               name = cluster.db_cluster_identifier
-              engine = cluster.engine.tr('aurora-', '')
+              engine = cluster.engine.gsub('aurora-', '')
               product = if aws_engines.include?(engine)
                           "amazon-rds-#{engine}"
+                        elsif aws_sqlserver_engines.include?(engine)
+                          'mssqlserver'
                         else
                           engine
                         end
               version = cluster.engine_version.reverse.split('.')[-2..].join('.').reverse
+              version.chop! if version.end_with?('.00')
               ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
             end
           end

data/lib/firespring_dev_commands/target_process/release.rb

@@ -24,7 +24,7 @@ module Dev
       def parse_time(string)
         return nil unless string && !string.empty?
 
-        Time.at(string.slice(6, 10).to_i)
+        ::Time.at(string.slice(6, 10).to_i)
       end
     end
   end

data/lib/firespring_dev_commands/target_process/team_assignment.rb

@@ -24,7 +24,7 @@ module Dev
       def parse_time(string)
         return nil unless string && !string.empty?
 
-        Time.at(string.slice(6, 10).to_i)
+        ::Time.at(string.slice(6, 10).to_i)
       end
 
       # Calculate the cycle time as the amount of time the story was open

data/lib/firespring_dev_commands/target_process/time.rb

@@ -0,0 +1,32 @@
+module Dev
+  class TargetProcess
+    # The class to query time information from Target Process
+    class Time
+      # The resource type for the api endpoint
+      RESOURCE_TYPE = 'Time'.freeze
+
+      # The api path for time requests
+      PATH = '/Time'.freeze
+
+      attr_accessor :data, :id, :type, :description, :hours, :date, :story, :user
+
+      def initialize(data)
+        @data = data
+        @id = data['Id']
+        @type = data['ResourceType']
+        @description = data['Description']
+        @hours = data['Spent']
+        @date = parse_time(data['Date'])
+        @story = UserStory.new(data['Assignable']) if data['Assignable']
+        @user = User.new(data['User']) if data['User']
+      end
+
+      # Parse the dot net time representation into something that ruby can use
+      def parse_time(string)
+        return nil unless string && !string.empty?
+
+        ::Time.at(string.slice(6, 10).to_i)
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/target_process/user.rb

@@ -2,7 +2,13 @@ module Dev
   class TargetProcess
     # Class containing user information
     class User
-      attr_accessor :data, :id, :type, :name, :login
+      # The resource type for the api endpoint
+      RESOURCE_TYPE = 'User'.freeze
+
+      # The api path for user requests
+      PATH = '/User'.freeze
+
+      attr_accessor :data, :id, :type, :name, :login, :email
 
       def initialize(data)
         @data = data
@@ -10,6 +16,12 @@ module Dev
         @type = data['ResourceType']
         @name = data['FullName']
         @login = data['Login']
+        @email = data['Email']
+      end
+
+      # Get the user with the given id and return that object
+      def self.get(id)
+        new(TargetProcess.new.get("#{User::PATH}/#{id}", Query.new))
       end
     end
   end

data/lib/firespring_dev_commands/target_process/user_story.rb

@@ -37,7 +37,7 @@ module Dev
       def parse_time(string)
         return nil unless string && !string.empty?
 
-        Time.at(string.slice(6, 10).to_i)
+        ::Time.at(string.slice(6, 10).to_i)
       end
 
       # Calculate the cycle time as the amount of time the story was open

data/lib/firespring_dev_commands/target_process/user_story_history.rb

@@ -38,7 +38,7 @@ module Dev
       def parse_time(string)
         return nil unless string && !string.empty?
 
-        Time.at(string.slice(6, 10).to_i)
+        ::Time.at(string.slice(6, 10).to_i)
       end
     end
   end

data/lib/firespring_dev_commands/target_process.rb

@@ -72,8 +72,8 @@ module Dev
       [].tap do |ary|
         get(Release::PATH, query) do |result|
           ary << Release.new(result)
+          yield ary.last if block_given?
         end
-        ary.each(&)
       end
     end
 
@@ -84,8 +84,8 @@ module Dev
       [].tap do |ary|
         get(UserStory::PATH, query) do |result|
           ary << UserStory.new(result)
+          yield ary.last if block_given?
         end
-        ary.each(&)
       end
     end
 
@@ -96,8 +96,8 @@ module Dev
       [].tap do |ary|
         get(UserStoryHistory::PATH, query) do |result|
           ary << UserStoryHistory.new(result)
+          yield ary.last if block_given?
         end
-        ary.each(&)
       end
     end
 
@@ -108,8 +108,20 @@ module Dev
       [].tap do |ary|
         get(TeamAssignment::PATH, query) do |result|
           ary << TeamAssignment.new(result)
+          yield ary.last if block_given?
+        end
+      end
+    end
+
+    # Perform a query to the time api path
+    # Call the given block (if present) with each time
+    # Return all times
+    def times(query, &)
+      [].tap do |ary|
+        get(Time::PATH, query) do |result|
+          ary << Time.new(result)
+          yield ary.last if block_given?
         end
-        ary.each(&)
       end
     end
 
@@ -132,8 +144,11 @@ module Dev
       parsed_response['Items'].each(&)
 
       while parsed_response['Next']
-        response = client.request_get(parsed_response['Next'], headers)
-        raise "Error querying #{parsed_response['Next']} [#{query_string}]: #{response.inspect}" unless response.response.is_a?(Net::HTTPSuccess)
+        next_query_string = URI(parsed_response['Next']).query
+        next_url = "/api/v1/#{path}"
+        next_url << "?#{next_query_string}" unless query_string.empty?
+        response = client.request_get(next_url, headers)
+        raise "Error querying #{next_url} [#{next_query_string}]: #{response.inspect}" unless response.response.is_a?(Net::HTTPSuccess)
 
         parsed_response = JSON.parse(response.body)
         return parsed_response unless parsed_response.key?('Items')

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 = '2.1.32.pre.alpha.6'.freeze
+    VERSION = '2.1.34.pre.alpha.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.32.pre.alpha.6
+  version: 2.1.34.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.208.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-route53
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.87.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.87.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -340,7 +326,6 @@ files:
 - lib/firespring_dev_commands/aws/login.rb
 - lib/firespring_dev_commands/aws/parameter.rb
 - lib/firespring_dev_commands/aws/profile.rb
-- lib/firespring_dev_commands/aws/route53.rb
 - lib/firespring_dev_commands/aws/s3.rb
 - lib/firespring_dev_commands/bloom_growth.rb
 - lib/firespring_dev_commands/bloom_growth/rock.rb
@@ -395,11 +380,11 @@ files:
 - lib/firespring_dev_commands/target_process/release.rb
 - lib/firespring_dev_commands/target_process/team.rb
 - lib/firespring_dev_commands/target_process/team_assignment.rb
+- lib/firespring_dev_commands/target_process/time.rb
 - lib/firespring_dev_commands/target_process/user.rb
 - lib/firespring_dev_commands/target_process/user_story.rb
 - lib/firespring_dev_commands/target_process/user_story_history.rb
 - lib/firespring_dev_commands/templates/aws.rb
-- lib/firespring_dev_commands/templates/aws/services/route53.rb
 - lib/firespring_dev_commands/templates/base_interface.rb
 - lib/firespring_dev_commands/templates/certificate.rb
 - lib/firespring_dev_commands/templates/ci.rb

data/lib/firespring_dev_commands/aws/route53.rb

@@ -1,107 +0,0 @@
-module Dev
-  class Aws
-    # Class for performing Route53 functions
-    class Route53
-      attr_reader :client
-
-      def initialize(domains)
-        @client = ::Aws::Route53::Client.new
-        @domains = domains
-      end
-
-      private def zones
-        if @domains.empty?
-          all_zones
-        else
-          zones_by_domain_names(@domains)
-        end
-      end
-
-      private def all_zones
-        [].tap do |ary|
-          Dev::Aws.each_page(client, :list_hosted_zones) do |response|
-            response.hosted_zones&.each do |hosted_zone|
-              ary << hosted_zone unless hosted_zone.config.private_zone
-            end
-          end
-        end
-      end
-
-      private def zones_by_domain_names(domains)
-        [].tap do |ary|
-          domains.each do |domain_name|
-            response = client.list_hosted_zones_by_name({dns_name: domain_name})
-            target = response.hosted_zones.find { |it| it.name.chomp('.') == domain_name }
-            raise "The #{domain_name} hosted zone not found." unless target
-
-            ary << target
-          end
-        end
-      end
-
-      private def target_config_id(zone_id)
-        client.list_query_logging_configs(
-          hosted_zone_id: zone_id,
-          max_results: '1'
-        ).query_logging_configs&.first&.id
-      end
-
-      private def pretty_puts(output)
-        # Find the maximum length of the keys
-        max_key_length = output.keys.map(&:to_s).max_by(&:length).length
-
-        output.each do |key, value|
-          puts "#{key.to_s.ljust(max_key_length)}\t=>\t#{value}"
-        end
-      end
-
-      def list_query_configs
-        output = {}
-        zones.each do |zone|
-          target_config_id = target_config_id(zone.id)
-
-          output[zone.name] = if target_config_id
-                                "Config\t=>\t#{target_config_id}".colorize(:green)
-                              else
-                                'No query logging config assigned.'.colorize(:red)
-                              end
-        end
-
-        pretty_puts(output)
-      end
-
-      def activate_query_logging(log_group)
-        output = {}
-
-        zones.each do |zone|
-          response = client.create_query_logging_config(
-            hosted_zone_id: zone.id,
-            cloud_watch_logs_log_group_arn: log_group
-          )
-          output[zone.id] = response.location
-        rescue ::Aws::Route53::Errors::ServiceError => e
-          raise "Error: #{e.message}" unless e.instance_of?(::Aws::Route53::Errors::QueryLoggingConfigAlreadyExists)
-
-          output[zone.id] = e.message
-        end
-        pretty_puts(output)
-      end
-
-      def deactivate_query_logging
-        output = {}
-        zones.each do |zone|
-          target_config_id = target_config_id(zone.id)
-          if target_config_id
-            client.delete_query_logging_config(
-              id: target_config_id
-            )
-            output[zone.id] = 'Query logging config removed.'.colorize(:green)
-          else
-            output[zone.id] = 'No query logging config assigned.'.colorize(:red)
-          end
-        end
-        pretty_puts(output)
-      end
-    end
-  end
-end

data/lib/firespring_dev_commands/templates/aws/services/route53.rb

@@ -1,106 +0,0 @@
-require_relative '../../base_interface'
-
-module Dev
-  module Template
-    class Aws
-      module Services
-        # Class contains rake templates for managing your AWS settings and logging in
-        class Route53 < Dev::Template::BaseInterface
-          # Create the rake task which ensures active credentials are present
-          def create_ensure_credentials_task!
-            # Have to set a local variable to be accessible inside of the instance_eval block
-            exclude = @exclude
-
-            DEV_COMMANDS_TOP_LEVEL.instance_eval do
-              return if exclude.include?(:ensure_aws_credentials)
-
-              task ensure_aws_credentials: %w(init) do
-                raise 'AWS Credentials not found / expired' unless Dev::Aws::Credentials.new.active?
-              end
-            end
-          end
-
-          # Create the rake task for the hosted zone method
-          def create_dns_logging_activate_task!
-            # Have to set a local variable to be accessible inside of the instance_eval block
-            exclude = @exclude
-
-            DEV_COMMANDS_TOP_LEVEL.instance_eval do
-              namespace :aws do
-                return if exclude.include?(:dns_logging)
-
-                namespace :hosted_zone do
-                  namespace :dns_logging do
-                    desc 'Activates query logging for all hosted zones by default.' \
-                         'This command should be run from the account the hosted zone(s) reside.' \
-                         "\n\t(Required) Specify LOG_GROUP_ARN='arn:aws:logs:REGION:ACCOUNT_ID:' to specify the ARN of the target log group." \
-                         "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
-                         "\n\t\tComma delimited list."
-                    task activate: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                      # Use user defined log group.
-                      log_group = ENV.fetch('LOG_GROUP_ARN', nil)
-                      raise 'The Hosted Zone Log Group ARN, LOG_GROUP_ARN, is required' unless log_group
-
-                      route53.activate_query_logging(log_group)
-                    end
-                  end
-                end
-              end
-            end
-          end
-
-          # Create the rake task for the hosted zone method
-          def create_dns_logging_deactivate_task!
-            # Have to set a local variable to be accessible inside of the instance_eval block
-            exclude = @exclude
-
-            DEV_COMMANDS_TOP_LEVEL.instance_eval do
-              namespace :aws do
-                return if exclude.include?(:dns_logging)
-
-                namespace :hosted_zone do
-                  namespace :dns_logging do
-                    desc 'Deactivates query logging for all hosted zones by default. ' \
-                         'This command should be run from the account the hosted zone(s) reside.' \
-                         "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
-                         "\n\t\tComma delimited list."
-                    task deactivate: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                      route53.deactivate_query_logging
-                    end
-                  end
-                end
-              end
-            end
-          end
-
-          # Create the rake task for the hosted zone method
-          def create_list_query_config_task!
-            # Have to set a local variable to be accessible inside of the instance_eval block
-            exclude = @exclude
-
-            DEV_COMMANDS_TOP_LEVEL.instance_eval do
-              namespace :aws do
-                return if exclude.include?(:dns_logging)
-
-                namespace :hosted_zone do
-                  namespace :dns_logging do
-                    desc 'Lists the current config for domain(s). ' \
-                         'This command should be run from the account the hosted zone(s) reside.' \
-                         "\n\toptionally specify DOMAINS='foo.com,foobar.com' to specify the hosted zones to activate." \
-                         "\n\t\tComma delimited list."
-                    task list_query_configs: %w(ensure_aws_credentials) do
-                      route53 = Dev::Aws::Route53.new(ENV['DOMAINS'].to_s.strip.split(','))
-                      route53.list_query_configs
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end