hereya-cli 0.89.1 → 0.91.0

package/dist/backend/cloud/cloud-backend/workspace-env.js

@@ -0,0 +1,63 @@
+import { resolveWorkspaceName } from '../../../lib/workspace-utils.js';
+import { safeResponseJson } from './utils.js';
+import { getWorkspace } from './workspaces.js';
+export async function setEnvVar(config, input) {
+    const formData = new FormData();
+    formData.append('key', input.name);
+    formData.append('value', input.value);
+    formData.append('infrastructure', input.infrastructure);
+    const response = await fetch(`${config.url}/api/workspaces/${encodeURIComponent(input.workspace)}/env`, {
+        body: formData,
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'POST',
+    });
+    if (!response.ok) {
+        return {
+            reason: JSON.stringify(await safeResponseJson(response)),
+            success: false,
+        };
+    }
+    return {
+        success: true,
+    };
+}
+export async function unsetEnvVar(config, input) {
+    const response = await fetch(`${config.url}/api/workspaces/${encodeURIComponent(input.workspace)}/env/${encodeURIComponent(input.name)}`, {
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'DELETE',
+    });
+    if (!response.ok) {
+        return {
+            reason: JSON.stringify(await safeResponseJson(response)),
+            success: false,
+        };
+    }
+    return {
+        success: true,
+    };
+}
+export async function getWorkspaceEnv(config, input) {
+    // Apply org prefix if project has one and workspace doesn't
+    const workspaceName = resolveWorkspaceName(input.workspace, input.project);
+    const workspace$ = await getWorkspace(config, workspaceName);
+    if (!workspace$.found) {
+        return {
+            reason: `Workspace ${input.workspace} not found`,
+            success: false,
+        };
+    }
+    if (workspace$.hasError) {
+        return {
+            reason: workspace$.error,
+            success: false,
+        };
+    }
+    return {
+        env: workspace$.workspace.env ?? {},
+        success: true,
+    };
+}

package/dist/backend/cloud/cloud-backend/workspaces.d.ts

@@ -0,0 +1,7 @@
+import { CreateWorkspaceInput, CreateWorkspaceOutput, DeleteWorkspaceInput, DeleteWorkspaceOutput, GetWorkspaceOutput, ListWorkspacesInput, UpdateWorkspaceInput, UpdateWorkspaceOutput } from '../../common.js';
+import { CloudHttpConfig } from './utils.js';
+export declare function createWorkspace(config: CloudHttpConfig, input: CreateWorkspaceInput): Promise<CreateWorkspaceOutput>;
+export declare function deleteWorkspace(config: CloudHttpConfig, input: DeleteWorkspaceInput): Promise<DeleteWorkspaceOutput>;
+export declare function getWorkspace(config: CloudHttpConfig, name: string): Promise<GetWorkspaceOutput>;
+export declare function listWorkspaces(config: CloudHttpConfig, input?: ListWorkspacesInput): Promise<string[]>;
+export declare function updateWorkspace(config: CloudHttpConfig, input: UpdateWorkspaceInput): Promise<UpdateWorkspaceOutput>;

package/dist/backend/cloud/cloud-backend/workspaces.js

