bauble_core 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6928636a53aa5a88ae8f1da06e9ab3b50fb9fefba2c4ff2684c69adcdb68031e
-  data.tar.gz: 6af981f1f1f607547c09121b3105d14f4ae552af178b6592c9d8d7982b07a294
+  metadata.gz: 90cf0a735fda2a560d5a8966ab5b87ab071d5f685af0dc8cff85b113449d580b
+  data.tar.gz: 34beb847ffbae3fa044aa8f181efe36974ae6cb2af57be1f587e5a5558f8e866
 SHA512:
-  metadata.gz: a4ac5e9706f526df8752dbebf54a0c2f4fd99661b4302d60177d2e7dd4d4e54c7996329888ddc2d57c088f4d858b21db0f30dab3ec3992f23135e0c3ffd9e0e7
-  data.tar.gz: 7c99a753835fc040bc28bf146beb40c9e1f20c8938eefca59b03b2646f554ff7aa73801752fd7e02f21cc4808975d5d83f273b1f884d42ef16c307317049d0b2
+  metadata.gz: f80357144acefd390c9e099e74328b0ac029dd494d4d18b5513bb4d86b3019021370f1e910b7b240b857f327853f729d2a4a08778c43189d78811bc2eb3ebb04
+  data.tar.gz: 50151eef8e96197be8e8a9eddccce7e97a9b3ea0478cda255391e5887c07a86f4bcc2a8fbbe9b2443ef7aec0fd56feb4925a09f257152a8426c1351686ae6358

data/exe/bauble

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require_relative '../lib/bauble/cli/cli'
 
 Bauble::Cli::BaubleCli.start(ARGV)

data/lib/bauble/application.rb

@@ -19,55 +19,81 @@ module Bauble
       :code_dir,
       :bundle_hash,
       :shared_code_dir,
+      :shared_code_hash,
+      :gem_layer_hash,
       :skip_gem_layer
     )
 
-    def initialize(name:, stacks: [], code_dir: nil, skip_gem_layer: false)
-      @resources = []
-      @stacks = []
+    def initialize(name:, code_dir:, stacks: [], skip_gem_layer: false)
+      # passed arguments
       @name = name
       @shared_code_dir = code_dir
+      @stacks = []
       @skip_gem_layer = skip_gem_layer
+
+      # init others
+      @resources = []
+
+      # add gem layer by defalt
       add_gem_layer unless skip_gem_layer
+
+      # create a default stack if none passed
       stacks = ['dev'] if stacks.empty?
       stacks.each do |stack|
         Stack.new(self, stack)
       end
-    end
-
-    def add_resource(resource)
-      @resources << resource
-    end
-
-    def add_stack(stack)
-      @stacks << stack
+      @current_stack = @stacks[0]
     end
 
     def template
       @template ||= synthesize_template
     end
 
-    def add_gem_layer
-      Bauble::Resources::GemLayer.new(self)
-    end
-
     def change_current_stack(stack_name)
-      @current_stack = @stacks.find { |stack| stack.name == stack_name }
+      stack = @stacks.find { |st| st.name == stack_name }
+      unless stack
+        Bauble::Cli::Logger.error "Unknown stack #{stack_name}"
+        exit(1)
+      end
+
+      @current_stack = stack
     end
 
     def bundle
-      # TODO: this potentially need to be a hash of more resources I'm not sure yet'
-      @bundle_hash = generate_unique_string("#{Dir.pwd}/app")
+      create_bundle_hashes
       create_shared_code
       @resources.each(&:bundle)
     end
 
+    def add_resource(resource)
+      @resources << resource
+    end
+
+    def add_stack(stack)
+      @stacks << stack
+    end
+
     private
 
+    def create_bundle_hashes
+      @bundle_hash = hash_of_dir("#{Dir.pwd}/#{code_dir}")
+      @shared_code_hash = hash_of_dir("#{@config.root_dir}/#{@shared_code_dir}") if @shared_code_dir
+      @gem_layer_hash = hash_of_file("#{@config.root_dir}/Gemfile") unless @skip_gem_layer
+    end
+
+    def add_gem_layer
+      Bauble::Resources::GemLayer.new(self)
+    end
+
     def create_shared_code
       return unless @shared_code_dir
 
