belt 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abed8bb1f75407be5e61c3725a880c52096ecbd62285910afcc640bff6be277d
-  data.tar.gz: cdb9b586a8ce7cdc9e6f41bc39cc77b80c5155e2bb8a19d5390e65bf5a86b70f
+  metadata.gz: 0be7ca644efba0ca7b1e95b076bbae96873ced55d3251e5de235208169bbcce9
+  data.tar.gz: d5f0b277442b1b139fb48c306b4f2c0ca13ce30d6b35637a67749b549f6a7182
 SHA512:
-  metadata.gz: b34e9c0a0edfc2c8df99876af80e2f6bbf7848a5e63c842c4d7f39262165089c8b6a69182981e629b6f936859dbf062c5ab5d0d65ed0221f156e1aead3d26b44
-  data.tar.gz: 53c37765c40fac45c9770bdee1ae337f3a9f928656ece072b7c907da84b535e2c460ff0bfd824d106935e02792c3234cc60470738151556b2d247afa7fb5f731
+  metadata.gz: cac4e33287828876e5f248dcf3536f2e4709b2637481453e9d5015711b8a1de4bfc854edfc429060c7929a17f3ec46b17dc15127474ce9bd0312f064c23d77ee
+  data.tar.gz: eca9b584458ff63559fe3e4fad915be300628ec0659ae4e3d7d7cac66bba8d8d2e2eb9dd9010174f3d6bce6d7e688356e1325070f7aec0150e518348ab8be50d

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## Unreleased
+## 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.7'
 end

metadata

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