initial (#6951)

Author: abhis3

src/apphosting/repo.ts

@@ -243,7 +243,7 @@ async function promptRepositoryUri(
 
 async function ensureSecretManagerAdminGrant(projectId: string): Promise<void> {
   const projectNumber = await getProjectNumber({ projectId });
-  const cbsaEmail = gcb.getDefaultServiceAccount(projectNumber);
+  const cbsaEmail = gcb.getDefaultServiceAgent(projectNumber);
 
   const alreadyGranted = await rm.serviceAccountHasRoles(
     projectId,

src/gcp/cloudbuild.ts

@@ -222,13 +222,13 @@ export async function deleteRepository(
  * This service account is deprecated and future users should bring their own account.
  */
 export function getDefaultServiceAccount(projectNumber: string): string {
-  return `service-${projectNumber}@gcp-sa-cloudbuild.iam.gserviceaccount.com`;
+  return `${projectNumber}@cloudbuild.gserviceaccount.com`;
 }
 
 /**
  * Returns the default cloud build service agent.
  * This is the account that Cloud Build itself uses when performing operations on the user's behalf.
  */
 export function getDefaultServiceAgent(projectNumber: string): string {
-  return `${projectNumber}@cloudbuild.gserviceaccount.com`;
+  return `service-${projectNumber}@gcp-sa-cloudbuild.iam.gserviceaccount.com`;
 }