From 156b1615a24ddbccce8b623e169277116b92494c Mon Sep 17 00:00:00 2001
From: Pam Selle <204372+pselle@users.noreply.github.com>
Date: Thu, 18 Feb 2021 12:57:58 -0500
Subject: [PATCH] Remove 0.13upgrade test fixtures

---
 .../expected/main.tf                          |  5 ----
 .../expected/versions.tf                      | 18 -------------
 .../input/main.tf                             |  5 ----
 .../input/versions.tf                         |  7 -----
 .../expected/main.tf                          | 21 ---------------
 .../expected/versions.tf                      |  3 ---
 .../input/main.tf                             | 14 ----------
 .../expected/versions.tf                      | 13 ----------
 .../013upgrade-file-exists/input/versions.tf  |  2 --
 .../expected/main.tf                          |  1 -
 .../expected/versions.tf                      | 17 ------------
 .../input/main.tf                             |  1 -
 .../expected/main.tf                          |  6 -----
 .../expected/versions.tf                      | 14 ----------
 .../input/main.tf                             |  6 -----
 .../expected/bar-baz.tf                       |  2 --
 .../expected/foo.tf                           |  4 ---
 .../expected/versions.tf                      | 16 ------------
 .../input/bar-baz.tf                          |  2 --
 .../013upgrade-multiple-blocks/input/foo.tf   |  7 -----
 .../input/versions.tf                         | 12 ---------
 .../expected/main.tf                          |  4 ---
 .../expected/versions.tf                      | 17 ------------
 .../013upgrade-multiple-files/input/main.tf   |  9 -------
 .../input/versions.tf                         | 12 ---------
 .../013upgrade-no-providers/expected/main.tf  | 11 --------
 .../013upgrade-no-providers/input/main.tf     | 11 --------
 .../expected/main.tf                          | 23 ----------------
 .../expected/versions.tf                      |  3 ---
 .../input/main.tf                             | 20 --------------
 .../expected/main.tf                          | 26 -------------------
 .../expected/versions.tf                      |  3 ---
 .../input/main.tf                             | 10 -------
 .../expected/main.tf                          |  3 ---
 .../expected/versions.tf                      |  8 ------
 .../input/main.tf                             |  3 ---
 .../expected/main.tf                          |  3 ---
 .../expected/versions.tf                      |  8 ------
 .../input/main.tf                             |  3 ---
 .../expected/main.tf                          |  7 -----
 .../expected/versions.tf                      |  3 ---
 .../input/main.tf                             |  7 -----
 .../expected/bar_override.tf                  |  3 ---
 .../013upgrade-skipped-files/expected/main.tf | 19 --------------
 .../expected/variables.tf.json                | 12 ---------
 .../expected/versions.tf                      |  3 ---
 .../input/bar_override.tf                     |  3 ---
 .../013upgrade-skipped-files/input/main.tf    | 12 ---------
 .../input/variables.tf.json                   | 12 ---------
 .../expected-module/main.tf                   |  8 ------
 .../expected-module/module/main.tf            |  1 -
 .../expected-module/module/versions.tf        |  8 ------
 .../013upgrade-submodule/expected/main.tf     |  9 -------
 .../expected/module/main.tf                   |  1 -
 .../013upgrade-submodule/expected/versions.tf |  3 ---
 .../013upgrade-submodule/input/main.tf        |  8 ------
 .../013upgrade-submodule/input/module/main.tf |  1 -
 .../013upgrade-unsupported-version/main.tf    |  1 -
 .../versions.tf                               |  3 ---
 59 files changed, 477 deletions(-)
 delete mode 100644 command/testdata/013upgrade-existing-versions-tf/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-existing-versions-tf/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-existing-versions-tf/input/main.tf
 delete mode 100644 command/testdata/013upgrade-existing-versions-tf/input/versions.tf
 delete mode 100644 command/testdata/013upgrade-explicit-providers/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-explicit-providers/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-explicit-providers/input/main.tf
 delete mode 100644 command/testdata/013upgrade-file-exists/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-file-exists/input/versions.tf
 delete mode 100644 command/testdata/013upgrade-implicit-not-found/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-implicit-not-found/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-implicit-not-found/input/main.tf
 delete mode 100644 command/testdata/013upgrade-implicit-providers/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-implicit-providers/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-implicit-providers/input/main.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/expected/bar-baz.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/expected/foo.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/input/bar-baz.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/input/foo.tf
 delete mode 100644 command/testdata/013upgrade-multiple-blocks/input/versions.tf
 delete mode 100644 command/testdata/013upgrade-multiple-files/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-multiple-files/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-multiple-files/input/main.tf
 delete mode 100644 command/testdata/013upgrade-multiple-files/input/versions.tf
 delete mode 100644 command/testdata/013upgrade-no-providers/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-no-providers/input/main.tf
 delete mode 100644 command/testdata/013upgrade-preserves-comments/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-preserves-comments/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-preserves-comments/input/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-not-found/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-not-found/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-provider-not-found/input/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect-version-unavailable/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect-version-unavailable/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect-version-unavailable/input/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-provider-redirect/input/main.tf
 delete mode 100644 command/testdata/013upgrade-providers-with-source/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-providers-with-source/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-providers-with-source/input/main.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/expected/bar_override.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/expected/variables.tf.json
 delete mode 100644 command/testdata/013upgrade-skipped-files/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/input/bar_override.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/input/main.tf
 delete mode 100644 command/testdata/013upgrade-skipped-files/input/variables.tf.json
 delete mode 100644 command/testdata/013upgrade-submodule/expected-module/main.tf
 delete mode 100644 command/testdata/013upgrade-submodule/expected-module/module/main.tf
 delete mode 100644 command/testdata/013upgrade-submodule/expected-module/module/versions.tf
 delete mode 100644 command/testdata/013upgrade-submodule/expected/main.tf
 delete mode 100644 command/testdata/013upgrade-submodule/expected/module/main.tf
 delete mode 100644 command/testdata/013upgrade-submodule/expected/versions.tf
 delete mode 100644 command/testdata/013upgrade-submodule/input/main.tf
 delete mode 100644 command/testdata/013upgrade-submodule/input/module/main.tf
 delete mode 100644 command/testdata/013upgrade-unsupported-version/main.tf
 delete mode 100644 command/testdata/013upgrade-unsupported-version/versions.tf

