Skip to content

Commit 963bb20

Browse files
authored
Fix update providers script and update aws terraform provider to prove it works (#405081)
2 parents d151796 + 380aafd commit 963bb20

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

pkgs/applications/networking/cluster/terraform-providers/providers.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@
117117
"vendorHash": null
118118
},
119119
"aws": {
120-
"hash": "sha256-4vRXU7FtSMrh/Zou3+agXqXXARFdZ0h6hxglKlY9+YU=",
120+
"hash": "sha256-wTig0NyANYdITXus9FB7WGQ6BQED7jaVhBYgDzZaU5g=",
121121
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
122122
"owner": "hashicorp",
123123
"repo": "terraform-provider-aws",
124-
"rev": "v5.90.0",
124+
"rev": "v5.97.0",
125125
"spdx": "MPL-2.0",
126-
"vendorHash": "sha256-zjb8SQ6ALQryN7wE4MKn3nhhqEvoeq8CyZd8PlkZJt4="
126+
"vendorHash": "sha256-iYVzLsyX17GYd05CTqCMpEy1oDCiNi5F4Xiu0Lp9nTg="
127127
},
128128
"azuread": {
129129
"hash": "sha256-64afLKTgJ58O9GUv3GRTJKw7xgg0cglIv3EvARsxnn0=",
@@ -1057,13 +1057,13 @@
10571057
"vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
10581058
},
10591059
"proxmox": {
1060-
"hash": "sha256-dQvJVAxSR0eMeJseDR80MqXX4v7ry794bIr+ilpKBoQ=",
1060+
"hash": "sha256-agupFUy/4D0gJ12AhJDNt0FPnSWM1laBban13z04pPA=",
10611061
"homepage": "https://registry.terraform.io/providers/Telmate/proxmox",
10621062
"owner": "Telmate",
10631063
"repo": "terraform-provider-proxmox",
1064-
"rev": "v3.0.1-rc6",
1064+
"rev": "v3.0.1-rc8",
10651065
"spdx": "MIT",
1066-
"vendorHash": "sha256-rD4+m0txQhzw2VmQ56/ZXjtQ9QOufseZGg8TrisgAJo="
1066+
"vendorHash": "sha256-LZ3g/UuI+u4ULaM2taso9GgSsmxJICjKhrSaWIL6nCw="
10671067
},
10681068
"rabbitmq": {
10691069
"hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",

pkgs/applications/networking/cluster/terraform-providers/update-provider

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#
99
set -euo pipefail
1010
shopt -s inherit_errexit
11+
set -x
1112

1213
show_usage() {
1314
cat <<DOC
@@ -97,6 +98,10 @@ echo_provider() {
9798
echo "== terraform-providers.${provider}: $* =="
9899
}
99100

101+
is_stable_version() {
102+
[[ $1 =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]
103+
}
104+
100105
pushd "$(dirname "$0")" >/dev/null
101106

102107
if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then
@@ -112,10 +117,19 @@ fi
112117

113118
homepage="$(read_attr homepage)"
114119

115-
registry_response=$(curl -s "${homepage//providers/v1/providers}")
116-
117120
old_rev="$(read_attr rev)"
118-
rev="$(jq -r '.tag' <<<"${registry_response}")"
121+
registry_response_unstable=$(curl -s "${homepage//providers/v1/providers}")
122+
123+
if is_stable_version "${old_rev}"; then
124+
version_stable=$(jq -r '.versions | map(select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))) | last' <<<${registry_response_unstable})
125+
registry_response_stable=$(curl -s "${homepage//providers/v1/providers}/${version_stable}")
126+
rev="$(jq -r '.tag' <<<${registry_response_stable})"
127+
registry_response=$registry_response_stable
128+
else
129+
rev="$(jq -r '.tag' <<<${registry_response_unstable})"
130+
registry_response=$registry_response_unstable
131+
fi
132+
119133
if [[ ${force} != 1 ]]; then
120134
if [[ ${old_rev} == "${rev}" ]]; then
121135
echo_provider "already at version ${rev}"

0 commit comments

Comments
 (0)