@@ -0,0 +1,124 @@
+import { convertWorkspace, safeResponseJson } from './utils.js';
+export async function createWorkspace(config, input) {
+    const formData = new FormData();
+    formData.append('name', input.name);
+    if (input.mirrorOf) {
+        formData.append('mirrorOf', input.mirrorOf);
+    }
+    if (input.profile) {
+        formData.append('profile', input.profile);
+    }
+    if (input.isDeploy !== undefined) {
+        formData.append('isDeploy', String(input.isDeploy));
+    }
+    const response = await fetch(`${config.url}/api/workspaces`, {
+        body: formData,
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'POST',
+    });
+    if (!response.ok) {
+        return {
+            reason: JSON.stringify(await safeResponseJson(response)),
+            success: false,
+        };
+    }
+    const result = await response.json();
+    return {
+        isNew: true,
+        success: true,
+        workspace: convertWorkspace(result.workspace),
+    };
+}
+export async function deleteWorkspace(config, input) {
+    const response = await fetch(`${config.url}/api/workspaces/${encodeURIComponent(input.name)}`, {
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'DELETE',
+    });
+    if (!response.ok) {
+        return {
+            reason: JSON.stringify(await safeResponseJson(response)),
+            success: false,
+        };
+    }
+    return {
+        success: true,
+    };
+}
+export async function getWorkspace(config, name) {
+    const response = await fetch(`${config.url}/api/workspaces/${encodeURIComponent(name)}`, {
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'GET',
+    });
+    if (response.status === 404) {
+        return {
+            found: false,
+        };
+    }
+    if (!response.ok) {
+        const error = await safeResponseJson(response);
+        return {
+            error: JSON.stringify(error),
+            found: true,
+            hasError: true,
+        };
+    }
+    const result = await response.json();
+    return {
+        found: true,
+        hasError: false,
+        workspace: convertWorkspace(result.workspace),
+    };
+}
+export async function listWorkspaces(config, input) {
+    const url = new URL(`${config.url}/api/workspaces`);
+    if (input?.org) {
+        url.searchParams.set('org', input.org);
+    }
+    const response = await fetch(url.toString(), {
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'GET',
+    });
+    if (!response.ok) {
+        throw new Error(JSON.stringify(await safeResponseJson(response)));
+    }
+    const result = await response.json();
+    return result.workspaces.map((workspace) => workspace.name);
+}
+export async function updateWorkspace(config, input) {
+    const formData = new FormData();
+    if (input.profile !== undefined) {
+        formData.append('profile', input.profile === null ? '' : input.profile);
+    }
+    if (input.hasExecutor !== undefined) {
+        formData.append('hasExecutor', input.hasExecutor === null ? '' : String(input.hasExecutor));
+    }
+    if (input.isDeploy !== undefined) {
+        formData.append('isDeploy', input.isDeploy === null ? '' : String(input.isDeploy));
+    }
+    const response = await fetch(`${config.url}/api/workspaces/${encodeURIComponent(input.name)}`, {
+        body: formData,
+        headers: {
+            'Authorization': `Bearer ${config.accessToken}`,
+        },
+        method: 'PATCH',
+    });
+    if (!response.ok) {
+        return {
+            reason: JSON.stringify(await safeResponseJson(response)),
+            success: false,
+        };
+    }
+    const result = await response.json();
+    return {
+        success: true,
+        workspace: convertWorkspace(result.workspace),
+    };
+}

package/dist/backend/cloud/cloud-backend.d.ts

@@ -1,88 +1,36 @@
 import { Config } from '../../lib/config/common.js';
-import { IParameterSpec } from '../../lib/package/index.js';
-import { AddPackageToWorkspaceInput, AddPackageToWorkspaceOutput, Backend, CreateWorkspaceInput, CreateWorkspaceOutput, DeleteStateInput, DeleteStateOutput, DeleteWorkspaceInput, DeleteWorkspaceOutput, ExportBackendOutput, GetPackageOutput, GetProjectMetadataInput, GetProjectMetadataOutput, GetProvisioningIdInput, GetProvisioningIdOutput, GetStateInput, GetStateOutput, GetWorkspaceEnvInput, GetWorkspaceEnvOutput, GetWorkspaceOutput, ImportBackendInput, ImportBackendOutput, ImportProjectInput, ImportProjectOutput, InitProjectInput, InitProjectOutput, ListPackageVersionsOutput, ListProjectsOutput, ListWorkspacesInput, PublishPackageInput, PublishPackageOutput, RemovePackageFromWorkspaceInput, RemovePackageFromWorkspaceOutput, SaveProjectMetadataInput, SaveProjectMetadataOutput, SearchPackagesInput, SearchPackagesOutput, SetEnvVarInput, SetEnvVarOutput, UnsetEnvVarInput, UnsetEnvVarOutput, UpdateWorkspaceInput, UpdateWorkspaceOutput } from '../common.js';
+import { Backend } from '../common.js';
+import * as appsDeploy from './cloud-backend/apps-deploy.js';
+import * as appsVersions from './cloud-backend/apps-versions.js';
+import * as executorBroker from './cloud-backend/executor-broker.js';
+import * as executorJobs from './cloud-backend/executor-jobs.js';
+import * as misc from './cloud-backend/misc.js';
+import * as packagesPublish from './cloud-backend/packages-publish.js';
+import * as packagesRegistry from './cloud-backend/packages-registry.js';
+import * as packagesWorkspace from './cloud-backend/packages-workspace.js';
+import * as projects from './cloud-backend/projects.js';
+import * as state from './cloud-backend/state.js';
+import * as workspaceEnv from './cloud-backend/workspace-env.js';
+import * as workspaces from './cloud-backend/workspaces.js';
 interface CloudBackendConfig {
     accessToken: string;
     clientId: string;
     refreshToken: string;
     url: string;
 }