diff --git a/command/testdata/013upgrade-existing-versions-tf/expected/main.tf b/command/testdata/013upgrade-existing-versions-tf/expected/main.tf
deleted file mode 100644
index 109e0699c..000000000
--- a/command/testdata/013upgrade-existing-versions-tf/expected/main.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-resource foo_resource b {}
-resource bar_resource c {}
-resource bar_resource ab {
-  provider = baz
-}
diff --git a/command/testdata/013upgrade-existing-versions-tf/expected/versions.tf b/command/testdata/013upgrade-existing-versions-tf/expected/versions.tf
deleted file mode 100644
index 22c14e5c2..000000000
--- a/command/testdata/013upgrade-existing-versions-tf/expected/versions.tf
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a file called versions.tf which does not originally have a
-# required_providers block. 
-resource foo_resource a {}
-
-terraform {
-  required_version = ">= 0.13"
-  required_providers {
-    bar = {
-      source = "hashicorp/bar"
-    }
-    baz = {
-      source = "terraform-providers/baz"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-existing-versions-tf/input/main.tf b/command/testdata/013upgrade-existing-versions-tf/input/main.tf
deleted file mode 100644
index 109e0699c..000000000
--- a/command/testdata/013upgrade-existing-versions-tf/input/main.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-resource foo_resource b {}
-resource bar_resource c {}
-resource bar_resource ab {
-  provider = baz
-}
diff --git a/command/testdata/013upgrade-existing-versions-tf/input/versions.tf b/command/testdata/013upgrade-existing-versions-tf/input/versions.tf
deleted file mode 100644
index c4ab732da..000000000
--- a/command/testdata/013upgrade-existing-versions-tf/input/versions.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is a file called versions.tf which does not originally have a
-# required_providers block. 
-resource foo_resource a {}
-
-terraform {
-  required_version = ">= 0.12"
-}
diff --git a/command/testdata/013upgrade-explicit-providers/expected/main.tf b/command/testdata/013upgrade-explicit-providers/expected/main.tf
deleted file mode 100644
index a70002e59..000000000
--- a/command/testdata/013upgrade-explicit-providers/expected/main.tf
+++ /dev/null
@@ -1,21 +0,0 @@
-provider "foo" {
-  version = "1.2.3"
-}
-
-terraform {
-  required_providers {
-    bar = {
-      source  = "hashicorp/bar"
-      version = "1.0.0"
-    }
-    baz = {
-      source  = "terraform-providers/baz"
-      version = "~> 2.0.0"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-}
-
-provider "terraform" {}
diff --git a/command/testdata/013upgrade-explicit-providers/expected/versions.tf b/command/testdata/013upgrade-explicit-providers/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-explicit-providers/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-explicit-providers/input/main.tf b/command/testdata/013upgrade-explicit-providers/input/main.tf
deleted file mode 100644
index 408622527..000000000
--- a/command/testdata/013upgrade-explicit-providers/input/main.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-provider "foo" {
-  version = "1.2.3"
-}
-
-terraform {
-  required_providers {
-    bar = "1.0.0"
-    baz = {
-      version = "~> 2.0.0"
-    }
-  }
-}
-
-provider "terraform" { }
diff --git a/command/testdata/013upgrade-file-exists/expected/versions.tf b/command/testdata/013upgrade-file-exists/expected/versions.tf
deleted file mode 100644
index 973e28c11..000000000
--- a/command/testdata/013upgrade-file-exists/expected/versions.tf
+++ /dev/null
@@ -1,13 +0,0 @@
-provider foo {}
-provider bar {}
-terraform {
-  required_providers {
-    bar = {
-      source = "hashicorp/bar"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-file-exists/input/versions.tf b/command/testdata/013upgrade-file-exists/input/versions.tf
deleted file mode 100644
index e9f22a979..000000000
--- a/command/testdata/013upgrade-file-exists/input/versions.tf
+++ /dev/null
@@ -1,2 +0,0 @@
-provider foo {}
-provider bar {}
diff --git a/command/testdata/013upgrade-implicit-not-found/expected/main.tf b/command/testdata/013upgrade-implicit-not-found/expected/main.tf
deleted file mode 100644
index afb4083b5..000000000
--- a/command/testdata/013upgrade-implicit-not-found/expected/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource something_resource a {}
diff --git a/command/testdata/013upgrade-implicit-not-found/expected/versions.tf b/command/testdata/013upgrade-implicit-not-found/expected/versions.tf
deleted file mode 100644
index a95ff090f..000000000
--- a/command/testdata/013upgrade-implicit-not-found/expected/versions.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-terraform {
-  required_providers {
-    something = {
-      # TF-UPGRADE-TODO
-      #
-      # No source detected for this provider. You must add a source address
-      # in the following format:
-      #
-      # source = "your-registry.example.com/organization/something"
-      #
-      # For more information, see the provider source documentation:
-      #
-      # https://www.terraform.io/docs/language/providers/requirements.html
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-implicit-not-found/input/main.tf b/command/testdata/013upgrade-implicit-not-found/input/main.tf
deleted file mode 100644
index afb4083b5..000000000
--- a/command/testdata/013upgrade-implicit-not-found/input/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource something_resource a {}
diff --git a/command/testdata/013upgrade-implicit-providers/expected/main.tf b/command/testdata/013upgrade-implicit-providers/expected/main.tf
deleted file mode 100644
index 82c3e837a..000000000
--- a/command/testdata/013upgrade-implicit-providers/expected/main.tf
+++ /dev/null
@@ -1,6 +0,0 @@
-resource "foo_resource" "b" {}
-resource "bar_resource" "c" {}
-resource "bar_resource" "ab" {
-  provider = baz
-}
-resource "terraform_remote_state" "production" {}
diff --git a/command/testdata/013upgrade-implicit-providers/expected/versions.tf b/command/testdata/013upgrade-implicit-providers/expected/versions.tf
deleted file mode 100644
index 1bfef1799..000000000
--- a/command/testdata/013upgrade-implicit-providers/expected/versions.tf
+++ /dev/null
@@ -1,14 +0,0 @@
-terraform {
-  required_providers {
-    bar = {
-      source = "hashicorp/bar"
-    }
-    baz = {
-      source = "terraform-providers/baz"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-implicit-providers/input/main.tf b/command/testdata/013upgrade-implicit-providers/input/main.tf
deleted file mode 100644
index 82c3e837a..000000000
--- a/command/testdata/013upgrade-implicit-providers/input/main.tf
+++ /dev/null
@@ -1,6 +0,0 @@
-resource "foo_resource" "b" {}
-resource "bar_resource" "c" {}
-resource "bar_resource" "ab" {
-  provider = baz
-}
-resource "terraform_remote_state" "production" {}
diff --git a/command/testdata/013upgrade-multiple-blocks/expected/bar-baz.tf b/command/testdata/013upgrade-multiple-blocks/expected/bar-baz.tf
deleted file mode 100644
index f2f1d69a0..000000000
--- a/command/testdata/013upgrade-multiple-blocks/expected/bar-baz.tf
+++ /dev/null
@@ -1,2 +0,0 @@
-resource bar_instance a {}
-resource baz_instance b {}
diff --git a/command/testdata/013upgrade-multiple-blocks/expected/foo.tf b/command/testdata/013upgrade-multiple-blocks/expected/foo.tf
deleted file mode 100644
index e29e6d315..000000000
--- a/command/testdata/013upgrade-multiple-blocks/expected/foo.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-terraform {
-  required_version = ">= 0.12"
-}
-resource foo_instance c {}
diff --git a/command/testdata/013upgrade-multiple-blocks/expected/versions.tf b/command/testdata/013upgrade-multiple-blocks/expected/versions.tf
deleted file mode 100644
index ba49a0da7..000000000
--- a/command/testdata/013upgrade-multiple-blocks/expected/versions.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-terraform {
-  required_providers {
-    foo = {
-      source  = "hashicorp/foo"
-      version = "0.5"
-    }
-    bar = {
-      source = "registry.acme.corp/acme/bar"
-    }
-    baz = {
-      source  = "terraform-providers/baz"
-      version = "~> 2.0.0"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-multiple-blocks/input/bar-baz.tf b/command/testdata/013upgrade-multiple-blocks/input/bar-baz.tf
deleted file mode 100644
index f2f1d69a0..000000000
--- a/command/testdata/013upgrade-multiple-blocks/input/bar-baz.tf
+++ /dev/null
@@ -1,2 +0,0 @@
-resource bar_instance a {}
-resource baz_instance b {}
diff --git a/command/testdata/013upgrade-multiple-blocks/input/foo.tf b/command/testdata/013upgrade-multiple-blocks/input/foo.tf
deleted file mode 100644
index 582cf0e2d..000000000
--- a/command/testdata/013upgrade-multiple-blocks/input/foo.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-terraform {
-  required_version = ">= 0.12"
-  required_providers {
-    baz = "~> 2.0.0"
-  }
-}
-resource foo_instance c {}
diff --git a/command/testdata/013upgrade-multiple-blocks/input/versions.tf b/command/testdata/013upgrade-multiple-blocks/input/versions.tf
deleted file mode 100644
index 9252a15e3..000000000
--- a/command/testdata/013upgrade-multiple-blocks/input/versions.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-terraform {
-  required_providers {
-    foo = "0.5"
-  }
-}
-terraform {
-  required_providers {
-    bar = {
-      source = "registry.acme.corp/acme/bar"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-multiple-files/expected/main.tf b/command/testdata/013upgrade-multiple-files/expected/main.tf
deleted file mode 100644
index fa25239e9..000000000
--- a/command/testdata/013upgrade-multiple-files/expected/main.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file starts with a resource and a required providers block, and should
-# end up with just the resource.
-resource foo_instance a {}
-
diff --git a/command/testdata/013upgrade-multiple-files/expected/versions.tf b/command/testdata/013upgrade-multiple-files/expected/versions.tf
deleted file mode 100644
index 5604764ef..000000000
--- a/command/testdata/013upgrade-multiple-files/expected/versions.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file starts with a resource and a required providers block, and should
-# end up with the full required providers configuration. This file is chosen
-# to keep the required providers block because its file name is "providers.tf".
-resource bar_instance b {}
-
-terraform {
-  required_providers {
-    bar = {
-      source = "registry.acme.corp/acme/bar"
-    }
-    foo = {
-      source  = "hashicorp/foo"
-      version = "1.0.0"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-multiple-files/input/main.tf b/command/testdata/013upgrade-multiple-files/input/main.tf
deleted file mode 100644
index 168ebff7e..000000000
--- a/command/testdata/013upgrade-multiple-files/input/main.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file starts with a resource and a required providers block, and should
-# end up with just the resource.
-resource foo_instance a {}
-
-terraform {
-  required_providers {
-    foo = "1.0.0"
-  }
-}
diff --git a/command/testdata/013upgrade-multiple-files/input/versions.tf b/command/testdata/013upgrade-multiple-files/input/versions.tf
deleted file mode 100644
index 8823c6fe6..000000000
--- a/command/testdata/013upgrade-multiple-files/input/versions.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file starts with a resource and a required providers block, and should
-# end up with the full required providers configuration. This file is chosen
-# to keep the required providers block because its file name is "providers.tf".
-resource bar_instance b {}
-
-terraform {
-  required_providers {
-    bar = {
-      source = "registry.acme.corp/acme/bar"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-no-providers/expected/main.tf b/command/testdata/013upgrade-no-providers/expected/main.tf
deleted file mode 100644
index d7ad43496..000000000
--- a/command/testdata/013upgrade-no-providers/expected/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-variable "x" {
-  default = 3
-}
-
-variable "y" {
-  default = 5
-}
-
-output "product" {
-  value = var.x * var.y
-}
diff --git a/command/testdata/013upgrade-no-providers/input/main.tf b/command/testdata/013upgrade-no-providers/input/main.tf
deleted file mode 100644
index d7ad43496..000000000
--- a/command/testdata/013upgrade-no-providers/input/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-variable "x" {
-  default = 3
-}
-
-variable "y" {
-  default = 5
-}
-
-output "product" {
-  value = var.x * var.y
-}
diff --git a/command/testdata/013upgrade-preserves-comments/expected/main.tf b/command/testdata/013upgrade-preserves-comments/expected/main.tf
deleted file mode 100644
index 7ddfeb0ff..000000000
--- a/command/testdata/013upgrade-preserves-comments/expected/main.tf
+++ /dev/null
@@ -1,23 +0,0 @@
-resource foo_instance a {}
-resource bar_instance b {}
-
-terraform {
-  # Provider requirements go here
-  required_providers {
-    # Pin bar to this version
-    bar = {
-      source  = "hashicorp/bar"
-      version = "0.5.0"
-    }
-    # An explicit requirement
-    baz = {
-      # Comment inside the block should stay
-      source = "foo/baz"
-    }
-    # Foo is required
-    foo = {
-      source  = "hashicorp/foo"
-      version = "1.0.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-preserves-comments/expected/versions.tf b/command/testdata/013upgrade-preserves-comments/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-preserves-comments/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-preserves-comments/input/main.tf b/command/testdata/013upgrade-preserves-comments/input/main.tf
deleted file mode 100644
index 7d12b4337..000000000
--- a/command/testdata/013upgrade-preserves-comments/input/main.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-resource foo_instance a {}
-resource bar_instance b {}
-
-terraform {
-  # Provider requirements go here
-  required_providers {
-    # Pin bar to this version
-    bar = "0.5.0"
-    # An explicit requirement
-    baz = {
-      # Comment inside the block should stay
-      source = "foo/baz"
-    }
-    # Foo is required
-    foo = {
-      # This comment sadly won't make it
-      version = "1.0.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-provider-not-found/expected/main.tf b/command/testdata/013upgrade-provider-not-found/expected/main.tf
deleted file mode 100644
index e3aa388c8..000000000
--- a/command/testdata/013upgrade-provider-not-found/expected/main.tf
+++ /dev/null
@@ -1,26 +0,0 @@
-provider foo {}
-
-terraform {
-  required_providers {
-    bar = {
-      source  = "hashicorp/bar"
-      version = "1.0.0"
-    }
-    unknown = {
-      # TF-UPGRADE-TODO
-      #
-      # No source detected for this provider. You must add a source address
-      # in the following format:
-      #
-      # source = "your-registry.example.com/organization/unknown"
-      #
-      # For more information, see the provider source documentation:
-      #
-      # https://www.terraform.io/docs/language/providers/requirements.html
-      version = "~> 2.0.0"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-provider-not-found/expected/versions.tf b/command/testdata/013upgrade-provider-not-found/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-provider-not-found/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-provider-not-found/input/main.tf b/command/testdata/013upgrade-provider-not-found/input/main.tf
deleted file mode 100644
index 9b6e38104..000000000
--- a/command/testdata/013upgrade-provider-not-found/input/main.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-provider foo {}
-
-terraform {
-  required_providers {
-    bar = "1.0.0"
-    unknown = {
-      version = "~> 2.0.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/main.tf b/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/main.tf
deleted file mode 100644
index 2e6a3b2c9..000000000
--- a/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/main.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider "qux" {
-  version = "~> 0.9.0"
-}
diff --git a/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/versions.tf b/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/versions.tf
deleted file mode 100644
index 21c925ecd..000000000
--- a/command/testdata/013upgrade-provider-redirect-version-unavailable/expected/versions.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    qux = {
-      source = "hashicorp/qux"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-provider-redirect-version-unavailable/input/main.tf b/command/testdata/013upgrade-provider-redirect-version-unavailable/input/main.tf
deleted file mode 100644
index 2e6a3b2c9..000000000
--- a/command/testdata/013upgrade-provider-redirect-version-unavailable/input/main.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider "qux" {
-  version = "~> 0.9.0"
-}
diff --git a/command/testdata/013upgrade-provider-redirect/expected/main.tf b/command/testdata/013upgrade-provider-redirect/expected/main.tf
deleted file mode 100644
index d8b5dfb03..000000000
--- a/command/testdata/013upgrade-provider-redirect/expected/main.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider "qux" {
-  version = ">= 1.0.0"
-}
diff --git a/command/testdata/013upgrade-provider-redirect/expected/versions.tf b/command/testdata/013upgrade-provider-redirect/expected/versions.tf
deleted file mode 100644
index c0b9ee574..000000000
--- a/command/testdata/013upgrade-provider-redirect/expected/versions.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    qux = {
-      source = "acme/qux"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-provider-redirect/input/main.tf b/command/testdata/013upgrade-provider-redirect/input/main.tf
deleted file mode 100644
index d8b5dfb03..000000000
--- a/command/testdata/013upgrade-provider-redirect/input/main.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider "qux" {
-  version = ">= 1.0.0"
-}
diff --git a/command/testdata/013upgrade-providers-with-source/expected/main.tf b/command/testdata/013upgrade-providers-with-source/expected/main.tf
deleted file mode 100644
index 3d366ebfa..000000000
--- a/command/testdata/013upgrade-providers-with-source/expected/main.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source = "registry.acme.corp/acme/aws"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-providers-with-source/expected/versions.tf b/command/testdata/013upgrade-providers-with-source/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-providers-with-source/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-providers-with-source/input/main.tf b/command/testdata/013upgrade-providers-with-source/input/main.tf
deleted file mode 100644
index 3d366ebfa..000000000
--- a/command/testdata/013upgrade-providers-with-source/input/main.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source = "registry.acme.corp/acme/aws"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-skipped-files/expected/bar_override.tf b/command/testdata/013upgrade-skipped-files/expected/bar_override.tf
deleted file mode 100644
index 524ef2c57..000000000
--- a/command/testdata/013upgrade-skipped-files/expected/bar_override.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider bar {
-  version = "1.0.0"
-}
diff --git a/command/testdata/013upgrade-skipped-files/expected/main.tf b/command/testdata/013upgrade-skipped-files/expected/main.tf
deleted file mode 100644
index 83d1158f4..000000000
--- a/command/testdata/013upgrade-skipped-files/expected/main.tf
+++ /dev/null
@@ -1,19 +0,0 @@
-provider foo {
-  version = "1.2.3"
-}
-
-terraform {
-  required_providers {
-    bar = {
-      source  = "hashicorp/bar"
-      version = "1.0.0"
-    }
-    baz = {
-      source  = "terraform-providers/baz"
-      version = "~> 2.0.0"
-    }
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-skipped-files/expected/variables.tf.json b/command/testdata/013upgrade-skipped-files/expected/variables.tf.json
deleted file mode 100644
index 6126f1f0c..000000000
--- a/command/testdata/013upgrade-skipped-files/expected/variables.tf.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "variable": {
-    "example": {
-      "default": "hello"
-    }
-  }
-  "terraform": {
-    "required_providers": {
-      "aws": "2.50.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-skipped-files/expected/versions.tf b/command/testdata/013upgrade-skipped-files/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-skipped-files/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-skipped-files/input/bar_override.tf b/command/testdata/013upgrade-skipped-files/input/bar_override.tf
deleted file mode 100644
index 524ef2c57..000000000
--- a/command/testdata/013upgrade-skipped-files/input/bar_override.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-provider bar {
-  version = "1.0.0"
-}
diff --git a/command/testdata/013upgrade-skipped-files/input/main.tf b/command/testdata/013upgrade-skipped-files/input/main.tf
deleted file mode 100644
index f3c982a04..000000000
--- a/command/testdata/013upgrade-skipped-files/input/main.tf
+++ /dev/null
@@ -1,12 +0,0 @@
-provider foo {
-  version = "1.2.3"
-}
-
-terraform {
-  required_providers {
-    bar = "1.0.0"
-    baz = {
-      version = "~> 2.0.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-skipped-files/input/variables.tf.json b/command/testdata/013upgrade-skipped-files/input/variables.tf.json
deleted file mode 100644
index 6126f1f0c..000000000
--- a/command/testdata/013upgrade-skipped-files/input/variables.tf.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "variable": {
-    "example": {
-      "default": "hello"
-    }
-  }
-  "terraform": {
-    "required_providers": {
-      "aws": "2.50.0"
-    }
-  }
-}
diff --git a/command/testdata/013upgrade-submodule/expected-module/main.tf b/command/testdata/013upgrade-submodule/expected-module/main.tf
deleted file mode 100644
index 6c4de24ad..000000000
--- a/command/testdata/013upgrade-submodule/expected-module/main.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    bar = {
-      version = "~> 2.0.0"
-    }
-  }
-}
-
diff --git a/command/testdata/013upgrade-submodule/expected-module/module/main.tf b/command/testdata/013upgrade-submodule/expected-module/module/main.tf
deleted file mode 100644
index 0f5566e56..000000000
--- a/command/testdata/013upgrade-submodule/expected-module/module/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource foo_resource b {}
diff --git a/command/testdata/013upgrade-submodule/expected-module/module/versions.tf b/command/testdata/013upgrade-submodule/expected-module/module/versions.tf
deleted file mode 100644
index 999c94807..000000000
--- a/command/testdata/013upgrade-submodule/expected-module/module/versions.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    foo = {
-      source = "hashicorp/foo"
-    }
-  }
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-submodule/expected/main.tf b/command/testdata/013upgrade-submodule/expected/main.tf
deleted file mode 100644
index 89b6f4027..000000000
--- a/command/testdata/013upgrade-submodule/expected/main.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-terraform {
-  required_providers {
-    bar = {
-      source  = "hashicorp/bar"
-      version = "~> 2.0.0"
-    }
-  }
-}
-
diff --git a/command/testdata/013upgrade-submodule/expected/module/main.tf b/command/testdata/013upgrade-submodule/expected/module/main.tf
deleted file mode 100644
index 0f5566e56..000000000
--- a/command/testdata/013upgrade-submodule/expected/module/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource foo_resource b {}
diff --git a/command/testdata/013upgrade-submodule/expected/versions.tf b/command/testdata/013upgrade-submodule/expected/versions.tf
deleted file mode 100644
index 6b6318def..000000000
--- a/command/testdata/013upgrade-submodule/expected/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = ">= 0.13"
-}
diff --git a/command/testdata/013upgrade-submodule/input/main.tf b/command/testdata/013upgrade-submodule/input/main.tf
deleted file mode 100644
index 6c4de24ad..000000000
--- a/command/testdata/013upgrade-submodule/input/main.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    bar = {
-      version = "~> 2.0.0"
-    }
-  }
-}
-
diff --git a/command/testdata/013upgrade-submodule/input/module/main.tf b/command/testdata/013upgrade-submodule/input/module/main.tf
deleted file mode 100644
index 0f5566e56..000000000
--- a/command/testdata/013upgrade-submodule/input/module/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource foo_resource b {}
diff --git a/command/testdata/013upgrade-unsupported-version/main.tf b/command/testdata/013upgrade-unsupported-version/main.tf
deleted file mode 100644
index c7dee23c9..000000000
--- a/command/testdata/013upgrade-unsupported-version/main.tf
+++ /dev/null
@@ -1 +0,0 @@
-resource foo_instance a {}
diff --git a/command/testdata/013upgrade-unsupported-version/versions.tf b/command/testdata/013upgrade-unsupported-version/versions.tf
deleted file mode 100644
index 7000b050c..000000000
--- a/command/testdata/013upgrade-unsupported-version/versions.tf
+++ /dev/null
@@ -1,3 +0,0 @@
-terraform {
-  required_version = "~> 0.12.0"
-}