launchpad-reviewers team mailing list archive

[Colin Watson <mp+441598@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-charmhub-secrets-private-key into launchpad:master.

Commit message:
charm: Add charmhub_secrets_private_key

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/441598

Otherwise Charmhub authorization doesn't work when authorizing upload of charm recipe builds.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-charmhub-secrets-private-key into launchpad:master.

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) }}