fix(owlbot-bootstrapper): do not check for intercontainervars before it exists (#4042)

* fix(owlbot-bootstrapper): do not check for intercontainervars before it exists

Author: sofisl

packages/owlbot-bootstrapper/common-container/test/mono-repo.test.ts

@@ -40,17 +40,6 @@ describe('MonoRepo class', async () => {
       await execSync(
         `mkdir ${repoToClonePath}; cd ${repoToClonePath}; git init`
       );
-      fs.writeFileSync(
-        `${directoryPath}/${utils.INTER_CONTAINER_VARS_FILE}`,
-        JSON.stringify(
-          {
-            branchName: 'specialName',
-            owlbotYamlPath: 'packages/google-cloud-kms/.OwlBot.yaml',
-          },
-          null,
-          4
-        )
-      );
     } catch (err) {
       if (!(err as any).toString().match(/File exists/)) {
         throw err;

packages/owlbot-bootstrapper/common-container/test/split-repo.test.ts

@@ -39,17 +39,6 @@ describe('SplitRepo class', async () => {
       await execSync(
         `mkdir ${repoToClonePath}; cd ${repoToClonePath}; git init --bare`
       );
-      fs.writeFileSync(
-        `${directoryPath}/${utils.INTER_CONTAINER_VARS_FILE}`,
-        JSON.stringify(
-          {
-            branchName: 'specialName',
-            owlbotYamlPath: 'packages/google-cloud-kms/.OwlBot.yaml',
-          },
-          null,
-          4
-        )
-      );
     } catch (err) {
       if (!(err as any).toString().match(/File exists/)) {
         throw err;
@@ -192,6 +181,17 @@ describe('SplitRepo class', async () => {
   });
 
   it('should create and initialize an empty repo on github, then push to main and create an empty PR', async () => {
+    fs.writeFileSync(
+      `${directoryPath}/${utils.INTER_CONTAINER_VARS_FILE}`,
+      JSON.stringify(
+        {
+          branchName: 'specialName',
+          owlbotYamlPath: 'packages/google-cloud-kms/.OwlBot.yaml',
+        },
+        null,
+        4
+      )
+    );
     const scope = nock('https://api.github.com')
       .post('/orgs/googleapis/repos')
       .reply(201)

packages/owlbot-bootstrapper/common-container/utils.ts

@@ -88,12 +88,7 @@ export async function openABranch(repoName: string, directoryPath: string) {
   const branchName = `${BRANCH_NAME_PREFIX}-${UUID}`;
   logger.info(`Opening branch ${branchName} on ${repoName}`);
   try {
-    // Need to get contents first, to make sure we're not overwriting any other information
-    const contents = getWellKnownFileContents(
-      directoryPath,
-      INTER_CONTAINER_VARS_FILE
-    );
-    contents.branchName = branchName;
+    const contents = {branchName};
     fs.writeFileSync(
       `${directoryPath}/${INTER_CONTAINER_VARS_FILE}`,
       JSON.stringify(contents, null, 4)