From 9617d2a14f5716d5ebdb4338cff3def03c822789 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Tue, 18 Oct 2022 15:28:48 +0300
Subject: [PATCH] Publish Linux Packages: Fix bad secret name (#56708) (#57174)

:facepalm:

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit 72b9555487ba00c1c3c8212dfb6af3a968c036a9)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
---
 .drone.yml                   | 10 +++++-----
 scripts/drone/steps/lib.star |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f82031c3708..c4789711795 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3840,7 +3840,7 @@ steps:
     secret_access_key:
       from_secret: packages_secret_access_key
     service_account_json:
-      from_secret: packages_service_account_json
+      from_secret: packages_service_account
     target_bucket: grafana-packages
 - depends_on:
   - grabpl
@@ -3862,7 +3862,7 @@ steps:
     secret_access_key:
       from_secret: packages_secret_access_key
     service_account_json:
-      from_secret: packages_service_account_json
+      from_secret: packages_service_account
     target_bucket: grafana-packages
 trigger:
   event:
@@ -3951,7 +3951,7 @@ steps:
     secret_access_key:
       from_secret: packages_secret_access_key
     service_account_json:
-      from_secret: packages_service_account_json
+      from_secret: packages_service_account
     target_bucket: grafana-packages
 - depends_on:
   - grabpl
@@ -3973,7 +3973,7 @@ steps:
     secret_access_key:
       from_secret: packages_secret_access_key
     service_account_json:
-      from_secret: packages_service_account_json
+      from_secret: packages_service_account
     target_bucket: grafana-packages
 trigger:
   event:
@@ -5612,6 +5612,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 9e279c40640c4c3485b124fa6d72b4eca52a5bcefff86c7d01d40e550cfe3315
+hmac: 32fd3238c41c567091d1a3a654de77a138e66a28bf47799c982629960e53d806
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 145784c2ee2..41b84488e13 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1057,7 +1057,7 @@ def publish_linux_packages_step(edition, package_manager='deb'):
         'settings': {
             'access_key_id': from_secret('packages_access_key_id'),
             'secret_access_key': from_secret('packages_secret_access_key'),
-            'service_account_json': from_secret('packages_service_account_json'),
+            'service_account_json': from_secret('packages_service_account'),
             'target_bucket': 'grafana-packages',
             'deb_distribution': 'stable',
             'gpg_passphrase': from_secret('packages_gpg_passphrase'),