Unverified Commit 963bb20b authored by zowoq's avatar zowoq Committed by GitHub
Browse files

Fix update providers script and update aws terraform provider to prove it works (#405081)

parents d1517968 380aafd4

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

+6 −6
Original line number Diff line number Diff line
@@ -117,13 +117,13 @@ 
    "vendorHash": null

  },

  "aws": {

    "hash": "sha256-4vRXU7FtSMrh/Zou3+agXqXXARFdZ0h6hxglKlY9+YU=",

    "hash": "sha256-wTig0NyANYdITXus9FB7WGQ6BQED7jaVhBYgDzZaU5g=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",

    "owner": "hashicorp",

    "repo": "terraform-provider-aws",

    "rev": "v5.90.0",

    "rev": "v5.97.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-zjb8SQ6ALQryN7wE4MKn3nhhqEvoeq8CyZd8PlkZJt4="

    "vendorHash": "sha256-iYVzLsyX17GYd05CTqCMpEy1oDCiNi5F4Xiu0Lp9nTg="

  },

  "azuread": {

    "hash": "sha256-64afLKTgJ58O9GUv3GRTJKw7xgg0cglIv3EvARsxnn0=",
@@ -1057,13 +1057,13 @@ 
    "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="

  },

  "proxmox": {

    "hash": "sha256-dQvJVAxSR0eMeJseDR80MqXX4v7ry794bIr+ilpKBoQ=",

    "hash": "sha256-agupFUy/4D0gJ12AhJDNt0FPnSWM1laBban13z04pPA=",

    "homepage": "https://registry.terraform.io/providers/Telmate/proxmox",

    "owner": "Telmate",

    "repo": "terraform-provider-proxmox",

    "rev": "v3.0.1-rc6",

    "rev": "v3.0.1-rc8",

    "spdx": "MIT",

    "vendorHash": "sha256-rD4+m0txQhzw2VmQ56/ZXjtQ9QOufseZGg8TrisgAJo="

    "vendorHash": "sha256-LZ3g/UuI+u4ULaM2taso9GgSsmxJICjKhrSaWIL6nCw="

  },

  "rabbitmq": {

    "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",

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

+17 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#

set -euo pipefail

shopt -s inherit_errexit

set -x



show_usage() {

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

}



is_stable_version() {

  [[ $1 =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]

}



pushd "$(dirname "$0")" >/dev/null



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


homepage="$(read_attr homepage)"



registry_response=$(curl -s "${homepage//providers/v1/providers}")



old_rev="$(read_attr rev)"

rev="$(jq -r '.tag' <<<"${registry_response}")"

registry_response_unstable=$(curl -s "${homepage//providers/v1/providers}")



if is_stable_version "${old_rev}"; then

  version_stable=$(jq -r '.versions | map(select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))) | last' <<<${registry_response_unstable})

  registry_response_stable=$(curl -s "${homepage//providers/v1/providers}/${version_stable}")

  rev="$(jq -r '.tag' <<<${registry_response_stable})"

  registry_response=$registry_response_stable

else

  rev="$(jq -r '.tag' <<<${registry_response_unstable})"

  registry_response=$registry_response_unstable

fi



if [[ ${force} != 1 ]]; then

  if [[ ${old_rev} == "${rev}" ]]; then

    echo_provider "already at version ${rev}"