chore: improve tofu handling (#975)

* feat: remove need to pass in tofu url template in manifest core now defaults to the tofu url template for tofu binaries. It still defaults to hashicorp for providers as this is the download url (where releases are hosted) and not the registry itself. [#187199931](https://www.pivotaltracker.com/story/show/187199931) * chore: remove special packing structure for old terraform versions [#187199931](https://www.pivotaltracker.com/story/show/187199931) * chore: change fixtures to not specify tofu url in manifest [#187199931](https://www.pivotaltracker.com/story/show/187199931) * chore: upgrade from tf versions < 1.5 is not supported [#187199931](https://www.pivotaltracker.com/story/show/187199931) * chore: remove all terraform 0.12/0.13 logic [#187199931](https://www.pivotaltracker.com/story/show/187199931) * chore: removed unused terraform 0.12 command logic and test [#187199910](https://www.pivotaltracker.com/story/show/187199910)
cloudfoundry · Mar 20, 2024 · defde29 · defde29
1 parent a8cd4eb
commit defde29
Show file tree

Hide file tree

Showing 47 changed files with 103 additions and 328 deletions.
diff --git a/integrationtest/fixtures/binding-cleanup/manifest.yml b/integrationtest/fixtures/binding-cleanup/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.1.0
 service_definitions:

diff --git a/integrationtest/fixtures/brokerpak-build-duplicate-plan-id/manifest.yml b/integrationtest/fixtures/brokerpak-build-duplicate-plan-id/manifest.yml
@@ -10,7 +10,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service-1.yml
 - fake-service-2.yml
diff --git a/integrationtest/fixtures/brokerpak-build-file-inclusion/manifest.yml b/integrationtest/fixtures/brokerpak-build-file-inclusion/manifest.yml
@@ -10,11 +10,9 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.1
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.1.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: cloud-service-broker
   version: 0.2.6

diff --git a/integrationtest/fixtures/brokerpaktestframework/manifest.yml b/integrationtest/fixtures/brokerpaktestframework/manifest.yml
@@ -12,11 +12,9 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 terraform_upgrade_path:
   - version: 1.6.0

diff --git a/integrationtest/fixtures/database-encryption/manifest.yml b/integrationtest/fixtures/database-encryption/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/global-labels/manifest.yml b/integrationtest/fixtures/global-labels/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/golden-path/manifest.yml b/integrationtest/fixtures/golden-path/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.1.0
 service_definitions:

diff --git a/integrationtest/fixtures/info-endpoint/manifest.yml b/integrationtest/fixtures/info-endpoint/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
-  - fake-service-1.yml
-  - fake-service-2.yml
+- fake-service-1.yml
+- fake-service-2.yml
diff --git a/integrationtest/fixtures/maintenance-info/manifest.yml b/integrationtest/fixtures/maintenance-info/manifest.yml
@@ -12,11 +12,9 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.1
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.1.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: terraform-provider-random
   version: 3.5.1

diff --git a/integrationtest/fixtures/multiple-update-properties/manifest.yml b/integrationtest/fixtures/multiple-update-properties/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/osbapi/manifest.yml b/integrationtest/fixtures/osbapi/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/prevent-destroy-during-update/manifest.yml b/integrationtest/fixtures/prevent-destroy-during-update/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/provision-cleanup/manifest.yml b/integrationtest/fixtures/provision-cleanup/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.1.0
 service_definitions:

diff --git a/integrationtest/fixtures/purge-service-binding/manifest.yml b/integrationtest/fixtures/purge-service-binding/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/purge-service-instance/manifest.yml b/integrationtest/fixtures/purge-service-instance/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/service-catalog/manifest.yml b/integrationtest/fixtures/service-catalog/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
-  - fake-service-1.yml
-  - fake-service-2.yml
+- fake-service-1.yml
+- fake-service-2.yml
diff --git a/integrationtest/fixtures/subsume/manifest.yml b/integrationtest/fixtures/subsume/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.1.0
 service_definitions:

diff --git a/integrationtest/fixtures/terraform-0.12/fake-provision.tf b/integrationtest/fixtures/terraform-0.12/fake-provision.tf
diff --git a/integrationtest/fixtures/terraform-0.12/fake-service.yml b/integrationtest/fixtures/terraform-0.12/fake-service.yml
diff --git a/integrationtest/fixtures/terraform-0.12/manifest.yml b/integrationtest/fixtures/terraform-0.12/manifest.yml
diff --git a/integrationtest/fixtures/terraform-0.13/fake-provision.tf b/integrationtest/fixtures/terraform-0.13/fake-provision.tf
diff --git a/integrationtest/fixtures/terraform-0.13/fake-service.yml b/integrationtest/fixtures/terraform-0.13/fake-service.yml
diff --git a/integrationtest/fixtures/terraform-0.13/manifest.yml b/integrationtest/fixtures/terraform-0.13/manifest.yml
diff --git a/integrationtest/fixtures/terraform-block-action-before-upgrade-updated/manifest.yml b/integrationtest/fixtures/terraform-block-action-before-upgrade-updated/manifest.yml
@@ -12,11 +12,9 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: terraform-provider-random
   version: 3.5.1

diff --git a/integrationtest/fixtures/terraform-block-action-before-upgrade/manifest.yml b/integrationtest/fixtures/terraform-block-action-before-upgrade/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/terraform-module-upgrade-updated/manifest.yml b/integrationtest/fixtures/terraform-module-upgrade-updated/manifest.yml
@@ -12,15 +12,12 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.1
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.1.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: terraform-provider-random
   version: 3.5.1

diff --git a/integrationtest/fixtures/terraform-module-upgrade/manifest.yml b/integrationtest/fixtures/terraform-module-upgrade/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: terraform-provider-random
   version: 3.5.1

diff --git a/integrationtest/fixtures/terraform-rename-provider/manifest.yml b/integrationtest/fixtures/terraform-rename-provider/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   provider: "ContentSquare/random"
   version: 3.1.0

diff --git a/integrationtest/fixtures/terraform-upgrade-updated/manifest.yml b/integrationtest/fixtures/terraform-upgrade-updated/manifest.yml
@@ -12,15 +12,12 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.1
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.1.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
   default: true
 - name: terraform-provider-random
   version: 3.5.1

diff --git a/integrationtest/fixtures/terraform-upgrade/manifest.yml b/integrationtest/fixtures/terraform-upgrade/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/tf_attribute_skip/manifest.yml b/integrationtest/fixtures/tf_attribute_skip/manifest.yml
@@ -12,7 +12,6 @@ terraform_binaries:
 - name: tofu
   version: 1.6.2
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.2.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 - name: terraform-provider-random
   version: 3.5.1
 service_definitions:

diff --git a/integrationtest/fixtures/update-brokerpak-hcl-updated-with-error/manifest.yml b/integrationtest/fixtures/update-brokerpak-hcl-updated-with-error/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/update-brokerpak-hcl-updated/manifest.yml b/integrationtest/fixtures/update-brokerpak-hcl-updated/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml
diff --git a/integrationtest/fixtures/update-brokerpak-hcl/manifest.yml b/integrationtest/fixtures/update-brokerpak-hcl/manifest.yml
@@ -12,6 +12,5 @@ terraform_binaries:
 - name: tofu
   version: 1.6.0
   source: https://github.com/opentofu/opentofu/archive/refs/tags/v1.6.0.zip
-  url_template: https://github.com/opentofu/opentofu/releases/download/v${version}/tofu_${version}_${os}_${arch}.zip
 service_definitions:
 - fake-service.yml