-      destination_dir = File.join(config.asset_dir, @bundle_hash, 'shared_app_code', File.basename(@shared_code_dir))
+      destination_dir = File.join(
+        config.asset_dir,
+        'shared_app_code',
+        @shared_code_hash,
+        @shared_code_dir
+      )
       FileUtils.mkdir_p(destination_dir)
       FileUtils.cp_r(Dir.glob(File.join(@shared_code_dir, '*')), destination_dir)
     end
@@ -87,10 +113,14 @@ module Bauble
       }
     end
 
-    def generate_unique_string(directory)
+    def hash_of_dir(directory)
       files = Dir.glob("#{directory}/**/*").select { |file| File.file?(file) }
       content_hash = files.map { |file| Digest::SHA256.file(file).hexdigest }.join
       Digest::SHA256.hexdigest(content_hash)
     end
+
+    def hash_of_file(filename)
+      Digest::SHA256.file(filename).hexdigest
+    end
   end
 end

data/lib/bauble/cli/bundle_command_builder.rb

@@ -13,8 +13,8 @@ module Bauble
         self
       end
 
-      def with_bundle_path(bundle_hash)
-        @commands << "bundle config set path \".bauble/assets/#{bundle_hash}/gem-layer\""
+      def with_bundle_path(path)
+        @commands << "bundle config set path #{path}"
         self
       end
 

data/lib/bauble/cli/cli.rb

@@ -49,7 +49,7 @@ module Bauble
       def write_stack_template(stack)
         create_directory
         # TODO: this can probably be put into something smarter, maube a file writing class?
-        File.open("#{config.pulumi_home}/Pulumi.#{stack.name}.yaml", 'w') { |file| file.write(stack.template) }
+        File.write("#{config.pulumi_home}/Pulumi.#{stack.name}.yaml", stack.template)
       end
 
       def create_directory
@@ -61,8 +61,7 @@ module Bauble
       end
 
       def require_entrypoint
-        # TODO: We should probably use a config value here instead of Dir.pwd
-        require "#{Dir.pwd}/#{bauble_json['entrypoint']}"
+        Kernel.require "#{Dir.pwd}/#{bauble_json['entrypoint']}"
       end
     end
   end

data/lib/bauble/cli/code_bundler.rb

@@ -10,14 +10,14 @@ module Bauble
     # bundle code
     class CodeBundler
       class << self
-        def docker_bundle_gems(bundle_hash:)
-          IO.popen("#{docker_build_gems_command(bundle_hash)} 2>&1") do |io|
+        def docker_bundle_gems(gem_path:)
+          IO.popen("#{docker_build_gems_command(gem_path)} 2>&1") do |io|
             io.each do |line|
               Logger.docker(line)
             end
           end
 
-          return if $CHILD_STATUS.success?
+          return if last_process_success?
 
           `rm -rf .bundle`
           Logger.error('Bundle step failed')
@@ -26,8 +26,12 @@ module Bauble
 
         private
 
+        def last_process_success?
+          $CHILD_STATUS.success?
+        end
+
         # TODO: Remove the need for this to install things from the sub dir
-        def docker_build_gems_command(bundle_hash)
+        def docker_build_gems_command(gem_path)
           command = DockerCommandBuilder
                     .new
                     .with_rm
@@ -41,15 +45,15 @@ module Bauble
           end
 
           command.with_image('public.ecr.aws/sam/build-ruby3.2')
-                 .with_command(bundle_command(bundle_hash))
+                 .with_command(bundle_command(gem_path))
                  .build
         end
 
-        def bundle_command(bundle_hash)
+        def bundle_command(gem_path)
           command = BundleCommandBuilder
                     .new
                     .with_bundle_without(%w[test development])
-                    .with_bundle_path(bundle_hash)
+                    .with_bundle_path(gem_path)
 
           command.with_bauble_gem_override if ENV['BAUBLE_DEV_GEM_PATH']
 

