Remove unused imports and fix name shadowing warnings in tests

- Remove redundant imports only used for instances
- Fix name shadowing by renaming local spec variables to parsed/providerSpec
- Remove unused emptySchema helper function
- All tests pass with 136 examples, 0 failures, 1 pending

Author: typedrat

test/TerranixCodegen/FileOrganizerSpec.hs

@@ -1,23 +1,16 @@
 module TerranixCodegen.FileOrganizerSpec (spec) where
 
 import Data.Map.Strict qualified as Map
-import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Text.IO qualified as TIO
 import Nix.TH (nix)
-import System.Directory (createDirectoryIfMissing, doesDirectoryExist, doesFileExist, listDirectory, removeDirectoryRecursive)
+import System.Directory (createDirectoryIfMissing, doesDirectoryExist, doesFileExist)
 import System.FilePath ((</>))
 import System.IO.Temp (withSystemTempDirectory)
 import Test.Hspec
 
 import TerranixCodegen.FileOrganizer
 import TerranixCodegen.ProviderSchema
-import TerranixCodegen.ProviderSchema.Attribute
-import TerranixCodegen.ProviderSchema.Block
-import TerranixCodegen.ProviderSchema.CtyType
-import TerranixCodegen.ProviderSchema.Provider
-import TerranixCodegen.ProviderSchema.Schema
-import TestUtils (shouldMapTo)
 
 -- | Helper to create an empty SchemaAttribute
 emptyAttr :: SchemaAttribute
@@ -46,14 +39,6 @@ emptyBlock =
     , blockDeprecated = Nothing
     }
 
--- | Helper to create an empty Schema
-emptySchema :: Schema
-emptySchema =
-  Schema
-    { schemaVersion = 0
-    , schemaBlock = Nothing
-    }
-
 -- | Helper to create a simple schema with one attribute
 simpleSchema :: Schema
 simpleSchema =

test/TerranixCodegen/ProviderSpecSpec.hs

@@ -6,9 +6,8 @@ import Data.ByteString.Lazy.Char8 qualified as BL
 import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Versions (Versioning, versioning)
-import Test.Hspec
-import Text.Megaparsec (parse)
 import TerranixCodegen.ProviderSpec
+import Test.Hspec
 
 spec :: Spec
 spec = do
@@ -205,47 +204,47 @@ spec = do
       let original = "hashicorp/aws:5.0.0"
       case parseProviderSpec original of
         Left err -> expectationFailure $ "Parse failed: " <> err
-        Right spec -> formatProviderSpec spec `shouldBe` T.pack original
+        Right parsed -> formatProviderSpec parsed `shouldBe` T.pack original
 
     it "round-trips: parse then format equals original (name only)" $ do
       let original = "aws"
       case parseProviderSpec original of
         Left err -> expectationFailure $ "Parse failed: " <> err
-        Right spec -> formatProviderSpec spec `shouldBe` T.pack original
+        Right parsed -> formatProviderSpec parsed `shouldBe` T.pack original
 
     it "round-trips: parse then format equals original (namespace, no version)" $ do
       let original = "hashicorp/aws"
       case parseProviderSpec original of
         Left err -> expectationFailure $ "Parse failed: " <> err
-        Right spec -> formatProviderSpec spec `shouldBe` T.pack original
+        Right parsed -> formatProviderSpec parsed `shouldBe` T.pack original
 
   describe "JSON serialization" $ do
     it "round-trips ToJSON/FromJSON with all fields" $ do
-      let spec =
+      let providerSpec =
             ProviderSpec
               { providerNamespace = Just "hashicorp"
               , providerName = "aws"
               , providerVersion = mkVersion "5.0.0"
               }
-      decode (encode spec) `shouldBe` Just spec
+      decode (encode providerSpec) `shouldBe` Just providerSpec
 
     it "round-trips ToJSON/FromJSON without namespace" $ do
-      let spec =
+      let providerSpec =
             ProviderSpec
               { providerNamespace = Nothing
               , providerName = "aws"
               , providerVersion = mkVersion "5.0.0"
               }
-      decode (encode spec) `shouldBe` Just spec
+      decode (encode providerSpec) `shouldBe` Just providerSpec
 
     it "round-trips ToJSON/FromJSON without version" $ do
-      let spec =
+      let providerSpec =
             ProviderSpec
               { providerNamespace = Just "hashicorp"
               , providerName = "aws"
               , providerVersion = Nothing
               }
-      decode (encode spec) `shouldBe` Just spec
+      decode (encode providerSpec) `shouldBe` Just providerSpec
 
     it "parses valid JSON string" $ do
       let json = "\"hashicorp/aws:5.0.0\""
@@ -263,13 +262,13 @@ spec = do
       (decode json :: Maybe ProviderSpec) `shouldBe` Nothing
 
     it "serializes to formatted string" $ do
-      let spec =
+      let providerSpec =
             ProviderSpec
               { providerNamespace = Just "hashicorp"
               , providerName = "aws"
               , providerVersion = mkVersion "5.0.0"
               }
-      encode spec `shouldBe` "\"hashicorp/aws:5.0.0\""
+      encode providerSpec `shouldBe` "\"hashicorp/aws:5.0.0\""
 
 -- Helper functions
 

test/TerranixCodegen/TerraformGeneratorSpec.hs

@@ -5,14 +5,11 @@ import Control.Exception (SomeException, catch)
 import Control.Monad (when)
 import Control.Monad.Except (runExceptT)
 import Control.Monad.Reader (runReaderT)
-import Data.Aeson (eitherDecode)
-import Data.ByteString.Lazy qualified as BL
 import Data.Map.Strict qualified as Map
-import Data.Maybe (fromMaybe, isJust)
+import Data.Maybe (isJust)
 import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Versions (Versioning, versioning)
-import System.Directory (doesPathExist, listDirectory)
 import System.Exit (ExitCode (..))
 import System.IO.Temp (withSystemTempDirectory)
 import System.Process (readProcessWithExitCode)