Init demo flow

firebase · svnsairam · Oct 27, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023
commit 4b3e8056870f0772a83dad601e91965b5d8c2e9b
diff --git a/src/commands/frameworks-stacks-create.ts b/src/commands/frameworks-stacks-create.ts
@@ -0,0 +1,14 @@
+import { Command } from "../command";
+import { Options } from "../options";
+import { needProjectId } from "../projectUtils";
+import requireInteractive from "../requireInteractive";
+import { doSetup } from "../init/features/frameworks";
+
+export const command = new Command("stacks:create")
+ .description("create stacks for a project")
+ .before(requireInteractive)
+ .action(async (options: Options) => {
+ const projectId = needProjectId(options);
+ await doSetup({}, projectId);
+ console.log(projectId);
+ });
diff --git a/src/commands/frameworks-stacks-delete.ts b/src/commands/frameworks-stacks-delete.ts
@@ -0,0 +1,17 @@
+import { Command } from "../command";
+import { Options } from "../options";
+import { needProjectId } from "../projectUtils";
+import requireInteractive from "../requireInteractive";
+import * as gcp from "../gcp/frameworks";
+
+export const command = new Command("stacks:delete")
+ .option("-l, --location <location>", "Stack backend location", "us-central1")
+ .option("-stack, --stackId <stackId>", "Stack backend location", "")
+ .description("list stacks for a project")
+ .before(requireInteractive)
+ .action(async (options: Options) => {
+ const projectId = needProjectId(options);
+ const location = options.location as string;
+ const stackId = options.stackId as string;
+ await gcp.deleteStack(projectId, location, stackId);
+ });
diff --git a/src/commands/frameworks-stacks-get.ts b/src/commands/frameworks-stacks-get.ts
@@ -0,0 +1,20 @@
+import { Command } from "../command";
+import { Options } from "../options";
+import { needProjectId } from "../projectUtils";
+import requireInteractive from "../requireInteractive";
+import * as gcp from "../gcp/frameworks";
+import { Stack } from "../gcp/frameworks";
+
+export const command = new Command("stacks:get")
+ .option("-l, --location <location>", "Stack backend location", "us-central1")
+ .option("--stack, --stackId <stackId>", "Id for the stack", "")
+ .description("list stacks for a project")
+ .before(requireInteractive)
+ .action(async (options: Options) => {
+ const projectId = needProjectId(options);
+ const location = options.location as string;
+ const stackId = options.stackId as string;
+ const stack: Stack = await gcp.getStack(projectId, location, stackId);
+
+ console.log(stack);
+ });
diff --git a/src/commands/frameworks-stacks-list.ts b/src/commands/frameworks-stacks-list.ts
@@ -0,0 +1,17 @@
+import { Command } from "../command";
+import { Options } from "../options";
+import { needProjectId } from "../projectUtils";
+import requireInteractive from "../requireInteractive";
+import * as gcp from "../gcp/frameworks";
+import { ListStacksResponse } from "../gcp/frameworks";
+
+export const command = new Command("stacks:list")
+ .option("-l, --location <location>", "Stack backend location", "us-central1")
+ .description("list stacks for a project")
+ .before(requireInteractive)
+ .action(async (options: Options) => {
+ const projectId = needProjectId(options);
+ const location = options.location as string;
+ const resp: ListStacksResponse = await gcp.listStack(projectId, location);
+ console.log(resp);
+ });
diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -3,11 +3,11 @@
 /**
 * Loads all commands for our parser.
 */
 export function load(client: any): any {
 function loadCommand(name: string) {
 const t0 = process.hrtime.bigint();
 const { command: cmd } = require(`./${name}`);
 cmd.register(client);
 const t1 = process.hrtime.bigint();
 const diffMS = (t1 - t0) / BigInt(1e6);
 if (diffMS > 75) {
@@ -15,7 +15,7 @@
 // console.error(`Loading ${name} took ${diffMS}ms`);
 }

 return cmd.runner();
 }

 const t0 = process.hrtime.bigint();
@@ -151,6 +151,14 @@
  client.internaltesting.functions = {};
  client.internaltesting.functions.discover = loadCommand("internaltesting-functions-discover");
  }
+ if (experiments.isEnabled("frameworks")) {
+ client.frameworks = {};
+ client.frameworks.stacks = {};
+ client.frameworks.stacks.list = loadCommand("frameworks-stacks-list");
+ client.frameworks.stacks.create = loadCommand("frameworks-stacks-create");
+ client.frameworks.stacks.create = loadCommand("frameworks-stacks-get");
+ client.frameworks.stacks.create = loadCommand("frameworks-stacks-delete");
+ }
  client.login = loadCommand("login");
  client.login.add = loadCommand("login-add");
  client.login.ci = loadCommand("login-ci");

diff --git a/src/gcp/frameworks.ts b/src/gcp/frameworks.ts
@@ -27,7 +27,7 @@ export interface Stack {
  uri: string;
 }
 
