belt 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abed8bb1f75407be5e61c3725a880c52096ecbd62285910afcc640bff6be277d
-  data.tar.gz: cdb9b586a8ce7cdc9e6f41bc39cc77b80c5155e2bb8a19d5390e65bf5a86b70f
+  metadata.gz: 20fce17142b2c69d75437a4c0a1c74f430674a5d68d1ca8e5e26a2f29a801d04
+  data.tar.gz: 4238c56a47ec43f5816f3abf1a8d5a85457a0216fa59940d42a773bdb13e8965
 SHA512:
-  metadata.gz: b34e9c0a0edfc2c8df99876af80e2f6bbf7848a5e63c842c4d7f39262165089c8b6a69182981e629b6f936859dbf062c5ab5d0d65ed0221f156e1aead3d26b44
-  data.tar.gz: 53c37765c40fac45c9770bdee1ae337f3a9f928656ece072b7c907da84b535e2c460ff0bfd824d106935e02792c3234cc60470738151556b2d247afa7fb5f731
+  metadata.gz: aacc4008ae9096011385a7cebf597a1a96b68cdaa14ca3119e659fcbdac06b095cdb946116463d75885acefe84ecca0dd3ae7c60390462c5631701f5577c70e9
+  data.tar.gz: 917bbc217bc7573bc37a45990867dafff8ba91e3a6b3788b98b6ff2db7e6543e09a20ac9bb8209cdbb97fc80241ba74ce5c53f4d1dcc2cb3c22eb6652a89f3a4

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 
-## Unreleased
+## 0.3.8
+
+### Bug Fix
+
+- **S3 bucket naming with underscored app names**: The module template now sanitizes
+  `var.app_name` for S3 bucket names by replacing underscores with hyphens. Apps named
+  with underscores (e.g. `feature_parity`) previously generated invalid bucket names
+  since S3 follows DNS naming rules which prohibit underscores.
+
+## 0.3.7
+
+### Bug Fix
+
+- **App name detection in worktrees**: `detect_app_name` now checks
+  `infrastructure/*/variables.tf` for `variable "app_name" { default = "..." }`
+  before falling back to the directory name. Fixes incorrect Lambda function
+  lookups (e.g. `belt logs`) when running from a git worktree whose directory
+  name doesn't match the actual app name.
 
 ## 0.3.6
 

data/lib/belt/cli/app_detection.rb

@@ -17,7 +17,7 @@ module Belt
       end
 
       # Detects the application name.
-      # Prefers terraform.tfvars app_name, then falls back to directory name.
+      # Priority: terraform.tfvars app_name > variables.tf default > directory name.
       def detect_app_name
         # Check any environment tfvars for the app_name
         Dir.glob('infrastructure/*/terraform.tfvars').each do |f|
@@ -26,6 +26,10 @@ module Belt
           return match[1] if match
         end
 
+        # Check variables.tf for a default app_name value
+        name = detect_app_name_from_variables_tf
+        return name if name
+
         # Fall back to directory name
         File.basename(Dir.pwd)
       end
@@ -67,6 +71,27 @@ module Belt
       def find_schema_file_path
         find_contracts_file_path
       end
+
+      private
+
+      # Parses `variable "app_name" { default = "..." }` from any environment's variables.tf.
+      # This handles the common pattern where app_name is a Terraform variable with a default
+      # rather than being set directly in terraform.tfvars.
+      def detect_app_name_from_variables_tf
+        Dir.glob('infrastructure/*/variables.tf').each do |f|
+          content = File.read(f)
+          # Match the app_name variable block and extract its default value
+          next unless content.match?(/variable\s+"app_name"/)
+
+          # Extract default from within the variable block
+          block_match = content.match(/variable\s+"app_name"\s*\{([^}]*)\}/m)
+          next unless block_match
+
+          default_match = block_match[1].match(/default\s*=\s*"([^"]+)"/)
+          return default_match[1] if default_match
+        end
+        nil
+      end
     end
   end
 end

data/lib/belt/cli/deploy_command.rb

@@ -321,6 +321,19 @@ module Belt
           return match[1] if match
         end
 
+        # Try variables.tf for a default app_name value
+        vars_file = File.join(@infra_dir, @env, 'variables.tf')
+        if File.exist?(vars_file)
+          content = File.read(vars_file)
+          if content.match?(/variable\s+"app_name"/)
+            block_match = content.match(/variable\s+"app_name"\s*\{([^}]*)\}/m)
+            if block_match
+              default_match = block_match[1].match(/default\s*=\s*"([^"]+)"/)
+              return default_match[1] if default_match
+            end
+          end
+        end
+
         # Fall back to directory name
         File.basename(@project_root)
       end

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.3.6'
+  VERSION = '0.3.8'
 end

data/lib/templates/module/dns.tf.erb

@@ -2,6 +2,10 @@
 # Convention: prod → mydomain.com, other envs → <env>.mydomain.com
 
 locals {
+  # S3 bucket names follow DNS rules — underscores are not allowed.
+  # App names often use underscores (Ruby conventions); replace for S3/resource naming.
+  s3_safe_name = replace(var.app_name, "_", "-")
+
   # Determine the domain for this environment
   app_domain = var.domain != "" ? (
     var.environment == "prod" ? var.domain : "${var.environment}.${var.domain}"

data/lib/templates/module/frontend.tf.erb

@@ -11,7 +11,7 @@ resource "random_string" "<%= @tf_name %>_suffix" {
 
 # S3 bucket for frontend static assets
 resource "aws_s3_bucket" "<%= @tf_name %>" {
-  bucket        = "${var.app_name}-<%= @bucket_slug %>-${var.environment}-${random_string.<%= @tf_name %>_suffix.result}"
+  bucket        = "${local.s3_safe_name}-<%= @bucket_slug %>-${var.environment}-${random_string.<%= @tf_name %>_suffix.result}"
   force_destroy = true
 
   lifecycle {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Stowzilla