initial work

Author: timothysmith0609

app/controllers/shipit/rollbacks_controller.rb

@@ -27,7 +27,7 @@ def load_deploy
     end
 
     def rollback_params
-      params.require(:rollback).permit(:parent_id, env: @stack.deploy_variables.map(&:name))
+      params.require(:rollback).permit(:parent_id, env: @stack.rollback_variables.map(&:name))
     end
   end
 end

app/models/shipit/deploy_spec.rb

@@ -139,6 +139,15 @@ def rollback_steps!
       rollback_steps || cant_detect!(:rollback)
     end
 
+    def rollback_variables
+      if config.dig('rollback', 'variables').present?
+        Array.wrap(config('rollback', 'variables')).map(&VariableDefinition.method(:new))
+      else
+        # For backwards compatibility, fallback to using deploy_variables if no explicit rollback variables are set
+        deploy_variables
+      end
+    end
+
     def retries_on_rollback
       config('rollback', 'retries') { nil }
     end
@@ -166,6 +175,10 @@ def filter_deploy_envs(env)
       EnvironmentVariables.with(env).permit(deploy_variables)
     end
 
+    def filter_rollback_envs(env)
+      EnvironmentVariables.with(env).permit(rollback_variables)
+    end
+
     def review_checklist
       (config('review', 'checklist') || discover_review_checklist || []).map(&:strip).select(&:present?)
     end

app/models/shipit/deploy_spec/file_system.rb

@@ -78,7 +78,8 @@ def cacheable_config
           },
           'rollback' => {
             'override' => rollback_steps,
-            'retries' => retries_on_rollback
+            'retries' => retries_on_rollback,
+            'variables' => rollback_variables.map(&:to_h)
           },
           'fetch' => fetch_deployed_revision_steps,
           'tasks' => cacheable_tasks

app/models/shipit/rollback.rb

@@ -38,6 +38,10 @@ def report_complete!
       complete!
     end
 
+    def variables
+      stack.rollback_variables
+    end
+
     private
 
     def update_release_status

app/models/shipit/stack.rb

@@ -519,7 +519,7 @@ def self.from_param!(param)
     end
 
     delegate :plugins, :task_definitions, :hidden_statuses, :required_statuses, :soft_failing_statuses,
-             :blocking_statuses, :deploy_variables, :filter_task_envs, :filter_deploy_envs,
+             :blocking_statuses, :deploy_variables, :rollback_variables, :filter_task_envs, :filter_deploy_envs,
              :maximum_commits_per_deploy, :pause_between_deploys, :retries_on_deploy, :retries_on_rollback,
              to: :cached_deploy_spec