Merge ~cjwatson/launchpad:charm-charmhub-secrets-private-key into launchpad:master

[Colin Watson]

charm: Add charmhub_secrets_private_key

Otherwise Charmhub authorization doesn't work when authorizing upload of charm recipe builds.

[Colin Watson (cjwatson)]

Wait, no, this is wrong - the appserver just needs to be able to _encrypt_, not decrypt. Withdrawing this.

review: Disapprove

Unmerged commits

1c14aad... by Colin Watson on 2023-04-20

charm: Add charmhub_secrets_private_key

Otherwise Charmhub authorization doesn't work when authorizing upload of
charm recipe builds.

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

diff --git a/charm/launchpad-appserver/config.yaml b/charm/launchpad-appserver/config.yaml
index f016031..117b9eb 100644
--- a/charm/launchpad-appserver/config.yaml
+++ b/charm/launchpad-appserver/config.yaml
@@ -8,6 +8,11 @@ options:
     description: >
       Cognitive Services subscription key for the Bing Custom Search API.
     default:
+  charmhub_secrets_private_key:
+    type: string
+    description: >
+      Base64-encoded NaCl private key for decrypting Charmhub upload tokens.
+    default:
   csrf_secret:
     type: string
     description: >
diff --git a/charm/launchpad-appserver/templates/launchpad-appserver-secrets-lazr.conf b/charm/launchpad-appserver/templates/launchpad-appserver-secrets-lazr.conf
index 10da8a6..0d47a5c 100644
--- a/charm/launchpad-appserver/templates/launchpad-appserver-secrets-lazr.conf
+++ b/charm/launchpad-appserver/templates/launchpad-appserver-secrets-lazr.conf
@@ -13,6 +13,9 @@
 [bing]
 {{- opt("subscription_key", bing_subscription_key) }}
 
+[charms]
+{{- opt("charmhub_secrets_private_key", charmhub_secrets_private_key) }}
+
 [codehosting]
 {{- opt("git_macaroon_secret_key", git_macaroon_secret_key) }}