Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: improve tofu handling #975

Merged
merged 6 commits into from
Mar 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion integrationtest/fixtures/binding-cleanup/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions integrationtest/fixtures/brokerpaktestframework/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/database-encryption/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/global-labels/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
1 change: 0 additions & 1 deletion integrationtest/fixtures/golden-path/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
5 changes: 2 additions & 3 deletions integrationtest/fixtures/info-endpoint/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions integrationtest/fixtures/maintenance-info/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/osbapi/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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:
1 change: 0 additions & 1 deletion integrationtest/fixtures/provision-cleanup/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions integrationtest/fixtures/service-catalog/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/subsume/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
6 changes: 0 additions & 6 deletions integrationtest/fixtures/terraform-0.12/fake-provision.tf

This file was deleted.

19 changes: 0 additions & 19 deletions integrationtest/fixtures/terraform-0.12/fake-service.yml

This file was deleted.

17 changes: 0 additions & 17 deletions integrationtest/fixtures/terraform-0.12/manifest.yml

This file was deleted.

15 changes: 0 additions & 15 deletions integrationtest/fixtures/terraform-0.13/fake-provision.tf

This file was deleted.

28 changes: 0 additions & 28 deletions integrationtest/fixtures/terraform-0.13/fake-service.yml

This file was deleted.

21 changes: 0 additions & 21 deletions integrationtest/fixtures/terraform-0.13/manifest.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/terraform-upgrade/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
1 change: 0 additions & 1 deletion integrationtest/fixtures/tf_attribute_skip/manifest.yml
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion integrationtest/fixtures/update-brokerpak-hcl/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
Loading