remove snapcraft configurations, move into base class

badges · Sep 14, 2024 · 13cefed · 13cefed
1 parent bc2df08
commit 13cefed
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 16 deletions.
diff --git a/config/custom-environment-variables.yml b/config/custom-environment-variables.yml
@@ -56,8 +56,6 @@ public:
       authorizedOrigins: 'OBS_ORIGINS'
     pypi:
       baseUri: 'PYPI_URL'
-    snapcraft:
-      baseUri: 'SNAPCRAFT_URL'
     sonar:
       authorizedOrigins: 'SONAR_ORIGINS'
     teamcity:

diff --git a/config/default.yml b/config/default.yml
@@ -24,8 +24,6 @@ public:
       authorizedOrigins: 'https://api.opensuse.org'
     pypi:
       baseUri: 'https://pypi.org'
-    snapcraft:
-      baseUri: 'https://api.snapcraft.io/v2/snaps/info'
     weblate:
       authorizedOrigins: 'https://hosted.weblate.org'
     trace: false

diff --git a/core/server/server.js b/core/server/server.js
@@ -142,9 +142,6 @@ const publicConfigSchema = Joi.object({
     pypi: {
       baseUri: requiredUrl,
     },
-    snapcraft: {
-      baseUri: requiredUrl,
-    },
     sonar: defaultService,
     teamcity: defaultService,
     weblate: defaultService,

diff --git a/doc/server-secrets.md b/doc/server-secrets.md
@@ -290,12 +290,6 @@ Create an account, sign in and obtain generate a key on your
 `PYPI_URL` can be used to optionally send all the PyPI requests to a Self-hosted Pypi registry,
 users can also override this by query parameter `pypiBaseUrl`.
 
-### Snapcraft
-
-- `SNAPCRAFT_URL` (yml: `public.snapcraft.baseUri`)
-
-`SNAPCRAFT_URL` can be used to optionally send all the Snapcraft requests to a Self-hosted Snapcraft registry.
-
 ### SymfonyInsight (formerly Sensiolabs)
 
 - `SL_INSIGHT_USER_UUID` (yml: `private.sl_insight_userUuid`)

diff --git a/services/snapcraft/snapcraft-base.js b/services/snapcraft/snapcraft-base.js
@@ -1,4 +1,3 @@
-import config from 'config'
 import { BaseJsonService, pathParam } from '../index.js'
 
 export const snapcraftPackageParam = pathParam({
@@ -8,10 +7,10 @@ export const snapcraftPackageParam = pathParam({
 
 export const snapcraftBaseParams = [snapcraftPackageParam]
 
+const snapcraftBaseUrl = 'https://api.snapcraft.io/v2/snaps/info'
+
 export default class SnapcraftBase extends BaseJsonService {
   async fetch(schema, { packageName }) {
-    const snapcraftBaseUrl =
-      config.util.toObject().public.services.snapcraft.baseUri
     return await this._requestJson({
       schema,
       url: `${snapcraftBaseUrl}/${packageName}`,