Skip to content

Commit 06beb2d

Browse files
committed
chore: remove unused charmhub discourse credentials
1 parent 023d5bc commit 06beb2d

5 files changed

Lines changed: 1 addition & 36 deletions

File tree

.env

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ RECAPTCHA_SCORE_THRESHOLD=0.5
2525
# Secret for sitemap endpoint
2626
SITEMAP_SECRET=somesecret
2727

28-
# Charmhub API
29-
CHARMHUB_DISCOURSE_API_KEY=charmhub_discourse_api_key
30-
CHARMHUB_DISCOURSE_API_USER=charmhub_discourse_api_user
31-
3228
# DiscourseAPI
3329
DISCOURSE_API_KEY=discourse_api_key
3430
DISCOURSE_API_USERNAME=discourse_api_username

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ djlint templates/path/to/file.html --lint --profile=jinja # djlint for html/ji
9898

9999
| Service | Purpose | Key Env Vars |
100100
| ------------- | -------------------------------- | ------------ |
101-
| Discourse API | Blog, takeovers, docs, tutorials | `DISCOURSE_API_KEY`, `DISCOURSE_API_USERNAME`, `CHARMHUB_DISCOURSE_API_KEY`, `CHARMHUB_DISCOURSE_API_USERNAME`, `MAAS_DISCOURSE_API_KEY`, `MAAS_DISCOURSE_API_USERNAME` |
101+
| Discourse API | Blog, takeovers, docs, tutorials | `DISCOURSE_API_KEY`, `DISCOURSE_API_USERNAME`, `MAAS_DISCOURSE_API_KEY`, `MAAS_DISCOURSE_API_USERNAME` |
102102
| Careers | Careers related | `HARVEST_API_KEY`, `APPLICATION_CRYPTO_SECRET_KEY` |
103103
| Greenhouse | Candidate applications | `GREENHOUSE_API_KEY` |
104104
| Google Calendar | Google Calendar service-account auth | `SERVICE_ACCOUNT_EMAIL`, `SERVICE_ACCOUNT_PRIVATE_KEY` |

charm/charmcraft.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ config:
3030
type: string
3131
description: "Canonical CLA API URL"
3232
default: "https://cla.staging.canonical.com"
33-
charmhub-discourse-api-key:
34-
type: string
35-
description: "Charmhub Discourse API key"
36-
default: "charmhub_discourse_api_key"
37-
charmhub-discourse-api-user:
38-
type: string
39-
description: "Charmhub Discourse API user"
40-
default: "charmhub_discourse_api_user"
4133
directory-api-token:
4234
description: "Directory API token"
4335
default: "disrectory_api_token"

konf/site.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ env:
6262
key: ubuntu-api-username
6363
name: discourse-api
6464

65-
- name: CHARMHUB_DISCOURSE_API_KEY
66-
secretKeyRef:
67-
key: charmhub-api-key
68-
name: discourse-api
69-
70-
- name: CHARMHUB_DISCOURSE_API_USERNAME
71-
secretKeyRef:
72-
key: charmhub-api-username
73-
name: discourse-api
74-
7565
- name: MAAS_DISCOURSE_API_KEY
7666
secretKeyRef:
7767
key: maas-api-key

webapp/app.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@
122122
# Serves any page as Markdown via ?format=md query parameter
123123
MarkdownResponse(app)
124124

125-
# Load env variables after the app is initialized
126-
CHARMHUB_DISCOURSE_API_KEY = os.getenv("CHARMHUB_DISCOURSE_API_KEY")
127-
CHARMHUB_DISCOURSE_API_USERNAME = os.getenv("CHARMHUB_DISCOURSE_API_USERNAME")
128-
129125
RECAPTCHA_CONFIG = load_recaptcha_config()
130126
RECAPTCHA_SITE_KEY = RECAPTCHA_CONFIG.get("site_key")
131127
if not RECAPTCHA_SITE_KEY:
@@ -147,15 +143,6 @@
147143

148144
# Loader supplied to jinja_loader overwrites default jinja_loader
149145
app.jinja_loader = loader
150-
151-
charmhub_discourse_api = DiscourseAPI(
152-
base_url="https://discourse.charmhub.io/",
153-
session=get_requests_session(),
154-
api_key=CHARMHUB_DISCOURSE_API_KEY,
155-
api_username=CHARMHUB_DISCOURSE_API_USERNAME,
156-
get_topics_query_id=2,
157-
cache=ResponseCache(ttl=600),
158-
)
159146
search_session = get_requests_session()
160147
discourse_session = get_requests_session()
161148

0 commit comments

Comments
 (0)