belt 0.3.30 → 0.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ffa332a2eb6408d42c4652d1643009edac470adb6eabbcb9e6818286276977
-  data.tar.gz: 145edae1f0f725c16232a648d64ad3224ac93baca18273648b901e7d4ef6ad66
+  metadata.gz: d6661697f19873dc93fa45b49d27d6665e370d771b947a6ea5539fb33a0970c9
+  data.tar.gz: ad996f0d38638b90ae2ebb1c8c761487b9bc4939fe3dba009dbed4f8ea4a6b4d
 SHA512:
-  metadata.gz: '09e7a47ed0e3d34e699cbd2e1c14785399015ea66cde8b21dfd194e86d09456df246da0363e0bc0e543ad06129938376c148e87edc6885b0b6c9d94645ffdcd3'
-  data.tar.gz: 16ec119be87259081c896497229cf3202901c3657ac4aea2f3e47e05ff3976d7130e23a99dcdf1c85b80f8d386243878e0acccd4bc9cb721b0ca8d8e189e4122
+  metadata.gz: 5eda51e4ed021da4d55135db7d5945c8370bbd6ae2d378e760aab837cdd353fc70dd34f2ae18c35dca6bd5d57eb8222bc0646b017a2199bdd01c747c94d6c6ee
+  data.tar.gz: 0e3e599b0972fb45145735ff8d390ff23bca425521c1fdaba2c5758071017b1857aad884a57fcf124a39bdba2f66845ca85b8890f21d9b5e0f3bf2ab9ae6e1be

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # 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
+
+- **`belt destroy environment` now uses the environment's AWS profile**: The
+  terraform destroy path (and remote-state detection) previously inherited
+  whatever `AWS_PROFILE` was in the shell, which could point at the wrong
+  account and fail with "No valid credential sources found". It now loads
+  `infrastructure/<env>/belt.rb` and applies the configured `aws_profile` and
+  env vars before running terraform — matching `belt deploy` and
+  `belt terraform`.
+
 ## 0.3.16
 
 ### Enhancement

data/lib/belt/cli/destroy_command.rb

@@ -6,6 +6,7 @@ require_relative 'auth_command'
 require_relative 'frontend_registry'
 require_relative 'generator_registry'
 require_relative 'tables_command'
+require_relative 'environment_config'
 require_relative '../inflector'
 
 module Belt
@@ -46,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)
@@ -78,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
@@ -113,7 +116,11 @@ 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, 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:
@@ -123,6 +130,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
@@ -132,16 +140,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
@@ -204,7 +214,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')
@@ -214,12 +224,24 @@ module Belt
           end
         end
 
+        # Apply the environment's AWS profile + env vars from infrastructure/<env>/belt.rb
+        # BEFORE any terraform/aws calls, so both remote-state detection and the
+        # subsequent destroy authenticate against the correct account. Without this,
+        # terraform inherits whatever AWS_PROFILE is in the shell, which may point at
+        # the wrong account (mirrors `belt deploy` / `belt terraform`).
+        apply_env_config! unless @skip_terraform
+
         # Check if terraform state exists (infra may still be live)
         if !@skip_terraform && terraform_state_exists?(dir)
           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:'
@@ -243,7 +265,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')
@@ -380,6 +402,15 @@ module Belt
         puts '  ✓ Infrastructure destroyed.'
       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.
+      def apply_env_config!
+        env_config = EnvironmentConfig.load(@name)
+        env_config.apply!
+        puts "  🔑 Using AWS profile: #{env_config.aws_profile}" if env_config.aws_profile?
+      end
+
       def empty_s3_buckets_in_state
         output = `terraform state list 2>/dev/null`
         return unless Process.last_status.success?

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.30'
+  VERSION = '0.3.32'
 end

metadata

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