From db1d9ea8e7a3d38d827ec9c79a37ed90f17bd0f6 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 19 Aug 2021 13:52:24 -0400 Subject: [PATCH 1/5] Upgrade snappy to fix panic with identity/packer on Go 1.16+arm64. --- sdk/go.mod | 2 +- sdk/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/go.mod b/sdk/go.mod index 7ed13c4e62899..7f43aff280cf8 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-ldap/ldap/v3 v3.1.10 github.com/go-test/deep v1.0.2 github.com/golang/protobuf v1.4.2 - github.com/golang/snappy v0.0.1 + github.com/golang/snappy v0.0.4 github.com/hashicorp/errwrap v1.1.0 github.com/hashicorp/go-hclog v0.16.2 github.com/hashicorp/go-immutable-radix v1.1.0 diff --git a/sdk/go.sum b/sdk/go.sum index 5a60d1ff3a1a6..cd592f5e0f12b 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -62,6 +62,8 @@ github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= From 633a618651f3ae48496c6af37f2ff5233f0c4169 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 19 Aug 2021 13:56:52 -0400 Subject: [PATCH 2/5] Upgrade snappy to fix panic with identity/packer on Go 1.16+arm64. --- changelog/12368.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/12368.txt diff --git a/changelog/12368.txt b/changelog/12368.txt new file mode 100644 index 0000000000000..eb36e1d1603b9 --- /dev/null +++ b/changelog/12368.txt @@ -0,0 +1,3 @@ +```release-note: bug +identity: Fix a panic on arm64 platform when doing identity I/O. +``` \ No newline at end of file From d607e4cfce7cb0a4c861734e1817219ebc71c274 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 19 Aug 2021 14:20:09 -0400 Subject: [PATCH 3/5] Update go.sum. --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index 72a6161cd0c4b..d22a468b68430 100644 --- a/go.sum +++ b/go.sum @@ -474,6 +474,8 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= From 062135175bd7bf223809fd1c7cebdb7f440d0f47 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 19 Aug 2021 14:21:48 -0400 Subject: [PATCH 4/5] Fix changelog. --- changelog/{12368.txt => 12371.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{12368.txt => 12371.txt} (100%) diff --git a/changelog/12368.txt b/changelog/12371.txt similarity index 100% rename from changelog/12368.txt rename to changelog/12371.txt From e48230a09340d892d5d2064d216173396a2e163c Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 19 Aug 2021 14:26:12 -0400 Subject: [PATCH 5/5] Update sdk go.sum. --- api/go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/api/go.sum b/api/go.sum index 5a6d811f2abae..aa829363832a3 100644 --- a/api/go.sum +++ b/api/go.sum @@ -59,6 +59,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=