Commit f26770b1 authored by cinereal's avatar cinereal Committed by zowoq
Browse files

terraform-providers: name-space providers to the form `<owner>_<provider>` 



This allows us to have providers name-spaced to avoid clashes with identically named providers.

Signed-off-by: default avatarcinereal <cinereal@riseup.net>
parent 17c7148d

pkgs/applications/networking/cluster/terraform-providers/default.nix

+177 −7

File changed.

Preview size limit exceeded, changes collapsed.

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

+801 −801

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −17
Original line number Diff line number Diff line
@@ -12,18 +12,13 @@ set -x 


show_usage() {

  cat <<DOC

Usage: ./update-provider [--force] [--no-build] [<owner>/]<provider>

Usage: ./update-provider [--force] [--no-build] <owner>_<provider>



Update a single provider in the providers.json inventory file.

Add or update a single provider in the providers.json inventory file.



For example to update 'terraform-providers.aws' run:

For example to update 'terraform-providers.hashicorp_aws' run:



    ./update-provider aws



If the provider is not in the list already, use the form '<owner>/<provider>'

to add the provider to the list:



    ./update-provider hetznercloud/hcloud

    ./update-provider hashicorp_aws



Options:
@@ -104,9 +99,11 @@ is_stable_version() { 


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



if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then

  homepage="https://registry.terraform.io/providers/${provider}"

  provider=$(basename "${provider}")

provider="$(echo "$provider" | tr '[:upper:]' '[:lower:]')"

homepage="$(read_attr homepage)"



if [[ $homepage == "null" ]]; then

  homepage="https://registry.terraform.io/providers/${provider//_//}"

  echo_provider "init"

  update_attr homepage "${homepage}"

  # create empty stings so nix-prefetch works
@@ -115,18 +112,16 @@ if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then 
  update_attr spdx ""

fi



homepage="$(read_attr homepage)"



old_rev="$(read_attr rev)"

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})

  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})"

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

  registry_response=$registry_response_stable

else

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

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

  registry_response=$registry_response_unstable

fi

pkgs/applications/networking/cluster/terraform/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ rec { 
      mainTf = writeText "main.tf" ''

        resource "random_id" "test" {}

      '';

      terraform = terraform_1.withPlugins (p: [ p.random ]);

      terraform = terraform_1.withPlugins (p: [ p.hashicorp_random ]);

      test = runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } ''

        set -e

        # make it fail outside of sandbox

pkgs/by-name/op/opentofu/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ let 


        resource "random_id" "test" {}

      '';

      opentofu = (pluggable package).withPlugins (p: [ p.random ]);

      opentofu = (pluggable package).withPlugins (p: [ p.hashicorp_random ]);

      test = runCommand "opentofu-plugin-test" { buildInputs = [ opentofu ]; } ''

        # make it fail outside of sandbox

        export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0