feat: fix up the branch

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder-backend-module-gcp/src/providers/GcpBucketWorkspaceProvider.ts

@@ -24,7 +24,7 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import {
   serializeWorkspace,
   restoreWorkspace,
-} from '@backstage/plugin-scaffolder-node';
+} from '@backstage/plugin-scaffolder-node/alpha';
 
 export class GcpBucketWorkspaceProvider implements WorkspaceProvider {
   static create(logger: LoggerService, config?: Config) {

plugins/scaffolder-backend/src/ScaffolderPlugin.ts

@@ -86,17 +86,17 @@ export const scaffolderPlugin = createBackendPlugin({
       },
     });
 
-<<<<<<< HEAD
     const autocompleteHandlers: Record<string, AutocompleteHandler> = {};
     env.registerExtensionPoint(scaffolderAutocompleteExtensionPoint, {
       addAutocompleteProvider(provider) {
         autocompleteHandlers[provider.id] = provider.handler;
-=======
+      },
+    });
+
     const additionalWorkspaceProviders: Record<string, WorkspaceProvider> = {};
     env.registerExtensionPoint(scaffolderWorkspaceProviderExtensionPoint, {
       addProviders(provider) {
         Object.assign(additionalWorkspaceProviders, provider);
->>>>>>> 801e5ff2007a (Storing the serialized workspace into google cloud bucket)
       },
     });
 

plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts

@@ -43,7 +43,7 @@ import { intervalFromNowTill } from './dbUtil';
 import {
   restoreWorkspace,
   serializeWorkspace,
-} from '@backstage/plugin-scaffolder-node';
+} from '@backstage/plugin-scaffolder-node/alpha';
 
 const migrationsDir = resolvePackagePath(
   '@backstage/plugin-scaffolder-backend',

plugins/scaffolder-node/api-report-alpha.md

@@ -3,6 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="node" />
+
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { TaskBroker } from '@backstage/plugin-scaffolder-node';
 import { TemplateAction } from '@backstage/plugin-scaffolder-node';
@@ -24,6 +26,12 @@ export type AutocompleteHandler = ({
   }[];
 }>;
 
+// @alpha
+export const restoreWorkspace: (opts: {
+  path: string;
+  buffer?: Buffer;
+}) => Promise<void>;
+
 // @alpha
 export interface ScaffolderActionsExtensionPoint {
   // (undocumented)
@@ -77,6 +85,11 @@ export interface ScaffolderWorkspaceProviderExtensionPoint {
 // @alpha
 export const scaffolderWorkspaceProviderExtensionPoint: ExtensionPoint<ScaffolderWorkspaceProviderExtensionPoint>;
 
+// @alpha
+export const serializeWorkspace: (opts: { path: string }) => Promise<{
+  contents: Buffer;
+}>;
+
 // @alpha
 export interface WorkspaceProvider {
   // (undocumented)

plugins/scaffolder-node/api-report.md

@@ -256,9 +256,6 @@ export const parseRepoUrl: (
   project?: string | undefined;
 };
 
-// @public
-export const restoreWorkspace: (path: string, buffer?: Buffer) => Promise<void>;
-
 // @public (undocumented)
 export interface SerializedFile {
   // (undocumented)
@@ -301,9 +298,6 @@ export type SerializedTaskEvent = {
   createdAt: string;
 };
 
-// @public
-export const serializeWorkspace: (path: string) => Promise<Buffer>;
-
 // @public
 export interface TaskBroker {
   // (undocumented)

plugins/scaffolder-node/src/alpha.ts

@@ -22,6 +22,8 @@ import {
   TaskBroker,
 } from '@backstage/plugin-scaffolder-node';
 
+export * from './tasks/alpha';
+
 /**
  * Extension point for managing scaffolder actions.
  *

plugins/scaffolder-node/src/tasks/alpha.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './serializer';

plugins/scaffolder-node/src/tasks/index.ts

@@ -26,5 +26,3 @@ export type {
   TaskEventType,
   TaskStatus,
 } from './types';
-
-export * from './serializer';