FAH bugfixes

CHANGELOG.md

@@ -0,0 +1 @@
+Bugfixes to internal utilities (#6754)

src/commands/apphosting-builds-create.ts

@@ -16,12 +16,12 @@ export const command = new Command("apphosting:builds:create <backendId>")
     const buildId =
       (options.buildId as string) ||
       (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const branch = options.branch as string;
+    const branch = (options.branch as string | undefined) ?? "main";
 
     const op = await apphosting.createBuild(projectId, location, backendId, buildId, {
       source: {
         codebase: {
-          branch: "main",
+          branch,
         },
       },
     });

src/gcp/apphosting.ts

@@ -261,7 +261,7 @@
   done: boolean;
   // oneof result
   error?: Status;
   response?: any;
   // end oneof result
 }
 
@@ -463,7 +463,7 @@
   // correct.
   const trafficCopy = { ...traffic };
   if ("rolloutPolicy" in traffic) {
     trafficCopy.rolloutPolicy = {} as any;
   }
   const fieldMasks = proto.fieldMasks(trafficCopy);
   const queryParams = {
@@ -512,14 +512,14 @@
 /**
  * Ensure that Frameworks API is enabled on the project.
  */
 export async function ensureApiEnabled(options: any): Promise<void> {
   const projectId = needProjectId(options);
   return await ensure(projectId, API_HOST, "frameworks", true);
 }
 
 /**
  * Generates the next build ID to fit with the naming scheme of the backend API.
  * @param counter Overrides the counter to use, avoiding an API call.
  */
 export async function getNextRolloutId(
   projectId: string,
@@ -531,7 +531,7 @@
   const year = date.getUTCFullYear();
   // Note: month is 0 based in JS
   const month = String(date.getUTCMonth() + 1).padStart(2, "0");
-  const day = String(date.getUTCDay()).padStart(2, "0");
+  const day = String(date.getUTCDate()).padStart(2, "0");
 
   if (counter) {
     return `build-${year}-${month}-${day}-${String(counter).padStart(3, "0")}`;

src/test/gcp/apphosting.spec.ts

@@ -17,7 +17,7 @@ describe("apphosting", () => {
     function idPrefix(date: Date): string {
       const year = date.getUTCFullYear();
       const month = String(date.getUTCMonth() + 1).padStart(2, "0");
-      const day = String(date.getUTCDay()).padStart(2, "0");
+      const day = String(date.getUTCDate()).padStart(2, "0");
       return `build-${year}-${month}-${day}`;
     }