From 6cf211a1e1aa736d30cbf4dd6912631747ebdad0 Mon Sep 17 00:00:00 2001
From: Simon Unge <simunge@amazon.com>
Date: Mon, 7 Oct 2024 20:31:58 +0000
Subject: [PATCH] Dependency thoas updated from 1.0.0 to 1.2.1

(cherry picked from commit 13bf5c005e4077c7d685f11be39728ca482a81fc)

Conflicts:
	rabbitmq-components.mk
(cherry picked from commit 679eaa1913f08e4255c6ab8be9b91f91c45491bf)

Conflicts:
	rabbitmq-components.mk
---
 MODULE.bazel           |  4 ++--
 bazel/BUILD.thoas      | 34 +++++++++++++++-------------------
 rabbitmq-components.mk |  2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 70e985d6d6ae..c413c5ec65f7 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -224,8 +224,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "thoas",
     build_file = "@rabbitmq-server//bazel:BUILD.thoas",
-    sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
-    version = "1.0.0",
+    sha256 = "e38697edffd6e91bd12cea41b155115282630075c2a727e7a6b2947f5408b86a",
+    version = "1.2.1",
 )
 
 erlang_package.hex_package(
diff --git a/bazel/BUILD.thoas b/bazel/BUILD.thoas
index 2f8e7aa232c6..bd56cf881b18 100644
--- a/bazel/BUILD.thoas
+++ b/bazel/BUILD.thoas
@@ -22,14 +22,9 @@ erlang_bytecode(
         "src/thoas_decode.erl",
         "src/thoas_encode.erl",
     ],
-    outs = [
-        "ebin/thoas.beam",
-        "ebin/thoas_decode.beam",
-        "ebin/thoas_encode.beam",
-    ],
-    hdrs = [],
+    hdrs = [":public_and_private_hdrs"],
     app_name = "thoas",
-    beam = [],
+    dest = "ebin",
     erlc_opts = "//:erlc_opts",
 )
 
@@ -48,20 +43,11 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "private_hdrs",
-    srcs = [],
-)
+filegroup(name = "private_hdrs")
 
-filegroup(
-    name = "public_hdrs",
-    srcs = [],
-)
+filegroup(name = "public_hdrs")
 
-filegroup(
-    name = "priv",
-    srcs = [],
-)
+filegroup(name = "priv")
 
 filegroup(
     name = "licenses",
@@ -87,8 +73,11 @@ filegroup(
 erlang_app(
     name = "erlang_app",
     srcs = [":all_srcs"],
+    hdrs = [":public_hdrs"],
     app_name = "thoas",
     beam_files = [":beam_files"],
+    license_files = [":license_files"],
+    priv = [":priv"],
 )
 
 alias(
@@ -96,3 +85,10 @@ alias(
     actual = ":erlang_app",
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "license_files",
+    srcs = [
+        "LICENSE",
+    ],
+)
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 912845e4ee47..d11571d3bf75 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -55,7 +55,7 @@ dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.6
 dep_redbug = hex 2.0.7
 dep_systemd = hex 0.6.1
-dep_thoas = hex 1.0.0
+dep_thoas = hex 1.2.1
 dep_observer_cli = hex 1.7.5
 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 dep_stdout_formatter = hex 0.2.4