belt 0.3.32 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6661697f19873dc93fa45b49d27d6665e370d771b947a6ea5539fb33a0970c9
-  data.tar.gz: ad996f0d38638b90ae2ebb1c8c761487b9bc4939fe3dba009dbed4f8ea4a6b4d
+  metadata.gz: 01f5648c9621e3feace4ceafc8f6683575c9f52a17ec59c60c2eb1f9202f3f65
+  data.tar.gz: 86a781e22c010419b21f09d00115db32ad9c13f40bf5be02a391ae146fd70ec6
 SHA512:
-  metadata.gz: 5eda51e4ed021da4d55135db7d5945c8370bbd6ae2d378e760aab837cdd353fc70dd34f2ae18c35dca6bd5d57eb8222bc0646b017a2199bdd01c747c94d6c6ee
-  data.tar.gz: 0e3e599b0972fb45145735ff8d390ff23bca425521c1fdaba2c5758071017b1857aad884a57fcf124a39bdba2f66845ca85b8890f21d9b5e0f3bf2ab9ae6e1be
+  metadata.gz: 6f3aca3d970a65d95fc9028b9eb7bb8117043e7c00fffaf481fbe3bf80d4a603c501f6321e438934c6cc8622e897c84034657fb01f6cc9c8ac2c3ae9b7604404
+  data.tar.gz: 50f18ff13e6cb0767a57bc7af4b1963de6bd4681fdd2030db8e5ed34872bc031bf4761bf23065a27e7115bb6f405ece4c0078a30dd86ba17b077cb3b0d6eb8cd

data/lib/belt/cli/destroy_command.rb

@@ -117,7 +117,8 @@ module Belt
 
           Environment options:
             --full, -y           Non-interactive teardown: ALWAYS run terraform
-                                 destroy, then delete local files, no prompts
+                                 destroy, then delete local files AND purge the
+                                 remote terraform state from S3, no prompts
                                  (use this for CI / agents tearing down ephemeral envs)
             --force, -f          Skip all prompts but SKIP terraform destroy —
                                  only deletes local files (leaves cloud resources)
@@ -274,6 +275,9 @@ module Belt
           end
         end
 
+        # Purge remote state from S3 when --full is used (complete ephemeral cleanup)
+        purge_terraform_state(dir) if @full
+
         FileUtils.rm_rf(dir)
         @removed << dir
         puts "  remove  #{dir}/"
@@ -402,6 +406,50 @@ module Belt
         puts '  ✓ Infrastructure destroyed.'
       end
 
+      # Purge the terraform state file from S3 after a full destroy.
+      # This leaves zero trace of ephemeral environments in the state bucket.
+      def purge_terraform_state(dir)
+        backend_file = File.join(dir, 'backend.tf')
+        return unless File.exist?(backend_file)
+
+        content = File.read(backend_file)
+
+        # Extract bucket and key from backend config
+        bucket_match = content.match(/bucket\s*=\s*"([^"]+)"/)
+        key_match = content.match(/key\s*=\s*"([^"]+)"/)
+
+        return unless bucket_match && key_match
+
+        bucket = bucket_match[1]
+        key = key_match[1]
+
+        puts '  Purging terraform state from S3...'
+
+        # Delete the state file
+        result = `aws s3 rm "s3://#{bucket}/#{key}" 2>&1`
+        if Process.last_status.success?
+          puts "    ✓ Deleted s3://#{bucket}/#{key}"
+        else
+          puts "    ⚠ Could not delete state file: #{result.strip}" unless result.include?('delete: s3://')
+        end
+
+        # Also try to delete the state lock file if it exists (DynamoDB-based locking
+        # uses a separate mechanism, but some setups have .tflock files)
+        lock_key = key.sub(/\.tfstate$/, '.tfstate.lock')
+        `aws s3 rm "s3://#{bucket}/#{lock_key}" 2>/dev/null`
+
+        # Try to clean up the environment's directory in the bucket if empty
+        # (e.g., if the key is "myapp/fizzy123/terraform.tfstate", try to remove the "fizzy123" prefix)
+        env_prefix = key.sub(%r{/[^/]+$}, '')
+        return unless env_prefix != key
+
+        # List remaining objects under this prefix
+        remaining = `aws s3 ls "s3://#{bucket}/#{env_prefix}/" 2>/dev/null`
+        return unless Process.last_status.success? && remaining.strip.empty?
+
+        puts "    ✓ State directory s3://#{bucket}/#{env_prefix}/ is now empty"
+      end
+
       # Load infrastructure/<env>/belt.rb and apply its aws_profile + env vars to
       # the current process so terraform (and any aws CLI calls during destroy)
       # authenticate against the right account. Mirrors DeployCommand / TerraformCommand.

data/lib/belt/cli/dns_command.rb

@@ -167,12 +167,15 @@ module Belt
 
           if auto
             run_terraform('apply', env_config, 'tfplan')
+            cleanup_plan
           else
             print "\nApply this plan? [y/N] "
             answer = $stdin.gets&.strip&.downcase
             if %w[y yes].include?(answer)
               run_terraform('apply', env_config, 'tfplan')
+              cleanup_plan
             else
+              cleanup_plan
               puts 'Aborted.'
               exit 1
             end
@@ -180,6 +183,10 @@ module Belt
         end
       end
 
+      def cleanup_plan
+        FileUtils.rm_f('tfplan')
+      end
+
       # --- Add Environment ---
       def add_environment(args)
         env_name = args.shift

data/lib/belt/version.rb

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

metadata

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