data/lib/bauble/cli/commands/destroy.rb

@@ -24,7 +24,7 @@ module Bauble
 
                 # check for multiple stacks
                 if @app.stacks.length > 1 && options[:stack].nil?
-                  Log.error 'Must provide a stack when multiple are defined'
+                  Logger.error 'Must provide a stack when multiple are defined'
                   exit(1)
                 end
 

data/lib/bauble/cli/commands/preview.rb

@@ -23,7 +23,7 @@ module Bauble
 
                 # check for multiple stacks
                 if @app.stacks.length > 1 && options[:stack].nil?
-                  Log.error 'Must provide a stack when multiple are defined'
+                  Logger.error 'Must provide a stack when multiple are defined'
                   exit(1)
                 end
 

data/lib/bauble/cli/commands/up.rb

@@ -23,7 +23,7 @@ module Bauble
 
                 # check for multiple stacks
                 if @app.stacks.length > 1 && options[:stack].nil?
-                  Log.error 'Must provide a stack when multiple are defined'
+                  Logger.error 'Must provide a stack when multiple are defined'
                   exit(1)
                 end
 

data/lib/bauble/cli/config.rb

@@ -12,7 +12,9 @@ module Bauble
         :debug,
         :asset_dir,
         :root_dir,
-        :skip_gem_layer
+        :skip_gem_layer,
+        :gem_layer_asset_dir,
+        :shared_code_asset_dir
       )
 
       def initialize
@@ -20,6 +22,8 @@ module Bauble
         @bauble_home = "#{@root_dir}/.bauble"
         @asset_dir = "#{@bauble_home}/assets"
         @pulumi_home = "#{@bauble_home}/.pulumi"
+        @gem_layer_asset_dir = "#{@asset_dir}/gem_layer"
+        @shared_code_asset_dir = "#{@asset_dir}/shared_app_code"
         @app_stack_name = 'bauble'
         @debug = ENV['BAUBLE_DEBUG'] || false
         @skip_gem_layer = false

data/lib/bauble/cli/docker_command_builder.rb

@@ -39,7 +39,7 @@ module Bauble
       end
 
       def with_command(cmd)
-        @command += "-c \"#{cmd}\""
+        @command += %(-c "#{cmd.gsub('"', '\"')}" )
         self
       end
 
@@ -49,7 +49,7 @@ module Bauble
       end
 
       def build
-        @command
+        @command.strip
       end
     end
   end

data/lib/bauble/cli/logger.rb

@@ -30,7 +30,7 @@ module Bauble
         end
 
         def debug(message)
-          puts "[ Bauble DEBUG ] #{message}".orange if ENV['BAUBLE_DEBUG']
+          puts "[ Bauble DEBUG ] #{message}".yellow if ENV['BAUBLE_DEBUG']
         end
 
         def error(message)

data/lib/bauble/cli/pulumi.rb

@@ -16,7 +16,7 @@ module Bauble
 
       def create_pulumi_yml(template)
         Logger.debug 'Creating Pulumi.yaml...'
-        FileUtils.mkdir_p(@config.pulumi_home) unless Dir.exist?(@config.pulumi_home)
+        FileUtils.mkdir_p(@config.pulumi_home)
         File.write("#{@config.pulumi_home}/Pulumi.yaml", template, mode: 'w')
       end
 
@@ -102,8 +102,9 @@ module Bauble
 
       def pulumi_logged_in?
         run_command('whoami')
-        Logger.debug "Checking pulumi login status... #{$CHILD_STATUS.success?}"
-        $CHILD_STATUS.success?
+        success = pulumi_command_success?
+        Logger.debug "Checking pulumi login status... #{success}"
+        success
       end
 
       def init_stack(stack_name)
@@ -118,6 +119,10 @@ module Bauble
         Logger.debug "Checking if stack #{stack_name} is initialized..."
         run_command('stack ls').include?(stack_name)
       end
