s3arch 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ab9ff26fb027515006bee668f41d7d5f264fc301110d57f6ac4d365b426588
-  data.tar.gz: bb2a513c4f7252620668c7292357d0e314a60d9efae70738c5ffd127f386d4b2
+  metadata.gz: 8c46893f02a5588325d730a0dbd3dfd7944a269ae03f398ca1ca9b0ebac13773
+  data.tar.gz: f2758f7ceb14bf54762c0f889d881a2f0e1edd4efa53ca143d31b1ba0bc6ea6d
 SHA512:
-  metadata.gz: 6def4b186fc609041e90c7246d1a9fb0453aeb01ae7c880040d9c8154a94eb514505adeab291191094c8e5e755e9fb753ccf699dd04cabccc672b0c7f74ad4cc
-  data.tar.gz: d1e054232f1d30443340ddd06f2a264458166b030a69b823327f82a61025f4065c000fadba2bbfc82d45949ee69b00e25d5be350d12a09309e4efab133d49503
+  metadata.gz: 8dc8da0493198ceb3248fe17e3a4f13ed82f0bc2459598fb0798a30334307df5597413b07e4f6007a3ea25a6cdd866bd796571e712a3801d8618f2b0d2f1db89
+  data.tar.gz: 5c32d8cea5c684d5471411865de486462d313f222aece96f69cc1863111bfab3d7a001d22714272d734b154e61c6a897cff3a51e9eee9a3658ed42735b48c3ee

data/README.md

@@ -93,26 +93,18 @@ indexer.rebuild("user-123")
 
 ## Infrastructure
 
