[arch-commits] Commit in terraform/repos/community-x86_64 (6 files)

Christian Rebischke shibumi at archlinux.org
Thu Aug 27 20:45:06 UTC 2020


    Date: Thursday, August 27, 2020 @ 20:45:05
  Author: shibumi
Revision: 689984

archrelease: copy trunk to community-x86_64

Added:
  terraform/repos/community-x86_64/25555.patch
    (from rev 689983, terraform/trunk/25555.patch)
  terraform/repos/community-x86_64/CHANGELOG.md
    (from rev 689983, terraform/trunk/CHANGELOG.md)
  terraform/repos/community-x86_64/PKGBUILD
    (from rev 689983, terraform/trunk/PKGBUILD)
Deleted:
  terraform/repos/community-x86_64/25555.patch
  terraform/repos/community-x86_64/CHANGELOG.md
  terraform/repos/community-x86_64/PKGBUILD

--------------+
 25555.patch  |   84 +++++++++++++++++++++++++++----------------------------
 CHANGELOG.md |   58 +++++++++++++++++++-------------------
 PKGBUILD     |   86 ++++++++++++++++++++++++++++-----------------------------
 3 files changed, 114 insertions(+), 114 deletions(-)

Deleted: 25555.patch
===================================================================
--- 25555.patch	2020-08-27 20:44:53 UTC (rev 689983)
+++ 25555.patch	2020-08-27 20:45:05 UTC (rev 689984)
@@ -1,42 +0,0 @@
-From ec032370f2459544a0b5e2b995699dab29e580ef Mon Sep 17 00:00:00 2001
-From: Kevin Burke <kevin at meter.com>
-Date: Sun, 12 Jul 2020 14:35:27 -0700
-Subject: [PATCH] helper/schema: ensure test works with Go 1.15 error messages
-
-I verified that the code itself does not have similar assertions about
-the error message that would break if a different string was returned
-for the error message.
-
-Fixes #25553.
----
- helper/schema/provider_test.go | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go
-index 01ee82a1f4d..13809b35bbf 100644
---- a/helper/schema/provider_test.go
-+++ b/helper/schema/provider_test.go
-@@ -3,7 +3,7 @@ package schema
- import (
- 	"fmt"
- 	"reflect"
--	"strings"
-+	"regexp"
- 	"testing"
- 	"time"
- 
-@@ -341,9 +341,11 @@ func TestProviderDiff_timeoutInvalidValue(t *testing.T) {
- 	if err == nil {
- 		t.Fatal("Expected provider.Diff to fail with invalid timeout value")
- 	}
--	expectedErrMsg := "time: invalid duration invalid"
--	if !strings.Contains(err.Error(), expectedErrMsg) {
--		t.Fatalf("Unexpected error message: %q\nExpected message to contain %q",
-+	// Go 1.15 added quotes around the invalid duration value. You can remove
-+	// the regex once Go 1.14 and below are no longer supported.
-+	expectedErrMsg := regexp.MustCompile(`time: invalid duration "?invalid"?`)
-+	if !expectedErrMsg.MatchString(err.Error()) {
-+		t.Fatalf("Unexpected error message: %q\nExpected message to match rx %q",
- 			err.Error(),
- 			expectedErrMsg)
- 	}

Copied: terraform/repos/community-x86_64/25555.patch (from rev 689983, terraform/trunk/25555.patch)
===================================================================
--- 25555.patch	                        (rev 0)
+++ 25555.patch	2020-08-27 20:45:05 UTC (rev 689984)
@@ -0,0 +1,42 @@
+From ec032370f2459544a0b5e2b995699dab29e580ef Mon Sep 17 00:00:00 2001
+From: Kevin Burke <kevin at meter.com>
+Date: Sun, 12 Jul 2020 14:35:27 -0700
+Subject: [PATCH] helper/schema: ensure test works with Go 1.15 error messages
+
+I verified that the code itself does not have similar assertions about
+the error message that would break if a different string was returned
+for the error message.
+
+Fixes #25553.
+---
+ helper/schema/provider_test.go | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go
+index 01ee82a1f4d..13809b35bbf 100644
+--- a/helper/schema/provider_test.go
++++ b/helper/schema/provider_test.go
+@@ -3,7 +3,7 @@ package schema
+ import (
+ 	"fmt"
+ 	"reflect"
+-	"strings"
++	"regexp"
+ 	"testing"
+ 	"time"
+ 
+@@ -341,9 +341,11 @@ func TestProviderDiff_timeoutInvalidValue(t *testing.T) {
+ 	if err == nil {
+ 		t.Fatal("Expected provider.Diff to fail with invalid timeout value")
+ 	}
+-	expectedErrMsg := "time: invalid duration invalid"
+-	if !strings.Contains(err.Error(), expectedErrMsg) {
+-		t.Fatalf("Unexpected error message: %q\nExpected message to contain %q",
++	// Go 1.15 added quotes around the invalid duration value. You can remove
++	// the regex once Go 1.14 and below are no longer supported.
++	expectedErrMsg := regexp.MustCompile(`time: invalid duration "?invalid"?`)
++	if !expectedErrMsg.MatchString(err.Error()) {
++		t.Fatalf("Unexpected error message: %q\nExpected message to match rx %q",
+ 			err.Error(),
+ 			expectedErrMsg)
+ 	}

Deleted: CHANGELOG.md
===================================================================
--- CHANGELOG.md	2020-08-27 20:44:53 UTC (rev 689983)
+++ CHANGELOG.md	2020-08-27 20:45:05 UTC (rev 689984)
@@ -1,29 +0,0 @@
-## 0.13.0 (Unreleased)
-
-BREAKING CHANGES:
-
-* command/import: remove the deprecated `-provider` command line argument [GH-24090]
-#22862 fixed a bug where the `import` command was not properly attaching the configured provider for a resource to be imported, making the `-provider` command line argument unnecessary. 
-* config: Inside `provisioner` blocks that have `when = destroy` set, and inside any `connection` blocks that are used by such `provisioner` blocks, it is now an error to refer to any objects other than `self`, `count`, or `each` [GH-24083]
-* config: The `merge` function now returns more precise type information, making it usable for values passed to `for_each` [GH-24032]
-* The official MacOS builds of Terraform CLI are no longer compatible with Mac OS 10.10 Yosemite; Terraform now requires at least Mac OS 10.11 El Capitan. Terraform 0.13 is the last major release that will support 10.11 El Capitan, so if you are upgrading your OS we recommend upgrading to Mac OS 10.12 Sierra or later.
-* The official FreeBSD builds of Terraform CLI are no longer compatible with FreeBSD 10.x, which has reached end-of-life. Terraform now requires FreeBSD 11.2 or later.
-
-ENHANCEMENTS:
-* config: `templatefile` function will now return a helpful error message if a given variable has an invalid name, rather than relying on a syntax error in the template parsing itself. [GH-24184]
-* config: The configuration language now uses Unicode 12.0 character tables for certain Unicode-version-sensitive operations on strings, such as the `upper` and `lower` functions. Those working with strings containing new characters introduced since Unicode 9.0 may see small differences in behavior as a result of these table updates.
-* Terraform CLI now supports TLS 1.3 and supports Ed25519 certificates when making outgoing connections to remote TLS servers. While both of these changes are backwards compatible in principle, certain legacy TLS server implementations can reportedly encounter problems when attempting to negotiate TLS 1.3. (These changes affects only requests made by Terraform CLI itself, such as to module registries or backends. Provider plugins have separate TLS implementations that will gain these features on a separate release schedule.)
-* On Unix systems where `use-vc` is set in `resolv.conf`, Terraform will now use TCP for DNS resolution. We don't expect this to cause any problem for most users, but if you find you are seeing DNS resolution failures after upgrading please verify that you can either reach your configured nameservers using TCP or that your resolver configuration does not include the `use-vc` directive.
-
-BUG FIXES: 
-* cli: Fix `terraform state mv` to correctly set the resource each mode based on the target address [GH-24254]
-* cli: The `terraform plan` command (and the implied plan run by `terraform apply` with no arguments) will now print any warnings that were generated even if there are no changes to be made. [GH-24095]
-* command/show (json output): fix inconsistency in resource addresses between plan and prior state output [GH-24256]
-* core: Instances are now destroyed only using their stored state, removing many cycle errors [GH-24083]
-* lang: Fix non-string key panics in map function [GH-24277]
-
----
-For information on prior major releases, see their changelogs:
-
-* [v0.12](https://github.com/hashicorp/terraform/blob/v0.12/CHANGELOG.md)
-* [v0.11 and earlier](https://github.com/hashicorp/terraform/blob/v0.11/CHANGELOG.md)

Copied: terraform/repos/community-x86_64/CHANGELOG.md (from rev 689983, terraform/trunk/CHANGELOG.md)
===================================================================
--- CHANGELOG.md	                        (rev 0)
+++ CHANGELOG.md	2020-08-27 20:45:05 UTC (rev 689984)
@@ -0,0 +1,29 @@
+## 0.13.0 (Unreleased)
+
+BREAKING CHANGES:
+
+* command/import: remove the deprecated `-provider` command line argument [GH-24090]
+#22862 fixed a bug where the `import` command was not properly attaching the configured provider for a resource to be imported, making the `-provider` command line argument unnecessary. 
+* config: Inside `provisioner` blocks that have `when = destroy` set, and inside any `connection` blocks that are used by such `provisioner` blocks, it is now an error to refer to any objects other than `self`, `count`, or `each` [GH-24083]
+* config: The `merge` function now returns more precise type information, making it usable for values passed to `for_each` [GH-24032]
+* The official MacOS builds of Terraform CLI are no longer compatible with Mac OS 10.10 Yosemite; Terraform now requires at least Mac OS 10.11 El Capitan. Terraform 0.13 is the last major release that will support 10.11 El Capitan, so if you are upgrading your OS we recommend upgrading to Mac OS 10.12 Sierra or later.
+* The official FreeBSD builds of Terraform CLI are no longer compatible with FreeBSD 10.x, which has reached end-of-life. Terraform now requires FreeBSD 11.2 or later.
+
+ENHANCEMENTS:
+* config: `templatefile` function will now return a helpful error message if a given variable has an invalid name, rather than relying on a syntax error in the template parsing itself. [GH-24184]
+* config: The configuration language now uses Unicode 12.0 character tables for certain Unicode-version-sensitive operations on strings, such as the `upper` and `lower` functions. Those working with strings containing new characters introduced since Unicode 9.0 may see small differences in behavior as a result of these table updates.
+* Terraform CLI now supports TLS 1.3 and supports Ed25519 certificates when making outgoing connections to remote TLS servers. While both of these changes are backwards compatible in principle, certain legacy TLS server implementations can reportedly encounter problems when attempting to negotiate TLS 1.3. (These changes affects only requests made by Terraform CLI itself, such as to module registries or backends. Provider plugins have separate TLS implementations that will gain these features on a separate release schedule.)
+* On Unix systems where `use-vc` is set in `resolv.conf`, Terraform will now use TCP for DNS resolution. We don't expect this to cause any problem for most users, but if you find you are seeing DNS resolution failures after upgrading please verify that you can either reach your configured nameservers using TCP or that your resolver configuration does not include the `use-vc` directive.
+
+BUG FIXES: 
+* cli: Fix `terraform state mv` to correctly set the resource each mode based on the target address [GH-24254]
+* cli: The `terraform plan` command (and the implied plan run by `terraform apply` with no arguments) will now print any warnings that were generated even if there are no changes to be made. [GH-24095]
+* command/show (json output): fix inconsistency in resource addresses between plan and prior state output [GH-24256]
+* core: Instances are now destroyed only using their stored state, removing many cycle errors [GH-24083]
+* lang: Fix non-string key panics in map function [GH-24277]
+
+---
+For information on prior major releases, see their changelogs:
+
+* [v0.12](https://github.com/hashicorp/terraform/blob/v0.12/CHANGELOG.md)
+* [v0.11 and earlier](https://github.com/hashicorp/terraform/blob/v0.11/CHANGELOG.md)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-27 20:44:53 UTC (rev 689983)
+++ PKGBUILD	2020-08-27 20:45:05 UTC (rev 689984)
@@ -1,43 +0,0 @@
-# Maintainer: Jerome Leclanche <jerome at leclan.ch>
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
-
-pkgname=terraform
-pkgver=0.13.0
-pkgrel=1
-pkgdesc="HashiCorp tool for building and updating infrastructure as code idempotently"
-url="https://www.terraform.io/"
-arch=("x86_64")
-license=("MPL")
-makedepends=("go")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/terraform/archive/v$pkgver.tar.gz"
-	"25555.patch")
-sha512sums=('9f789b89466b74128ad75dd6b34c1ccf0f7d2b233ea6a6866a09014dd8c7023c1e5c156bcc9e0834c8fdf06e62694d81d4585fee4829c6fd95129c6cd8645798'
-            'bb88abb0b57d2a1f779df2036fe529cb17c95fbfc8831a79fdb7a97a7790d3e7247998c2757d7dd7c6193dd48bc99893363363dcf2b26f6d1ecc6f4cb2568c2a')
-changelog="CHANGELOG.md"
-
-prepare() {
-	cd "$pkgname-$pkgver"
-	#  helper/schema: ensure test works with Go 1.15 error messages
-	patch -p1 < "${srcdir}/25555.patch"
-}
-
-build() {
-	cd "$pkgname-$pkgver"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-	go build -o terraform-binary
-}
-
-check() {
-	cd "${pkgname}-${pkgver}"
-	go test -mod=vendor ./...
-}
-
-package() {
-	cd "$pkgname-$pkgver"
-	install -Dm755 terraform-binary "$pkgdir/usr/bin/terraform"
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: terraform/repos/community-x86_64/PKGBUILD (from rev 689983, terraform/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-27 20:45:05 UTC (rev 689984)
@@ -0,0 +1,43 @@
+# Maintainer: Jerome Leclanche <jerome at leclan.ch>
+# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+
+pkgname=terraform
+pkgver=0.13.1
+pkgrel=1
+pkgdesc="HashiCorp tool for building and updating infrastructure as code idempotently"
+url="https://www.terraform.io/"
+arch=("x86_64")
+license=("MPL")
+makedepends=("go")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/terraform/archive/v$pkgver.tar.gz"
+	"25555.patch")
+sha512sums=('10cb69d5eeeb692fe5c423c0326ee1248115de89c52e3e10e350108fa7e9bcfea1133fc7c3eb1ee3e3391608e9ab05bae6b0f00de68210ecdca8b13f0e4314a4'
+            'bb88abb0b57d2a1f779df2036fe529cb17c95fbfc8831a79fdb7a97a7790d3e7247998c2757d7dd7c6193dd48bc99893363363dcf2b26f6d1ecc6f4cb2568c2a')
+changelog="CHANGELOG.md"
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	#  helper/schema: ensure test works with Go 1.15 error messages
+	patch -p1 < "${srcdir}/25555.patch"
+}
+
+build() {
+	cd "$pkgname-$pkgver"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	go build -o terraform-binary
+}
+
+check() {
+	cd "${pkgname}-${pkgver}"
+	go test -mod=vendor ./...
+}
+
+package() {
+	cd "$pkgname-$pkgver"
+	install -Dm755 terraform-binary "$pkgdir/usr/bin/terraform"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}



More information about the arch-commits mailing list