belt 0.3.31 → 0.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3545e62c7890adc16931218212e284d8e68994814be13ae0e231d5aee89b2ec
-  data.tar.gz: 89b19c24b919d441bffbbb8cd426697e656b8726596c24c58cf5f03d79233c81
+  metadata.gz: efadc9dd5984c98b474ea0bda5f91617ccb9ad7077582086098d913d1190fb79
+  data.tar.gz: 8335192999b2f888a518e3bb542c04e0b23364523ecc788f8e6eda7b4281e136
 SHA512:
-  metadata.gz: 7df1d7c18c7208d54cb0e37cbea0cf6c998f9b502950651c7e3e304f2786c3a750d664894d5f7f09cbc8848b550f365d7ebe415a5bcb701da45ef115fb7d28bb
-  data.tar.gz: '05380ceae6d72a8874e66f52f616b527baa69f7101513842a6240765d2b1b6644bcd7b6d469acffeab246d18a152eabfb618a52c74753f5e61fd8cbbb663143a'
+  metadata.gz: f7ae2d5e4669eea772061e523bae6422388e356cbe1ecdf86f7d284b034549ac1127a239ac85cb8b3cf1babab27c0232ec61bcfc18dcac8ff54b2b03cb263435
+  data.tar.gz: 190079da2ca430955096baa50ea281da2feaee87e6ae24211aab5c26b559eea6f1d1f45d9c9dc627d7ebf5d28418681c13d0398ef744a970580cfe8441368f3b

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.3.32
+
+### Enhancement
+
+- **`belt destroy environment --full` for fully non-interactive teardown**: Added
+  a `--full` / `-y` flag that tears an environment down with zero prompts —
+  intended for CI pipelines and agents that spin up ephemeral per-PR
+  environments and destroy them on merge. Unlike `--force` (which skips
+  terraform and only removes local files), `--full` **always runs
+  `terraform destroy`** when terraform state is present, then deletes the local
+  `infrastructure/<env>/` files. It also auto-continues past the nested-children
+  warning. When no terraform state exists there is nothing to tear down, so the
+  destroy step is skipped and only the files are removed.
+
+  ```bash
+  belt destroy environment pr-1234 --full
+  ```
+
 ## 0.3.31
 
 ### Bug Fix

data/lib/belt/cli/destroy_command.rb

@@ -47,7 +47,7 @@ module Belt
         when 'environment'
           name = args.shift
           if name.nil? || name.empty?
-            puts 'Usage: belt destroy environment <name> [--force] [--skip-terraform]'
+            puts 'Usage: belt destroy environment <name> [--full] [--force] [--skip-terraform]'
             exit 1
           end
           flags = parse_environment_flags(args)
@@ -79,13 +79,15 @@ module Belt
       end
 
       def self.parse_environment_flags(args)
-        flags = { force: false, skip_terraform: false }
+        flags = { force: false, skip_terraform: false, full: false }
         args.each do |arg|
           case arg
           when '--force', '-f'
             flags[:force] = true
           when '--skip-terraform'
             flags[:skip_terraform] = true
+          when '--full', '-y'
+            flags[:full] = true
           end
         end
         flags
@@ -114,7 +116,12 @@ module Belt
             views         Remove React pages for a resource
 
           Environment options:
-            --force, -f          Skip all prompts (CI mode)
+            --full, -y           Non-interactive teardown: ALWAYS run terraform
+                                 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)
             --skip-terraform     Delete local files without running terraform destroy
 
           Examples:
@@ -124,6 +131,7 @@ module Belt
             belt d environment staging
             belt d environment dev --skip-terraform
             belt d environment dev --force
+            belt d environment pr-1234 --full    # full non-interactive teardown
             belt d frontend
             belt d frontend --frontend ops
             belt d views post
@@ -133,16 +141,18 @@ module Belt
 
           For environments: if terraform state is detected, you'll be prompted to run
           `terraform destroy` first to tear down cloud resources before removing files.
+          Pass --full to run the whole teardown non-interactively (destroy + delete).
         HELP
       end
 
       # -- keyword options for destroy flags
-      def initialize(generator, name, fields, force: false, skip_terraform: false, frontend_name: nil)
+      def initialize(generator, name, fields, force: false, skip_terraform: false, full: false, frontend_name: nil)
         @generator = generator
         @name = name&.downcase&.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
         @force = force
         @skip_terraform = skip_terraform
+        @full = full
         @frontend_name = frontend_name
         @app_name = detect_namespace
         @singular_name = @name ? Belt::Inflector.singularize(@name) : nil
@@ -205,7 +215,7 @@ module Belt
           puts '   Consider destroying nested environments first:'
           nested_children.each { |child| puts "     belt destroy environment #{child}" }
           puts ''
-          unless @force
+          unless @force || @full
             print '   Continue anyway? [y/N] '
             response = $stdin.gets&.strip&.downcase
             unless response&.start_with?('y')
@@ -227,7 +237,12 @@ module Belt
           puts "⚠  Environment '#{@name}' appears to have active infrastructure."
           puts "   Terraform state was found — resources may still be running.\n\n"
 
-          if @force
+          if @full
+            # Fully non-interactive teardown (CI / agents): always run terraform
+            # destroy, then delete files. This is the flag to reach for when an
+            # automated workflow spins an environment up and tears it down.
+            run_terraform_destroy(dir)
+          elsif @force
             puts '   --force passed, skipping terraform destroy.'
           else
             puts '   Options:'
@@ -251,7 +266,7 @@ module Belt
         end
 
         # Final confirmation before deleting files
-        unless @force
+        unless @force || @full
           print "\nPermanently delete #{dir}/? [y/N] "
           response = $stdin.gets&.strip&.downcase
           unless response&.start_with?('y')
@@ -260,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}/"
@@ -388,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/docs/generators.md

@@ -106,6 +106,34 @@ belt destroy frontend --frontend ops
 belt destroy views post
 ```
 
+### Non-interactive environment teardown
+
+`belt destroy environment` is interactive by default: it prompts before running
+`terraform destroy` and again before deleting local files. For CI pipelines and
+agents that spin up ephemeral per-PR environments and tear them down on merge,
+use `--full`:
+
+```bash
+belt destroy environment pr-1234 --full
+```
+
+`--full` (alias `-y`) runs the whole teardown with zero prompts: it **always runs
+`terraform destroy`** (when terraform state is present), then deletes the local
+`infrastructure/<env>/` files.
+
+Flag comparison:
+
+| Flag | terraform destroy | Deletes local files | Prompts |
+|------|-------------------|---------------------|---------|
+| _(none)_ | Prompted | Prompted | Yes |
+| `--full` / `-y` | Always (if state exists) | Yes | No |
+| `--force` / `-f` | **Skipped** (leaves cloud resources) | Yes | No |
+| `--skip-terraform` | Never | Yes | Final delete only |
+
+> `--force` is for the "just clean up my local files" case — it intentionally
+> leaves cloud infrastructure running. Reach for `--full` when you want the
+> environment fully gone.
+
 ## Plugin Generators
 
 Gems that follow the Belt plugin contract are auto-discovered:

data/lib/belt/version.rb

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

metadata

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