Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(fleets): match Terraform release protocol (#6745)

r33drichards68c0180362d6
diff --git a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
index 24b1574dec..65ab1ffbb5 100644
--- a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
+++ b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
@@ -147,11 +147,11 @@ jobs:
cd dist
test "$(find . -maxdepth 1 -name '*.zip' | wc -l)" -eq 6
sha256sum ./*.zip | sed 's# \./# #' > "terraform-provider-fleets_${VERSION}_SHA256SUMS"
- gpg --batch --armor --detach-sign \
+ gpg --batch --detach-sign \
--local-user "$GPG_FINGERPRINT" \
--output "terraform-provider-fleets_${VERSION}_SHA256SUMS.sig" \
"terraform-provider-fleets_${VERSION}_SHA256SUMS"
- cp ../terraform-registry-manifest.json .
+ cp ../terraform-registry-manifest.json "terraform-provider-fleets_${VERSION}_manifest.json"
- name: Publish GitHub release
env:
GH_TOKEN: ${{ github.token }}
diff --git a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
index b2cbbe53e2..4bc16b467b 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
@@ -4,6 +4,7 @@ set -euo pipefail
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
workflow="$repo_root/.github/workflows/release.yml"
builder="$repo_root/scripts/build-release-archive.sh"
+manifest="$repo_root/terraform-registry-manifest.json"
reject() {
local needle=$1
@@ -48,7 +49,9 @@ require "GO_BUILD_CC=\${{ matrix.cc }}" "$workflow"
reject 'GITHUB_PATH' "$workflow"
require "./scripts/build-release-archive.sh \"\$VERSION\" dist" "$workflow"
require "terraform-provider-fleets_\${VERSION}_SHA256SUMS" "$workflow"
-require 'gpg --batch --armor --detach-sign' "$workflow"
+require 'gpg --batch --detach-sign' "$workflow"
+reject 'gpg --batch --armor --detach-sign' "$workflow"
+require "terraform-provider-fleets_\${VERSION}_manifest.json" "$workflow"
require "terraform-provider-fleets_\${VERSION}_SHA256SUMS.sig" "$workflow"
require "gh release create \"v\$VERSION\"" "$workflow"
@@ -71,3 +74,8 @@ require "CC_\${rust_target//-/_}" "$builder"
require 'libcyclops_sdk.a' "$builder"
require 'CGO_ENABLED=1' "$builder"
require "terraform-provider-fleets_\${version}_\${goos}_\${goarch}.zip" "$builder"
+
+require '"protocol_versions"' "$manifest"
+require '"6.0"' "$manifest"
+reject '"protocols"' "$manifest"
+reject '"os_arch"' "$manifest"
diff --git a/libs/fleet/terraform-provider-fleets/terraform-registry-manifest.json b/libs/fleet/terraform-provider-fleets/terraform-registry-manifest.json
index b22cd3abf0..295001a07f 100644
--- a/libs/fleet/terraform-provider-fleets/terraform-registry-manifest.json
+++ b/libs/fleet/terraform-provider-fleets/terraform-registry-manifest.json
@@ -1,11 +1,6 @@
{
"version": 1,
"metadata": {
- "protocols": ["6.0"],
- "os_arch": {
- "darwin": ["amd64", "arm64"],
- "linux": ["amd64", "arm64"],
- "windows": ["amd64", "arm64"]
- }
+ "protocol_versions": ["6.0"]
}
}