fix: gitlab & bitbucket actions (#430)

* chore: move defaults to code

* fix: gitlab & bitbucket actions

Author: mathio

action.yml

@@ -26,13 +26,10 @@ inputs:
     required: false
   commit-message:
     description: "Commit message"
-    default: "feat: update translations via @lingodotdev"
     required: false
   pull-request-title:
     description: "Pull request title"
-    default: "feat: update translations via @lingodotdev"
     required: false
   working-directory:
     description: "Working directory"
-    default: "."
     required: false

action/src/flows/in-branch.ts

@@ -63,6 +63,9 @@ export class InBranchFlow extends IntegrationFlow {
     execSync(`git config user.name "${gitConfig.userName}"`);
     execSync(`git config user.email "${gitConfig.userEmail}"`);
 
+    // perform platform-specific configuration before fetching or pushing to the remote
+    this.platformKit?.gitConfig();
+
     execSync(`git fetch origin ${baseBranchName}`, { stdio: "inherit" });
     execSync(`git checkout ${baseBranchName} --`, { stdio: "inherit" });
 
@@ -73,8 +76,6 @@ export class InBranchFlow extends IntegrationFlow {
       return false;
     }
 
-    this.platformKit?.gitConfig();
-
     const workingDir = path.resolve(process.cwd(), this.platformKit.config.workingDir);
     if (workingDir !== process.cwd()) {
       this.ora.info(`Changing to working directory: ${this.platformKit.config.workingDir}`);

action/src/platforms/_base.ts

@@ -1,5 +1,7 @@
 import Z from "zod";
 
+const defaultMessage = "feat: update translations via @lingodotdev";
+
 interface BasePlatformConfig {
   baseBranchName: string;
   repositoryOwner: string;
@@ -27,17 +29,17 @@ export abstract class PlatformKit<PlatformConfig extends BasePlatformConfig = Ba
     const env = Z.object({
       LINGODOTDEV_API_KEY: Z.string(),
       LINGODOTDEV_PULL_REQUEST: Z.preprocess((val) => val === "true" || val === true, Z.boolean()),
-      LINGODOTDEV_COMMIT_MESSAGE: Z.string(),
-      LINGODOTDEV_PULL_REQUEST_TITLE: Z.string(),
-      LINGODOTDEV_WORKING_DIRECTORY: Z.string().optional().default("."),
+      LINGODOTDEV_COMMIT_MESSAGE: Z.string().optional(),
+      LINGODOTDEV_PULL_REQUEST_TITLE: Z.string().optional(),
+      LINGODOTDEV_WORKING_DIRECTORY: Z.string().optional(),
     }).parse(process.env);
 
     return {
       replexicaApiKey: env.LINGODOTDEV_API_KEY,
       isPullRequestMode: env.LINGODOTDEV_PULL_REQUEST,
-      commitMessage: env.LINGODOTDEV_COMMIT_MESSAGE,
-      pullRequestTitle: env.LINGODOTDEV_PULL_REQUEST_TITLE,
-      workingDir: env.LINGODOTDEV_WORKING_DIRECTORY,
+      commitMessage: env.LINGODOTDEV_COMMIT_MESSAGE || defaultMessage,
+      pullRequestTitle: env.LINGODOTDEV_PULL_REQUEST_TITLE || defaultMessage,
+      workingDir: env.LINGODOTDEV_WORKING_DIRECTORY || ".",
     };
   }
 }

action/src/platforms/bitbucket.ts

@@ -92,7 +92,12 @@ export class BitbucketPlatformKit extends PlatformKit<BitbucketConfig> {
   }
 
   async gitConfig() {
-    execSync("git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://host.docker.internal:29418/");
+    execSync("git config --unset http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy", {
+      stdio: "inherit",
+    });
+    execSync("git config http.${BITBUCKET_GIT_HTTP_ORIGIN}.proxy http://host.docker.internal:29418/", {
+      stdio: "inherit",
+    });
   }
 
   get platformConfig() {

action/src/platforms/gitlab.ts

@@ -91,13 +91,10 @@ export class GitlabPlatformKit extends PlatformKit {
   }
 
   gitConfig(): Promise<void> | void {
-    const url = `https://gitlab-ci-token:${this.platformConfig.glToken}@gitlab.com/${this.platformConfig.repositoryOwner}/${this.platformConfig.repositoryName}.git`;
+    const url = `https://oauth2:${this.platformConfig.glToken}@gitlab.com/${this.platformConfig.repositoryOwner}/${this.platformConfig.repositoryName}.git`;
     execSync(`git remote set-url origin ${url}`, {
       stdio: "inherit",
     });
-    execSync(`git checkout -b ${this.platformConfig.baseBranchName}`, {
-      stdio: "inherit",
-    });
   }
 
   buildPullRequestUrl(pullRequestNumber: number): string {