-export type StackOutputOnlyFields = "createTime" | "updateTime" | "uri" | "codebase";
+export type StackOutputOnlyFields = "createTime" | "updateTime" | "uri";
 
 export interface Build {
  name: string;
@@ -81,6 +81,12 @@ export interface Operation {
  // end oneof result
 }
 
+export interface ListStacksResponse {
+ stacks: Stack[];
+ nextPageToken: string;
+ unreachable: string[];
+}
+
 /**
  * Creates a new Stack in a given project and location.
  */
@@ -113,6 +119,29 @@ export async function getStack(
  return res.body;
 }
 
+/**
+ * List a all stacks present in a project and region.
+ */
+export async function listStack(projectId: string, location: string): Promise<ListStacksResponse> {
+ const name = `projects/${projectId}/locations/${location}/stacks/`;
+ const res = await client.get<ListStacksResponse>(name);
+
+ return res.body;
+}
+
+/**
+ * Creates a new Stack in a given project and location.
+ */
+export async function deleteStack(
+ projectId: string,
+ location: string,
+ stackId: string
+): Promise<Operation> {
+ const name = `projects/${projectId}/locations/${location}/stacks/${stackId}`;
+ const res = await client.delete<Operation>(name);
+
+ return res.body;
+}
 /**
  * Creates a new Build in a given project and location.
  */

diff --git a/src/init/features/frameworks/constants.ts b/src/init/features/frameworks/constants.ts
@@ -1,4 +1,7 @@
 export const DEFAULT_REGION = "us-central1";
-export const ALLOWED_REGIONS = [{ name: "us-central1 (Iowa)", value: "us-central1" }];
+export const ALLOWED_REGIONS = [
+ { name: "us-central1", value: "us-central1" },
+ { name: "us-west1", value: "us-west1" },
+];
 export const DEFAULT_DEPLOY_METHOD = "github";
 export const ALLOWED_DEPLOY_METHODS = [{ name: "Deploy using github", value: "github" }];
diff --git a/src/init/features/frameworks/index.ts b/src/init/features/frameworks/index.ts
@@ -27,8 +27,7 @@ const frameworksPollerOptions: Omit<poller.OperationPollerOptions, "operationRes
 /**
  * Setup new frameworks project.
  */
-export async function doSetup(setup: any): Promise<void> {
- const projectId: string = setup?.rcfile?.projects?.default;
+export async function doSetup(setup: any, projectId: string): Promise<void> {
  setup.frameworks = {};
 
  utils.logBullet("First we need a few details to create your service.");
@@ -71,7 +70,10 @@ export async function doSetup(setup: any): Promise<void> {
  setup.frameworks
  );
 
- await getOrCreateStack(projectId, setup);
+ const stack: Stack | undefined = await getOrCreateStack(projectId, setup);
+ if (stack) {
+ utils.logSuccess(`Successfully created a stack: ${stack.name}`);
+ }
 }
 
 function toStack(
@@ -80,6 +82,10 @@ function toStack(
 ): Omit<Stack, StackOutputOnlyFields> {
  return {
  name: stackId,
+ codebase: {
+ repository: `cloudbuild.googleapis.com/v2/${cloudBuildConnRepo.name}`,
+ rootDirectory: ".",
+ },
  labels: {},
  };
 }
@@ -96,11 +102,7 @@ export async function getOrCreateStack(projectId: string, setup: any): Promise<S
  if ((err as FirebaseError).status === 404) {
  logger.info("Creating new stack.");
  if (deployMethod === "github") {
- const cloudBuildConnRepo = await repo.linkGitHubRepository(
- projectId,
- location,
- setup.frameworks.serviceName
- );
+ const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location);
  const stackDetails = toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
  return await createStack(projectId, location, stackDetails);
  }

diff --git a/src/init/features/frameworks/repo.ts b/src/init/features/frameworks/repo.ts
@@ -32,19 +32,22 @@ function extractRepoSlugFromURI(remoteUri: string): string | undefined {
  * The current implementation is subject to change in the event that
  * the 1:1 Connection-to-Resource relationship no longer holds.
  */
-function generateRepositoryId(): string | undefined {
- return `composer-repo`;
+function generateRepositoryId(remoteUri: string): string | undefined {
+ return extractRepoSlugFromURI(remoteUri)?.replaceAll("/", "-");
+}
+
+function generateConnectionId(location: string): string {
+ return `frameworks-${location}`;
 }
 
 /**
  * Prompts the user to link their stack to a GitHub repository.
  */
 export async function linkGitHubRepository(
  projectId: string,
- location: string,
- stackId: string
+ location: string
 ): Promise<gcb.Repository> {
- const connectionId = stackId;
+ const connectionId = generateConnectionId(location);
  await getOrCreateConnection(projectId, location, connectionId);
 
  let remoteUri = await promptRepositoryURI(projectId, location, connectionId);
@@ -147,7 +150,7 @@ export async function getOrCreateRepository(
  connectionId: string,
  remoteUri: string
 ): Promise<gcb.Repository> {
- const repositoryId = generateRepositoryId();
+ const repositoryId = generateRepositoryId(remoteUri);
  if (!repositoryId) {
  throw new FirebaseError(`Failed to generate repositoryId for URI "${remoteUri}".`);
  }

diff --git a/src/test/init/frameworks/index.spec.ts b/src/test/init/frameworks/index.spec.ts
@@ -36,6 +36,10 @@ describe("operationsConverter", () => {
  const stackId = "stackId";
  const stackInput = {
  name: stackId,
+ codebase: {
+ repository: `cloudbuild.googleapis.com/v2/projects/projectId/locations/us-central1/connections/frameworks-us-central1/repositories/repoId`,
+ rootDirectory: ".",
+ },
  labels: {},
  };
  const op = {

diff --git a/src/test/init/frameworks/repo.spec.ts b/src/test/init/frameworks/repo.spec.ts
@@ -128,7 +128,7 @@ describe("composer", () => {
  getConnectionStub.resolves(pendingConn);
  fetchLinkableRepositoriesStub.resolves({ repositories: [] });
 
- await expect(repo.linkGitHubRepository(projectId, location, stackId)).to.be.rejected;
+ await expect(repo.linkGitHubRepository(projectId, location)).to.be.rejected;
  });
  });
 });