-export interface AppSummary {
-    description?: null | string;
-    name: string;
-    visibility?: string;
-}
-export interface AppVersionSummary {
-    commit?: string;
-    parameters?: Record<string, IParameterSpec>;
-    publishedAt?: string;
-    repository?: string;
-    sha256?: string;
-    version: string;
-}
-export interface AppDeploymentSummary {
-    appName?: string;
-    env?: Record<string, string>;
-    lastJobId?: null | string;
-    parameters?: Record<string, unknown>;
-    state?: unknown;
-    status: string;
-    version?: string;
-    workspace: string;
-}
-export type DeployAppInput = {
-    name: string;
-    parameters?: Record<string, string>;
-    version?: string;
-    workspace: string;
-};
-export type DestroyAppInput = {
-    name: string;
-    parameters?: Record<string, string>;
-    workspace: string;
-};
-export type GetAppDeploymentInput = {
-    name: string;
-    workspace: string;
-};
-export type PublishAppVersionInput = {
-    commit: string;
-    description?: string;
-    hereyaYaml: string;
-    name: string;
-    parameters?: Record<string, IParameterSpec>;
-    repository: string;
-    sha256: string;
-    version: string;
-    visibility?: 'private' | 'public';
-};
-export type PublishAppVersionOutput = {
-    app: {
-        id?: string;
-        name: string;
-        version: string;
-    };
-    success: true;
-} | {
-    reason: string;
-    success: false;
-};
-export type UpdateAppDeploymentInput = {
-    env?: Record<string, string>;
-    lastJobId?: string;
-    name: string;
-    state?: unknown;
-    status: string;
-    workspace: string;
-};
+export type { AppDeploymentSummary, DeployAppInput, DestroyAppInput, GetAppDeploymentInput, UpdateAppDeploymentInput, } from './cloud-backend/apps-deploy.js';
+export type { AppSummary, AppVersionSummary, PublishAppVersionInput, PublishAppVersionOutput, } from './cloud-backend/apps-versions.js';
+type SubmitJobInput = Parameters<typeof executorJobs.submitExecutorJob>[1];
+type UpdateJobInput = Parameters<typeof executorJobs.updateExecutorJob>[1];
+type GetJobStatusInput = Parameters<typeof executorJobs.getExecutorJobStatus>[1];
 export declare class CloudBackend implements Backend {
     private readonly config;
     constructor(config: CloudBackendConfig);
-    addPackageToWorkspace(input: AddPackageToWorkspaceInput): Promise<AddPackageToWorkspaceOutput>;
-    createWorkspace(input: CreateWorkspaceInput): Promise<CreateWorkspaceOutput>;
-    deleteState(input: DeleteStateInput): Promise<DeleteStateOutput>;
-    deleteWorkspace(input: DeleteWorkspaceInput): Promise<DeleteWorkspaceOutput>;
-    deployApp(input: DeployAppInput): Promise<{
+    addPackageToWorkspace(input: Parameters<typeof packagesWorkspace.addPackageToWorkspace>[1]): Promise<import("../common.js").AddPackageToWorkspaceOutput>;
+    createWorkspace(input: Parameters<typeof workspaces.createWorkspace>[1]): Promise<import("../common.js").CreateWorkspaceOutput>;
+    deleteState(input: Parameters<typeof state.deleteState>[1]): Promise<import("../common.js").DeleteStateOutput>;
+    deleteWorkspace(input: Parameters<typeof workspaces.deleteWorkspace>[1]): Promise<import("../common.js").DeleteWorkspaceOutput>;
+    deployApp(input: appsDeploy.DeployAppInput): Promise<{
         deploymentId: string;
         jobId: string;
         success: true;
@@ -90,14 +38,14 @@ export declare class CloudBackend implements Backend {
         reason: string;
         success: false;
     }>;
-    destroyApp(input: DestroyAppInput): Promise<{
+    destroyApp(input: appsDeploy.DestroyAppInput): Promise<{
         jobId: string;
         success: true;
     } | {
         reason: string;
         success: false;
     }>;
-    exportBackend(): Promise<ExportBackendOutput>;
+    exportBackend(): Promise<import("../common.js").ExportBackendOutput>;
     generateExecutorToken(input: {
         workspace: string;
     }): Promise<{
@@ -109,14 +57,14 @@ export declare class CloudBackend implements Backend {
         success: false;
     }>;
     getApp(name: string): Promise<{
-        app: AppSummary;
+        app: appsVersions.AppSummary;
         success: true;
     } | {
         reason: string;
         success: false;
     }>;
-    getAppDeployment(input: GetAppDeploymentInput): Promise<{
-        deployment: AppDeploymentSummary;
+    getAppDeployment(input: appsDeploy.GetAppDeploymentInput): Promise<{
+        deployment: appsDeploy.AppDeploymentSummary;
         success: true;
     } | {
         reason: string;
@@ -126,18 +74,13 @@ export declare class CloudBackend implements Backend {
         name: string;
         version?: string;
     }): Promise<{
-        appVersion: AppVersionSummary;
+        appVersion: appsVersions.AppVersionSummary;
         success: true;
     } | {
         reason: string;
         success: false;
     }>;
-    getExecutorJobStatus(input: {
-        jobId: string;
-        lastStatus?: string;
-        poll?: boolean;
-        workspace: string;
-    }): Promise<{
+    getExecutorJobStatus(input: GetJobStatusInput): Promise<{
         job: {
             id: string;
             logs: string;
@@ -150,25 +93,25 @@ export declare class CloudBackend implements Backend {
         reason: string;
         success: false;
     }>;
-    getPackageByVersion(name: string, version: string): Promise<GetPackageOutput>;
-    getPackageLatest(name: string): Promise<GetPackageOutput>;
-    getProjectMetadata(input: GetProjectMetadataInput): Promise<GetProjectMetadataOutput>;
-    getProvisioningId(input: GetProvisioningIdInput): Promise<GetProvisioningIdOutput>;
-    getState(input: GetStateInput): Promise<GetStateOutput>;
-    getWorkspace(name: string): Promise<GetWorkspaceOutput>;
-    getWorkspaceEnv(input: GetWorkspaceEnvInput): Promise<GetWorkspaceEnvOutput>;
-    importBackend(input: ImportBackendInput): Promise<ImportBackendOutput>;
-    importProject(input: ImportProjectInput): Promise<ImportProjectOutput>;
-    init(input: InitProjectInput): Promise<InitProjectOutput>;
+    getPackageByVersion(name: string, version: string): Promise<import("../common.js").GetPackageOutput>;
+    getPackageLatest(name: string): Promise<import("../common.js").GetPackageOutput>;
+    getProjectMetadata(input: Parameters<typeof projects.getProjectMetadata>[1]): Promise<import("../common.js").GetProjectMetadataOutput>;
+    getProvisioningId(input: Parameters<typeof misc.getProvisioningId>[1]): Promise<import("../common.js").GetProvisioningIdOutput>;
+    getState(input: Parameters<typeof state.getState>[1]): Promise<import("../common.js").GetStateOutput>;
+    getWorkspace(name: string): Promise<import("../common.js").GetWorkspaceOutput>;
+    getWorkspaceEnv(input: Parameters<typeof workspaceEnv.getWorkspaceEnv>[1]): Promise<import("../common.js").GetWorkspaceEnvOutput>;
+    importBackend(input: Parameters<typeof misc.importBackend>[1]): Promise<import("../common.js").ImportBackendOutput>;
+    importProject(input: Parameters<typeof projects.importProject>[1]): Promise<import("../common.js").ImportProjectOutput>;
+    init(input: Parameters<typeof projects.init>[1]): Promise<import("../common.js").InitProjectOutput>;
     listAppDeployments(name: string): Promise<{
-        deployments: AppDeploymentSummary[];
+        deployments: appsDeploy.AppDeploymentSummary[];
         success: true;
     } | {
         reason: string;
         success: false;
     }>;
     listApps(): Promise<{
-        apps: AppSummary[];
+        apps: appsVersions.AppSummary[];
         success: true;
     } | {
         reason: string;
@@ -179,11 +122,11 @@ export declare class CloudBackend implements Backend {
         success: false;
     } | {
         success: true;
-        versions: AppVersionSummary[];
+        versions: appsVersions.AppVersionSummary[];
     }>;
-    listPackageVersions(name: string): Promise<ListPackageVersionsOutput>;
-    listProjects(): Promise<ListProjectsOutput>;
-    listWorkspaces(input?: ListWorkspacesInput): Promise<string[]>;
+    listPackageVersions(name: string): Promise<import("../common.js").ListPackageVersionsOutput>;
+    listProjects(): Promise<import("../common.js").ListProjectsOutput>;
+    listWorkspaces(input?: Parameters<typeof workspaces.listWorkspaces>[1]): Promise<string[]>;
     pollExecutorJobs(input: {
         executorId?: string;
         workspace: string;
@@ -199,9 +142,10 @@ export declare class CloudBackend implements Backend {
         success: false;
         unauthorized?: true;
     }>;
-    publishAppVersion(input: PublishAppVersionInput): Promise<PublishAppVersionOutput>;
-    publishPackage(input: PublishPackageInput): Promise<PublishPackageOutput>;
-    removePackageFromWorkspace(input: RemovePackageFromWorkspaceInput): Promise<RemovePackageFromWorkspaceOutput>;
+    publishAppVersion(input: appsVersions.PublishAppVersionInput): Promise<appsVersions.PublishAppVersionOutput>;
+    publishPackage(input: Parameters<typeof packagesPublish.publishPackage>[1]): Promise<import("../common.js").PublishPackageOutput>;
+    registerExecutorBroker(input: executorBroker.RegisterExecutorBrokerInput): Promise<executorBroker.RegisterExecutorBrokerOutput>;
+    removePackageFromWorkspace(input: Parameters<typeof packagesWorkspace.removePackageFromWorkspace>[1]): Promise<import("../common.js").AddPackageToWorkspaceOutput>;
     revokeExecutorToken(input: {
         workspace: string;
     }): Promise<{
@@ -210,42 +154,31 @@ export declare class CloudBackend implements Backend {
     } | {
         success: true;
     }>;
-    saveProjectMetadata(input: SaveProjectMetadataInput): Promise<SaveProjectMetadataOutput>;
+    saveProjectMetadata(input: Parameters<typeof projects.saveProjectMetadata>[1]): Promise<import("../common.js").SaveProjectMetadataOutput>;
     saveState(config: Config, workspace?: string): Promise<void>;
-    searchPackages(input: SearchPackagesInput): Promise<SearchPackagesOutput>;
-    setEnvVar(input: SetEnvVarInput): Promise<SetEnvVarOutput>;
-    submitExecutorJob(input: {
-        payload: object;
-        type: 'app-deploy' | 'app-destroy' | 'deploy' | 'destroy' | 'provision' | 'resolve-env' | 'undeploy';
-        workspace: string;
-    }): Promise<{
+    searchPackages(input: Parameters<typeof packagesRegistry.searchPackages>[1]): Promise<import("../common.js").SearchPackagesOutput>;
+    setEnvVar(input: Parameters<typeof workspaceEnv.setEnvVar>[1]): Promise<import("../common.js").SetEnvVarOutput>;
+    submitExecutorJob(input: SubmitJobInput): Promise<{
         jobId: string;
         success: true;
     } | {
         reason: string;
         success: false;
     }>;
-    unsetEnvVar(input: UnsetEnvVarInput): Promise<UnsetEnvVarOutput>;
-    updateAppDeployment(input: UpdateAppDeploymentInput): Promise<{
+    unregisterExecutorBroker(input: executorBroker.UnregisterExecutorBrokerInput): Promise<executorBroker.UnregisterExecutorBrokerOutput>;
+    unsetEnvVar(input: Parameters<typeof workspaceEnv.unsetEnvVar>[1]): Promise<import("../common.js").SetEnvVarOutput>;
+    updateAppDeployment(input: appsDeploy.UpdateAppDeploymentInput): Promise<{
         reason: string;
         success: false;
     } | {
         success: true;
     }>;
-    updateExecutorJob(input: {
-        jobId: string;
-        logs?: string;
-        result?: object;
-        status?: 'completed' | 'failed';
-    }): Promise<{
+    updateExecutorJob(input: UpdateJobInput): Promise<{
         reason: string;
         success: false;
         unauthorized?: true;
     } | {
         success: true;
     }>;
-    updateWorkspace(input: UpdateWorkspaceInput): Promise<UpdateWorkspaceOutput>;
-    private convertWorkspace;
-    private safeResponseJson;
+    updateWorkspace(input: Parameters<typeof workspaces.updateWorkspace>[1]): Promise<import("../common.js").UpdateWorkspaceOutput>;
 }
-export {};