From 40915ab80fd90a4a9c4aed05613f45894b6fe5dc Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 30 Aug 2021 15:40:51 +0800 Subject: [PATCH] terraform-providers: Update alicloud to v1.144.0 The alicloud provider move from to aliyun/alicloud, update to the latest version. Also introduct `deleteVendor` in `buildWithGoModule`, the vendor of alicloud needs to be cleared due to openapiv2 API rename, or the following error appears when building in case sensitive filesystems: ``` vendor/k8s.io/client-go/discovery/discovery_client.go:30:2: cannot find package "." in: /build/source/vendor/github.com/googleapis/gnostic/openapiv2 ``` --- .../cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 35493aa31b7a..afcd55a2b54d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,6 +17,7 @@ let inherit (data) owner repo rev sha256; }; vendorSha256 = data.vendorSha256 or null; + deleteVendor = data.deleteVendor or false; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eda196530aab..03d2797fe391 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -34,11 +34,14 @@ "version": "1.8.0" }, "alicloud": { - "owner": "terraform-providers", + "deleteVendor": true, + "owner": "aliyun", + "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.86.0", - "sha256": "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d", - "version": "1.86.0" + "rev": "v1.144.0", + "sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd", + "vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y", + "version": "1.144.0" }, "archive": { "owner": "hashicorp",