Apply terraform format changes when version 12 in use

manheim · Sep 13, 2020 · ec7a105 · ec7a105
1 parent 8fdcb28
commit ec7a105
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/src/TerraformFormatCommand.groovy b/src/TerraformFormatCommand.groovy
@@ -1,4 +1,6 @@
 class TerraformFormatCommand {
+    private static globalPlugins = []
+    private appliedPlugins = []
     private static boolean check = false
     private static boolean recursive = false
     private static boolean diff = false
@@ -8,6 +10,8 @@ class TerraformFormatCommand {
     private Closure diffOptionPattern
 
     public String toString() {
+        applyPluginsOnce()
+
         def pattern
         def parts = []
         parts << 'terraform fmt'
@@ -25,6 +29,19 @@ class TerraformFormatCommand {
         return parts.join(' ')
     }
 
+    public static addPlugin(TerraformFormatCommandPlugin plugin) {
+        this.globalPlugins << plugin
+    }
+
+    private applyPluginsOnce() {
+        def remainingPlugins = globalPlugins - appliedPlugins
+
+        for (TerraformValidateCommandPlugin plugin in remainingPlugins) {
+            plugin.apply(this)
+            appliedPlugins << plugin
+        }
+    }
+
     public static withCheck(newValue = true) {
         check = newValue
         return this

diff --git a/src/TerraformPlugin.groovy b/src/TerraformPlugin.groovy
@@ -10,6 +10,7 @@
  * before strating on your own.
  */
 class TerraformPlugin implements TerraformValidateCommandPlugin,
+                                 TerraformFormatCommandPlugin,
                                  TerraformPlanCommandPlugin,
                                  TerraformApplyCommandPlugin,
                                  TerraformValidateStagePlugin {
@@ -22,6 +23,7 @@ class TerraformPlugin implements TerraformValidateCommandPlugin,
         def plugin = new TerraformPlugin()
 
         TerraformValidateCommand.addPlugin(plugin)
+        TerraformFormatCommand.addPlugin(plugin)
         TerraformPlanCommand.addPlugin(plugin)
         TerraformApplyCommand.addPlugin(plugin)
         TerraformValidateStage.addPlugin(plugin)
@@ -100,6 +102,11 @@ class TerraformPlugin implements TerraformValidateCommandPlugin,
         applyToCommand(command)
     }
 
+    @Override
+    void apply(TerraformFormatCommand command) {
+        applyToCommand(command)
+    }
+
     @Override
     void apply(TerraformPlanCommand command) {
         applyToCommand(command)

diff --git a/test/TerraformPluginTest.groovy b/test/TerraformPluginTest.groovy
@@ -207,6 +207,21 @@ class TerraformPluginTest {
         }
     }
 
+    class ApplyTerraformFormatCommand {
+        @Test
+        void shouldApplyTheCorrectStrategyToTerraformFormatCommand() {
+            def formatCommand = mock(TerraformFormatCommand.class)
+            def strategy = mock(TerraformPluginVersion.class)
+            def plugin = spy(new TerraformPlugin())
+            doReturn('someVersion').when(plugin).detectVersion()
+            doReturn(strategy).when(plugin).strategyFor('someVersion')
+
+            plugin.apply(formatCommand)
+
+            verify(strategy, times(1)).apply(formatCommand)
+        }
+    }
+
     class ApplyTerraformPlanCommand {
         @Test
         void shouldApplyTheCorrectStrategyToTerraformPlanCommand() {