-A Terraform module is provided at [`terraform/`](./terraform/) that provisions:
+S3arch infrastructure is defined using [Belt](https://github.com/stowzilla/belt) and [Conveyor Belt](https://github.com/stowzilla/terraform-provider-conveyor-belt) conventions:
+
+- **[`config/routes.rb`](./config/routes.rb)** — API Gateway routes for search and rebuild endpoints
+- **[`config/contracts.rb`](./config/contracts.rb)** — Request/response schema contracts
+
+When using S3arch with a Belt app, these files are automatically picked up by `belt deploy`. For standalone use, you'll need to provision:
 
 - S3 bucket for index storage (with 90-day lifecycle)
 - DynamoDB version tracking table (PAY_PER_REQUEST)
 - SQS queue + DLQ for the indexer
 - EventBridge Pipe (DynamoDB Stream → SQS)
 
-```hcl
-module "s3arch" {
-  source                  = "github.com/stowzilla/s3arch//terraform"
-  app_name                = "myapp"
-  environment             = "production"
-  source_table_name       = aws_dynamodb_table.items.name
-  source_table_arn        = aws_dynamodb_table.items.arn
-  source_table_stream_arn = aws_dynamodb_table.items.stream_arn
-}
-```
-
-Outputs include `indexer_env_vars`, `searcher_env_vars`, `indexer_permissions`, and `searcher_permissions` for easy Lambda configuration.
-
 ## Configuration Options
 
 | Option | Default | Description |
@@ -148,13 +140,13 @@ S3arch requires the `sqlite3` native extension at runtime. A Rake task is includ
 rake s3arch:layer:build
 
 # Build and publish in one step
-rake s3arch:layer:publish PROFILE=devzilla
+rake s3arch:layer:publish PROFILE=your-profile
 
 # Customize the build
 rake s3arch:layer:build RUBY_VERSION=3.4 ARCHITECTURE=x86_64
 
 # Publish to a specific region/account
-rake s3arch:layer:publish PROFILE=production REGION=us-west-2 LAYER_NAME=stowzilla-sqlite3-ruby
+rake s3arch:layer:publish PROFILE=production REGION=us-west-2 LAYER_NAME=my-sqlite3-ruby
 ```
 
 | Environment Variable | Default | Description |
@@ -164,7 +156,7 @@ rake s3arch:layer:publish PROFILE=production REGION=us-west-2 LAYER_NAME=stowzil
 | `OUTPUT` | `pkg/sqlite-layer.zip` | Output path for the zip |
 | `PROFILE` | (none) | AWS CLI profile for publishing |
 | `REGION` | `us-east-1` | AWS region to publish to |
-| `LAYER_NAME` | `stowzilla-sqlite3-ruby` | Layer name in AWS |
+| `LAYER_NAME` | `sqlite3-ruby` | Layer name in AWS |
 | `S3ARCH_VERSION` | `~> current minor` | Version constraint for s3arch in the layer |
 
 Requires Docker to be running (uses the official AWS SAM build images).

data/{infrastructure/schema.tf.rb → config/contracts.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-TerraDispatch.schema.define do
+Belt.application.schema.define do
   # S3arch does not define request/response models yet.
   # The search_indexes table is provisioned by s3arch's own Terraform module.
 end

data/{infrastructure/routes.tf.rb → config/routes.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-TerraDispatch.routes.draw do
+Belt.application.routes.draw do
   namespace :s3arch, auth: :cognito, tables: [:search_indexes] do
     get '/', action: 'index'
     post '/rebuild', action: 'rebuild'

data/lib/s3arch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module S3arch
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

data/lib/tasks/s3arch.rake

@@ -2,103 +2,134 @@
 
 require_relative '../s3arch/version'
 
+module S3archLayerBuilder
+  module_function
+
+  def build_layer(ruby_version:, architecture:, output_file:, s3arch_version:)
+    require 'tmpdir'
+    require 'fileutils'
+
+    FileUtils.mkdir_p(File.dirname(output_file))
+
+    puts "🔨 Building Lambda layer (Ruby #{ruby_version} / #{architecture}, s3arch #{s3arch_version})..."
+
+    tmpdir = Dir.mktmpdir('s3arch-layer')
+    begin
+      write_gemfile(tmpdir, s3arch_version)
+      run_docker_build(tmpdir, ruby_version, architecture)
+      strip_layer("#{tmpdir}/layer")
+      verify_layer("#{tmpdir}/layer")
+      create_zip("#{tmpdir}/layer", output_file)
+    ensure
+      system('sudo', 'rm', '-rf', tmpdir) || FileUtils.rm_rf(tmpdir)
+    end
+  end
+
+  def write_gemfile(tmpdir, s3arch_version)
+    File.write("#{tmpdir}/Gemfile", <<~GEMFILE)
+      source 'https://rubygems.org'
+      gem 's3arch', '#{s3arch_version}'
+    GEMFILE
+  end
+
+  def run_docker_build(tmpdir, ruby_version, architecture)
+    docker_image = "public.ecr.aws/sam/build-ruby#{ruby_version}:latest-#{architecture}"
+    platform = architecture == 'x86_64' ? 'linux/amd64' : 'linux/arm64'
+
+    build_script = docker_build_script(ruby_version)
+
+    docker_cmd = [
+      'docker', 'run', '--rm',
+      '--platform', platform,
+      '-v', "#{tmpdir}:/build",
+      '-w', '/build',
+      docker_image,
+      '/bin/bash', '-c', build_script
+    ]
+
+    puts "🐳 Building in Docker (#{docker_image})..."
+    abort '❌ Docker build failed' unless system(*docker_cmd)
+  end
+
+  def docker_build_script(ruby_version)
+    <<~BASH
+      yum install -y sqlite-devel 2>/dev/null || dnf install -y sqlite-devel 2>/dev/null
+      bundle config set --local path /build/layer/ruby/gems/#{ruby_version}.0
+      bundle config set --local without "development test"
+      bundle config set --local deployment false
+      bundle install
+      NESTED="/build/layer/ruby/gems/#{ruby_version}.0/ruby/#{ruby_version}.0"
+      if [ -d "$NESTED" ]; then
+        mkdir -p /build/layer-final/ruby/gems/#{ruby_version}.0
+        cp -a "$NESTED"/* /build/layer-final/ruby/gems/#{ruby_version}.0/
+        rm -rf /build/layer
+        mv /build/layer-final /build/layer
+      fi
+    BASH
+  end
+
+  def strip_layer(layer_dir)
+    puts '🧹 Stripping layer...'
+
+    Dir.glob("#{layer_dir}/ruby/gems/*/gems/*/").each do |gem_dir|
+      %w[spec test tests doc docs examples benchmarks].each do |fat_dir|
+        FileUtils.rm_rf("#{gem_dir}#{fat_dir}")
+      end
+    end
+
+    junk_patterns = %w[
+      *.md *.rdoc *.txt *.c *.h *.o Makefile *.log
+      CHANGELOG* HISTORY* LICENSE* README* .gitignore Rakefile
+    ]
+    junk_patterns.each do |pattern|
+      Dir.glob("#{layer_dir}/**/#{pattern}").each { |f| FileUtils.rm_f(f) }
+    end
+
+    Dir.glob("#{layer_dir}/**/*.so").each do |so|
+      system('strip', '--strip-debug', so, err: File::NULL)
+    end
+  end
+
+  def verify_layer(layer_dir)
+    sqlite_so = Dir.glob("#{layer_dir}/**/sqlite3_native.so") +
+                Dir.glob("#{layer_dir}/**/sqlite3.so")
+    abort '❌ sqlite3 native extension NOT found in layer' if sqlite_so.empty?
+    puts '✅ sqlite3 native extension included'
+
+    s3arch_lib = Dir.glob("#{layer_dir}/**/gems/s3arch-*/lib/s3arch.rb")
+    abort '❌ s3arch gem NOT found in layer' if s3arch_lib.empty?
+    puts '✅ s3arch gem included'
+  end
+
+  def create_zip(layer_dir, output_file)
+    FileUtils.rm_f(output_file)
+    abort '❌ Failed to create zip' unless system('zip', '-qr', output_file, 'ruby/', chdir: layer_dir)
+
+    size = `du -h #{output_file}`.split("\t").first
+    puts "✅ Layer built: #{output_file} (#{size})"
+  end
+end
+
 namespace :s3arch do
   namespace :layer do
     desc 'Build the Lambda layer zip (defaults: RUBY_VERSION=3.4, ARCHITECTURE=x86_64)'
     task :build do
-      require 'tmpdir'
-      require 'fileutils'
-
       ruby_version   = ENV.fetch('RUBY_VERSION', '3.4')
       architecture   = ENV.fetch('ARCHITECTURE', 'x86_64')
       output_file    = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
       s3arch_version = ENV.fetch('S3ARCH_VERSION', "~> #{S3arch::VERSION.sub(/\.\d+$/, '.0')}")
 
-      FileUtils.mkdir_p(File.dirname(output_file))
-
-      puts "🔨 Building Lambda layer (Ruby #{ruby_version} / #{architecture}, s3arch #{s3arch_version})..."
-
-      tmpdir = Dir.mktmpdir('s3arch-layer')
-      begin
-        File.write("#{tmpdir}/Gemfile", <<~GEMFILE)
-          source 'https://rubygems.org'
-          gem 'sqlite3', '~> 2.0'
-          gem 's3arch', '#{s3arch_version}'
-        GEMFILE
-
-        docker_image = "public.ecr.aws/sam/build-ruby#{ruby_version}:latest-#{architecture}"
-        platform = architecture == 'x86_64' ? 'linux/amd64' : 'linux/arm64'
-
-        build_script = <<~BASH
-          yum install -y sqlite-devel 2>/dev/null || dnf install -y sqlite-devel 2>/dev/null
-          bundle config set --local path /build/layer/ruby/gems/#{ruby_version}.0
-          bundle config set --local without "development test"
-          bundle config set --local deployment false
-          bundle install
-          NESTED="/build/layer/ruby/gems/#{ruby_version}.0/ruby/#{ruby_version}.0"
-          if [ -d "$NESTED" ]; then
-            mkdir -p /build/layer-final/ruby/gems/#{ruby_version}.0
-            cp -a "$NESTED"/* /build/layer-final/ruby/gems/#{ruby_version}.0/
-            rm -rf /build/layer
-            mv /build/layer-final /build/layer
-          fi
-        BASH
-
-        docker_cmd = [
-          'docker', 'run', '--rm',
-          '--platform', platform,
-          '-v', "#{tmpdir}:/build",
-          '-w', '/build',
-          docker_image,
-          '/bin/bash', '-c', build_script
-        ]
-
-        puts "🐳 Building in Docker (#{docker_image})..."
-        abort '❌ Docker build failed' unless system(*docker_cmd)
-
-        layer_dir = "#{tmpdir}/layer"
-
-        puts '🧹 Stripping layer...'
-        Dir.glob("#{layer_dir}/ruby/gems/*/gems/*/").each do |gem_dir|
-          %w[spec test tests doc docs examples benchmarks].each do |fat_dir|
-            FileUtils.rm_rf("#{gem_dir}#{fat_dir}")
-          end
-        end
-
-        junk_patterns = %w[
-          *.md *.rdoc *.txt *.c *.h *.o Makefile *.log
-          CHANGELOG* HISTORY* LICENSE* README* .gitignore Rakefile
-        ]
-        junk_patterns.each do |pattern|
-          Dir.glob("#{layer_dir}/**/#{pattern}").each { |f| FileUtils.rm_f(f) }
-        end
-
-        Dir.glob("#{layer_dir}/**/*.so").each do |so|
-          system('strip', '--strip-debug', so, err: File::NULL)
-        end
-
-        sqlite_so = Dir.glob("#{layer_dir}/**/sqlite3_native.so") +
-                    Dir.glob("#{layer_dir}/**/sqlite3.so")
-        abort '❌ sqlite3 native extension NOT found in layer' if sqlite_so.empty?
-        puts '✅ sqlite3 native extension included'
-
-        s3arch_lib = Dir.glob("#{layer_dir}/**/gems/s3arch-*/lib/s3arch.rb")
-        abort '❌ s3arch gem NOT found in layer' if s3arch_lib.empty?
-        puts '✅ s3arch gem included'
-
-        FileUtils.rm_f(output_file)
-        abort '❌ Failed to create zip' unless system('zip', '-qr', output_file, 'ruby/', chdir: layer_dir)
-
-        size = `du -h #{output_file}`.split("\t").first
-        puts "✅ Layer built: #{output_file} (#{size})"
-      ensure
-        system('sudo', 'rm', '-rf', tmpdir) || FileUtils.rm_rf(tmpdir)
-      end
+      S3archLayerBuilder.build_layer(
+        ruby_version: ruby_version,
+        architecture: architecture,
+        output_file: output_file,
+        s3arch_version: s3arch_version
+      )
     end
 
-    desc 'Build and publish the Lambda layer (set AWS_PROFILE, LAYER_NAME=stowzilla-sqlite3-ruby)'
+    desc 'Build and publish the Lambda layer (set AWS_PROFILE, LAYER_NAME=sqlite3-ruby)'
     task publish: :build do
-      layer_name   = ENV.fetch('LAYER_NAME', 'stowzilla-sqlite3-ruby')
+      layer_name   = ENV.fetch('LAYER_NAME', 'sqlite3-ruby')
       ruby_version = ENV.fetch('RUBY_VERSION', '3.4')
       architecture = ENV.fetch('ARCHITECTURE', 'x86_64')
       output_file  = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
@@ -127,7 +158,7 @@ namespace :s3arch do
     owner_id = args.owner_id || ENV.fetch('OWNER_ID', nil)
     abort '❌ Usage: rake s3arch:rebuild[OWNER_ID]' unless owner_id
 
-    S3arch.configure { |c| c.from_env! }
+    S3arch.configure(&:from_env!)
 
     puts "🔄 Rebuilding index for #{owner_id}..."
     S3arch::Indexer.new.rebuild(owner_id)

metadata

@@ -1,39 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: s3arch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Adam Dalton
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEdDCCAtygAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMQ4wDAYDVQQDDAVhZ2Vu
-  dDEZMBcGCgmSJomT8ixkARkWCXN0b3d6aWxsYTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTAeFw0yNjA2MDgxOTExNTlaFw0yNzA2MDgxOTExNTlaMEAxDjAMBgNVBAMMBWFn
-  ZW50MRkwFwYKCZImiZPyLGQBGRYJc3Rvd3ppbGxhMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAupBquKI/4WvXOgND
-  pXyqH2GllZs1wG4TWWdn/DoMg45UoCwD+AWEuGrIdInBCpPN8vEJNJWPoM/RrU+b
-  xRBZT4uUk00bnZRW2SYh5GJSqBoBR+rWc2DGkXyGfdRU2sQvkB0+is6ChgQ61WMM
-  33LE9+loBlVsZ6EVtrc18Uh2OW0mJpe0hN2nmBrxZqqOZigxC4DKRMFHvpRkxSb6
-  mD4kit1AcwX9NEWJsXxrPaetL/SB/VbXaEZX93XAvp6USaXvCWt4slkDS2mIvqtn
-  9DtGC43LFC7SDGbnsG9PVenQgVCi8UWFPUAab0PqZSlmi3Qlbhw8qTGPp5Cbv4vz
-  qjC2UGPOQigA/7lbbGRhCohMrjOVHMAQwkcgiIqtolUoYlnvPMIy+m3pdvgDv/PH
-  bsZGvXQ7i0458xsmp1vaKthZocVAR+GboHbuIiYPUnO45ccXUQ00x6365tTe7mZi
-  NvmUYdAGbQmVvFqyxF7IYA6sF74L2Lstu0knSfss557bAe1HAgMBAAGjeTB3MAkG
-  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSnxTL/lNBCeLqpeVIX6AUY
-  kel4zjAeBgNVHREEFzAVgRNhZ2VudEBzdG93emlsbGEuY29tMB4GA1UdEgQXMBWB
-  E2FnZW50QHN0b3d6aWxsYS5jb20wDQYJKoZIhvcNAQELBQADggGBACm9Fjit/UCv
-  FxlKqeiCTIG94cIx+QrWAOJSx9knKydwUec1u04D/DbfZjTn3C2Bj227QgxeUn+6
-  if3e2v7zAk1896hLmGYzML0+nxQPb0vmtdLR7HETUlSKTVabcv1fbwLyjsuGrBvk
-  y51vOEzUEZ508a9yepLYqrQu1kOju4d57c9oA5l3H0mMKWz7av9tFj0B+STvuaWk
-  HRYDWc5HgOEVTyV+w0uFt2Kw4OCb8C42uSvC5RfYYtw78MSP+5Ru+LXJ7XOtmuN0
-  E6GVmofQ17ig9O3rgfFbMendSInrRmvPIGswvM1yivq9NOllFbdck2OJKPx6FCJF
-  7SJIkXQfc9P4B5iASIV1d1FsE0YX+g3jHXPJK/4mGL5bAyBKzpMfQB/mg6vQBzkh
-  aOKPwcreFj7TznBl89R5tNS9wZQfPVR98zgPyocddWhK18eQNMSBUnv4eeJ8PPbk
-  DovL+G8ajHDZ9fjH/+GVYHEMuiVdLarXrKJpHC1VfGTTUAp4NSEpUQ==
-  -----END CERTIFICATE-----
+cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -117,9 +90,8 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- certs/stowzilla.pem
-- infrastructure/routes.tf.rb
-- infrastructure/schema.tf.rb
+- config/contracts.rb
+- config/routes.rb
 - lambda/controllers/s3arch_controller.rb
 - lambda/models/search_version.rb
 - lib/s3arch.rb

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-j��YC�����㯬`�Q����[��M~��Ҫ�q\Tr���Ih/4Z
�]~�Қ�p�X�|;s��B��nP����R���
�X��Ꙁ�V -S6Ev�X�!ͦo���W9Y6�H$�04�6q[�4�E�P�(��HÊ���+$��[	��L�~��!T~��A���
-N����ʽ˛[�O�C�k����*���Q��

data/certs/stowzilla.pem

@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEdDCCAtygAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMQ4wDAYDVQQDDAVhZ2Vu
-dDEZMBcGCgmSJomT8ixkARkWCXN0b3d6aWxsYTETMBEGCgmSJomT8ixkARkWA2Nv
-bTAeFw0yNjA2MDgxOTExNTlaFw0yNzA2MDgxOTExNTlaMEAxDjAMBgNVBAMMBWFn
-ZW50MRkwFwYKCZImiZPyLGQBGRYJc3Rvd3ppbGxhMRMwEQYKCZImiZPyLGQBGRYD
-Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAupBquKI/4WvXOgND
-pXyqH2GllZs1wG4TWWdn/DoMg45UoCwD+AWEuGrIdInBCpPN8vEJNJWPoM/RrU+b
-xRBZT4uUk00bnZRW2SYh5GJSqBoBR+rWc2DGkXyGfdRU2sQvkB0+is6ChgQ61WMM
-33LE9+loBlVsZ6EVtrc18Uh2OW0mJpe0hN2nmBrxZqqOZigxC4DKRMFHvpRkxSb6
-mD4kit1AcwX9NEWJsXxrPaetL/SB/VbXaEZX93XAvp6USaXvCWt4slkDS2mIvqtn
-9DtGC43LFC7SDGbnsG9PVenQgVCi8UWFPUAab0PqZSlmi3Qlbhw8qTGPp5Cbv4vz
-qjC2UGPOQigA/7lbbGRhCohMrjOVHMAQwkcgiIqtolUoYlnvPMIy+m3pdvgDv/PH
-bsZGvXQ7i0458xsmp1vaKthZocVAR+GboHbuIiYPUnO45ccXUQ00x6365tTe7mZi
-NvmUYdAGbQmVvFqyxF7IYA6sF74L2Lstu0knSfss557bAe1HAgMBAAGjeTB3MAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSnxTL/lNBCeLqpeVIX6AUY
-kel4zjAeBgNVHREEFzAVgRNhZ2VudEBzdG93emlsbGEuY29tMB4GA1UdEgQXMBWB
-E2FnZW50QHN0b3d6aWxsYS5jb20wDQYJKoZIhvcNAQELBQADggGBACm9Fjit/UCv
-FxlKqeiCTIG94cIx+QrWAOJSx9knKydwUec1u04D/DbfZjTn3C2Bj227QgxeUn+6
-if3e2v7zAk1896hLmGYzML0+nxQPb0vmtdLR7HETUlSKTVabcv1fbwLyjsuGrBvk
-y51vOEzUEZ508a9yepLYqrQu1kOju4d57c9oA5l3H0mMKWz7av9tFj0B+STvuaWk
-HRYDWc5HgOEVTyV+w0uFt2Kw4OCb8C42uSvC5RfYYtw78MSP+5Ru+LXJ7XOtmuN0
-E6GVmofQ17ig9O3rgfFbMendSInrRmvPIGswvM1yivq9NOllFbdck2OJKPx6FCJF
-7SJIkXQfc9P4B5iASIV1d1FsE0YX+g3jHXPJK/4mGL5bAyBKzpMfQB/mg6vQBzkh
-aOKPwcreFj7TznBl89R5tNS9wZQfPVR98zgPyocddWhK18eQNMSBUnv4eeJ8PPbk
-DovL+G8ajHDZ9fjH/+GVYHEMuiVdLarXrKJpHC1VfGTTUAp4NSEpUQ==
------END CERTIFICATE-----