Use Language type

github · Jan 14, 2025 · f33e08c · f33e08c
1 parent de0f9cf
commit f33e08c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/languages.ts b/src/languages.ts
@@ -19,6 +19,8 @@ export const LANGUAGE_ALIASES: { [lang: string]: Language } = {
   "c#": Language.csharp,
   kotlin: Language.java,
   typescript: Language.javascript,
+  "javascript-typescript": Language.javascript,
+  "java-kotlin": Language.java,
 };
 
 /**

diff --git a/src/start-proxy-action.ts b/src/start-proxy-action.ts
@@ -8,6 +8,7 @@ import { pki } from "node-forge";
 import * as actionsUtil from "./actions-util";
 import { getActionsLogger, Logger } from "./logging";
 import * as util from "./util";
+import { Language, parseLanguage } from "./languages";
 
 const UPDATEJOB_PROXY = "update-job-proxy";
 const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
@@ -17,10 +18,18 @@ const PROXY_USER = "proxy_user";
 const KEY_SIZE = 2048;
 const KEY_EXPIRY_YEARS = 2;
 
-const LANGUAGE_TO_REGISTRY_TYPE = {
-  "java-kotlin": "maven_repository",
+const LANGUAGE_TO_REGISTRY_TYPE: Record<Language, string> = {
   java: "maven_repository",
   csharp: "nuget_feed",
+  javascript: "npm_registry",
+  python: "python_index",
+  ruby: "rubygems_server",
+  rust: "cargo_registry",
+  // We do not have an established proxy type for these languages, thus leaving empty.
+  actions: "",
+  cpp: "",
+  go: "",
+  swift: "",
 } as const;
 
 type CertificateAuthority = {
@@ -198,7 +207,9 @@ function getCredentials(logger: Logger): Credential[] {
     "registries_credentials",
   );
   const registrySecrets = actionsUtil.getOptionalInput("registry_secrets");
-  const language = actionsUtil.getOptionalInput("language");
+  const languageString = actionsUtil.getOptionalInput("language");
+  const language = languageString ? parseLanguage(languageString) : undefined;
+  const registryTypeForLanguage = language ? LANGUAGE_TO_REGISTRY_TYPE[language] : undefined;
 
   let credentialsStr: string;
   if (registriesCredentials !== undefined) {
@@ -222,8 +233,8 @@ function getCredentials(logger: Logger): Credential[] {
 
     // Filter credentials based on language if specified. `type` is the registry type.
     // E.g., "maven_feed" for Java/Kotlin, "nuget_repository" for C#.
-    if (language && LANGUAGE_TO_REGISTRY_TYPE[language] !== e.type) {
-      continue;
+    if (e.type != registryTypeForLanguage) {
+        continue;
     }
 
     out.push({