+
+      def pulumi_command_success?
+        $CHILD_STATUS.success?
+      end
     end
   end
 end

data/lib/bauble/resources/api_gateway_v2.rb

@@ -35,7 +35,7 @@ module Bauble
       private
 
       def routes_hash
-        routes.each_with_index.each_with_object({}) do |(route, index), route_hash|
+        routes.each_with_index.with_object({}) do |(route, index), route_hash|
           route_name = "#{name}-route-#{index}"
           route_hash[route_name] = {
             'type' => 'aws:apigatewayv2:Route',
@@ -45,11 +45,11 @@ module Bauble
               'target' => "integrations/${#{route_name}-integration.id}"
             }
           }
-          route_hash.merge!(synthesize_integration(route, route_name))
+          route_hash.merge!(integration_hash(route, route_name))
         end
       end
 
-      def synthesize_integration(route, route_name)
+      def integration_hash(route, route_name)
         {
           "#{route_name}-integration" => {
             'type' => 'aws:apigatewayv2:Integration',
@@ -102,7 +102,7 @@ module Bauble
           name => {
             'type' => 'aws:apigatewayv2:Api',
             'properties' => {
-              'name' => name,
+              'name' => resource_name(name),
               'protocolType' => 'HTTP'
             }
           },

data/lib/bauble/resources/event_bridge_rule.rb

@@ -6,9 +6,9 @@ module Bauble
   module Resources
     # EventBridgeRule class
     class EventBridgeRule < Resource
-      def initialize(app, rule_name:, **kwargs)
+      def initialize(app, name:, **kwargs)
         super(app)
-        @rule_name = rule_name
+        @name = name
         @description = kwargs.fetch(:description, 'Bauble EventBridge Rule')
         @event_pattern = kwargs.fetch(:event_pattern, nil)
         @schedule_expression = kwargs.fetch(:schedule_expression, nil)
@@ -21,10 +21,10 @@ module Bauble
 
       def synthesize
         event_rule_hash = {
-          @rule_name => {
+          @name => {
             'type' => 'aws:cloudwatch:EventRule',
             'properties' => {
-              'name' => @rule_name,
+              'name' => resource_name(@name),
               'description' => @description,
               'eventBusName' => @event_bus_name,
               'state' => @state
@@ -32,8 +32,8 @@ module Bauble
           }
         }
 
-        event_rule_hash[@rule_name]['properties']['eventPattern'] = @event_pattern.to_json if @event_pattern
-        event_rule_hash[@rule_name]['properties']['scheduleExpression'] = @schedule_expression if @schedule_expression
+        event_rule_hash[@name]['properties']['eventPattern'] = @event_pattern.to_json if @event_pattern
+        event_rule_hash[@name]['properties']['scheduleExpression'] = @schedule_expression if @schedule_expression
 
         @targets.each do |target|
           event_rule_hash.merge!(target)
@@ -48,10 +48,10 @@ module Bauble
 
       def add_target(function)
         @targets << {
-          "#{@rule_name}-#{function.name}-target" => {
+          "#{@name}-#{function.name}-target" => {
             'type' => 'aws:cloudwatch:EventTarget',
             'properties' => {
-              'rule' => "${#{@rule_name}.name}",
+              'rule' => "${#{@name}.name}",
               'arn' => "${#{function.name}.arn}"
             }
           },
@@ -61,7 +61,7 @@ module Bauble
               'action' => 'lambda:InvokeFunction',
               'function' => "${#{function.name}.name}",
               'principal' => 'events.amazonaws.com',
-              'sourceArn' => "${#{@rule_name}.arn}"
+              'sourceArn' => "${#{@name}.arn}"
             }
           }
         }
@@ -76,21 +76,21 @@ module Bauble
       end
 
       def pattern_or_schedule?
-        return if @event_pattern || @schedule_expression
+        return false if @event_pattern || @schedule_expression
 
         raise 'EventBridgeRule must have an event_pattern or a schedule_expression'
       end
 
       def pattern_and_schedule?
-        return unless @event_pattern && @schedule_expression
+        return false unless @event_pattern && @schedule_expression
 
         raise 'EventBridgeRule cannot have both an event_pattern and a schedule_expression'
       end
 
       def name_present?
-        return if @rule_name
+        return false if @name
 
-        raise 'EventBridgeRule must have a rule_name'
+        raise 'EventBridgeRule must have a name'
       end
     end
   end

data/lib/bauble/resources/gem_layer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'zip'
 require_relative 'resource'
 require_relative '../cli/code_bundler'
 
@@ -10,19 +9,23 @@ module Bauble
     # a ruby lambda function
     class GemLayer < Resource
       def bundle
-        Bauble::Cli::CodeBundler.docker_bundle_gems(bundle_hash: @app.bundle_hash)
+        FileUtils.mkdir_p("#{@app.config.gem_layer_asset_dir}/#{@app.gem_layer_hash}")
+
+        Bauble::Cli::CodeBundler.docker_bundle_gems(
+          gem_path: ".bauble/assets/gem_layer/#{@app.gem_layer_hash}"
+        )
       end
 
       def synthesize
         {
           'gemLayer' => {
             'type' => 'aws:lambda:LayerVersion',
-            'name' => 'gem_layer',
+            'name' => resource_name('gem_layer'),
             'properties' => {
               'code' => {
-                'fn::fileArchive' => "#{@app.config.asset_dir}/#{@app.bundle_hash}/gem-layer"
+                'fn::fileArchive' => "#{@app.config.gem_layer_asset_dir}/#{@app.gem_layer_hash}"
               },
-              'layerName' => "#{@app.config.app_name}-gem-layer",
+              'layerName' => resource_name('gem_layer'),
               'compatibleRuntimes' => %w[ruby3.2]
             }
           }

data/lib/bauble/resources/lambda_role.rb

@@ -7,22 +7,28 @@ module Bauble
   module Resources
     # aws lambda role
     class LambdaRole < Resource
-      attr_accessor :role_name, :policy_statements
+      attr_accessor :name, :policy_statements, :managed_policy_arns, :description
 
-      def initialize(app, role_name:, policy_statements: [])
+      def initialize(app, name:, policy_statements: [], **kwargs)
         super(app)
-        @role_name = role_name
+        @name = name
         @policy_statements = policy_statements
+        @managed_policy_arns = []
+        @description = kwargs.fetch(:description, 'Bauble lambda role')
       end
 
       def synthesize
         role_hash = {
-          role_name => {
+          name => {
             'type' => 'aws:iam:Role',
             'properties' => {
+              'name' => resource_name(name),
               'assumeRolePolicy' => assume_role_policy,
-              'managedPolicyArns' => ['arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole']
-            }
+              'managedPolicyArns' => managed_policy_arns.push(
+                'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
+              ),
+              'description' => @description
+            }.compact
           }
         }
 
@@ -43,11 +49,11 @@ module Bauble
 
       def role_policy
         {
-          "#{role_name}-policy" => {
+          "#{name}-policy" => {
             'type' => 'aws:iam:RolePolicy',
             'properties' => {
-              'name' => "#{role_name}-policy",
-              'role' => "${#{role_name}}",
+              'name' => "#{name}-policy",
+              'role' => "${#{name}}",
               'policy' => synth_policies
             }
           }

data/lib/bauble/resources/resource.rb

@@ -3,7 +3,6 @@
 module Bauble
   module Resources
     # Base resource
-    # TODO: this should just be Resource not base resource
     class Resource
       attr_accessor :app
 
@@ -19,6 +18,10 @@ module Bauble
       def bundle
         raise 'Not implemented'
       end
+
+      def resource_name(base_name)
+        "#{app.name}-#{base_name}-#{app.current_stack.name}"
+      end
     end
   end
 end

data/lib/bauble/resources/ruby_function.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'zip'
 require_relative 'resource'
 
 # Ruby function
@@ -8,81 +7,88 @@ module Bauble
   module Resources
     # a ruby lambda function
     class RubyFunction < Resource
-      attr_accessor :handler, :name, :role, :code_dir, :function_url, :env_vars
+      attr_accessor :handler, :name, :role, :function_url, :env_vars, :layers, :timeout, :memory_size,
+                    :reserved_concurrent_executions, :vpc_config, :image_uri
 
       def initialize(app, **kwargs)
         super(app)
         @name = kwargs[:name]
         @handler = kwargs[:handler]
-        @code_dir = kwargs[:code_dir]
         @role = kwargs[:role]
+        @layers = kwargs.fetch(:layers, [])
+        @image_uri = kwargs.fetch(:image_uri, nil)
         @function_url = kwargs.fetch(:function_url, false)
         @env_vars = kwargs.fetch(:env_vars, {})
+        @timeout = kwargs.fetch(:timeout, 30) # default to 30 seconds
+        @memory_size = kwargs.fetch(:memory_size, 128) # default to 128 MB
+        @reserved_concurrent_executions = kwargs.fetch(:reserved_concurrent_executions, nil) # no limit by default
+        @vpc_config = kwargs.fetch(:vpc_config, nil) # VPC config is optional
       end
 
       def bundle
-        return true unless @code_dir
-
-        # generate the asset directory path
-        assets_dir = File.join(@app.config.asset_dir, @app.bundle_hash)
-        FileUtils.mkdir_p(assets_dir)
-
-        # create the zipfile path
-        zipfile_name = File.join(assets_dir, "#{name}.zip")
-        FileUtils.rm_f(zipfile_name)
-
-        # create the zipfile
-        Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
-          # add the code directory to the zipfile
-          Dir.glob(File.join(@code_dir, '**', '*')).each do |file|
-            zipfile_path = File.join(File.basename(@code_dir), file.sub("#{code_dir}/", ''))
-            zipfile.add(zipfile_path, file)
-          end
-
-          %w[Gemfile Gemfile.lock].each do |gemfile|
-            gemfile_path = File.join(@app.config.root_dir, gemfile)
-            zipfile.add(gemfile, gemfile_path) if File.exist?(gemfile_path)
-          end
-        end
+        true
       end
 
       def synthesize
-        template = base_template
+        template = function_hash
+        template[@name]['properties'].merge!(code_hash)
         template.merge!(function_url_template_addon) if @function_url
         template
       end
 
       private
 
-      def base_template
+      def function_hash
         {
           @name => {
             'type' => 'aws:lambda:Function',
-            'name' => @name,
+            'name' => resource_name(@name),
             'properties' => {
-              'handler' => @handler,
-              'runtime' => 'ruby3.2',
-              'code' => {
-                'fn::fileArchive' => code_archive
-              },
-              'role' => "${#{@role.role_name}.arn}",
-              'layers' => ['${gemLayer.arn}'],
+              'name' => resource_name(@name),
+              'role' => "${#{@role.name}.arn}",
               'environment' => {
                 'variables' => @env_vars.merge(
                   {
                     'GEM_PATH' => '/opt/ruby/3.2.0'
                   }
                 )
-              }
-            }
+              },
+              'timeout' => @timeout,
+              'memorySize' => @memory_size,
+              'reservedConcurrentExecutions' => @reserved_concurrent_executions,
+              'vpcConfig' => if @vpc_config
+                               {
+                                 'subnetIds' => @vpc_config[:subnet_ids],
+                                 'securityGroupIds' => @vpc_config[:security_group_ids]
+                               }
+                             end
+            }.compact
           }
         }
       end
 
-      def code_archive
-        return "#{@app.config.asset_dir}/#{@app.bundle_hash}/#{@name}.zip" if @code_dir
+      def gem_layers
+        all_layers = layers.dup
+        all_layers << '${gemLayer.arn}' unless @app.config.skip_gem_layer
+        all_layers
+      end
 
-        "#{@app.config.asset_dir}/#{@app.bundle_hash}/shared_app_code"
+      def code_hash
+        if @image_uri
+          return {
+            'packageType' => 'Image',
+            'imageUri' => @image_uri
+          }
+        end
+
+        {
+          'code' => {
+            'fn::fileArchive' => "#{@app.config.asset_dir}/shared_app_code/#{@app.shared_code_hash}"
+          },
+          'handler' => @handler,
+          'layers' => gem_layers,
+          'runtime' => 'ruby3.2'
+        }
       end
 
       def function_url_template_addon

data/lib/bauble/resources/s3_bucket.rb

@@ -7,20 +7,20 @@ module Bauble
   module Resources
     # S3 bucket
     class S3Bucket < Resource
-      attr_accessor :bucket_name, :force_destroy
+      attr_accessor :name, :force_destroy
 
-      def initialize(app, bucket_name: 'bauble-bucket', force_destroy: false)
+      def initialize(app, name: 'bauble-bucket', force_destroy: false)
         super(app)
-        @bucket_name = bucket_name
+        @name = name
         @force_destroy = force_destroy
       end
 
       def synthesize
         {
-          @bucket_name => {
+          @name => {
             'type' => 'aws:s3:Bucket',
             'properties' => {
-              'bucket' => @bucket_name,
+              'bucket' => resource_name(@name),
               'forceDestroy' => @force_destroy
             }
           }

data/lib/bauble/resources/sqs_queue.rb

@@ -2,17 +2,21 @@
 
 require_relative 'resource'
 
-# bauble resources to manage infrastructure
+# Bauble resources to manage infrastructure
 module Bauble
   module Resources
     # SQS Queue
     class SQSQueue < Resource
-      attr_accessor :name, :visibility_timeout, :lambda_targets
+      attr_accessor :name, :visibility_timeout, :lambda_targets, :message_retention, :dead_letter_queue,
+                    :encryption, :encryption_master_key
 
-      def initialize(app, name:, visibility_timeout: 30)
+      def initialize(app, **kwargs)
         super(app)
-        @name = name
-        @visibility_timeout = visibility_timeout
+        @name = kwargs.fetch(:name)
+        @visibility_timeout = kwargs.fetch(:visibility_timeout, 30)
+        @message_retention = kwargs.fetch(:message_retention, 345_600)
+        @dead_letter_queue = kwargs.fetch(:dead_letter_queue, nil)
+        @content_based_deduplication = kwargs.fetch(:content_based_deduplication, false)
         @lambda_targets = []
       end
 
@@ -21,12 +25,15 @@ module Bauble
           @name => {
             'type' => 'aws:sqs:Queue',
             'properties' => {
-              'name' => @name,
-              'visibilityTimeoutSeconds' => @visibility_timeout
-            }
+              'name' => resource_name(@name),
+              'visibilityTimeoutSeconds' => @visibility_timeout,
+              'messageRetentionSeconds' => @message_retention
+            }.compact
           }
         }
 
+        base_template.merge!(dead_letter_queue_template) if @dead_letter_queue
+
         @lambda_targets.each { |target| base_template.merge!(target) }
 
         base_template
@@ -36,7 +43,6 @@ module Bauble
         true
       end
 
-      # Function to add a Lambda function as a target to the SQS Queue
       def add_target(function)
         @lambda_targets << {
           "#{@name}_to_#{function.name}" => {
@@ -54,6 +60,23 @@ module Bauble
           resources: ["${#{name}.arn}"]
         )
       end
+
+      private
+
+      def dead_letter_queue_template
+        {
+          'redrivePolicy' => {
+            'type' => 'aws:sqs:RedrivePolicy',
+            'properties' => {
+              'queueUrl' => "${#{name}}",
+              'redrivePolicy' => {
+                'deadLetterTargetArn' => "${#{@dead_letter_queue.name}.arn}",
+                'maxReceiveCount' => 5
+              }.to_json
+            }
+          }
+        }
+      end
     end
   end
 end

data/lib/bauble/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bauble
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bauble_core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Hoegerl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +84,7 @@ metadata:
   homepage_uri: https://github.com/la-jamesh/bauble
   source_code_uri: https://github.com/la-jamesh/bauble
   changelog_uri: https://github.com/la-jamesh/bauble
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: