Merge branch 'main' of github.com:HubSpot/hubspot-local-dev-lib into …

…jy/update-upload-to-handle-ir
HubSpot · Dec 18, 2024 · 0b67594 · 0b67594
2 parents 051fda5 + 7957ded
commit 0b67594
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 12 deletions.
diff --git a/api/projects.ts b/api/projects.ts
@@ -7,6 +7,7 @@ import {
   UploadProjectResponse,
   ProjectSettings,
   FetchPlatformVersionResponse,
+  WarnLogsResponse,
   UploadIRResponse,
 } from '../types/Project';
 import { Build, FetchProjectBuildsResponse } from '../types/Build';
@@ -15,7 +16,6 @@ import {
   ProjectComponentsMetadata,
 } from '../types/ComponentStructure';
 import { Deploy, ProjectDeployResponse } from '../types/Deploy';
-import { ProjectLog } from '../types/ProjectLog';
 import {
   MigrateAppResponse,
   CloneAppResponse,
@@ -299,10 +299,6 @@ export function cancelStagedBuild(
   });
 }
 
-type WarnLogsResponse = {
-  logs: Array<ProjectLog>;
-};
-
 export function fetchBuildWarnLogs(
   accountId: number,
   projectName: string,

diff --git a/config/config_DEPRECATED.ts b/config/config_DEPRECATED.ts
@@ -105,6 +105,12 @@ export function validateConfig(): boolean {
     logger.error('config.portals[] is not defined');
     return false;
   }
+
+  if (accounts.length === 0) {
+    logger.error('There are no accounts defined in the configuration file');
+    return false;
+  }
+
   const accountIdsHash: { [id: number]: CLIAccount_DEPRECATED } = {};
   const accountNamesHash: { [name: string]: CLIAccount_DEPRECATED } = {};
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/local-dev-lib",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
   "main": "lib/index.js",
   "repository": {

diff --git a/types/Accounts.ts b/types/Accounts.ts
@@ -14,6 +14,8 @@ export interface CLIAccount_NEW {
   authType?: AuthType;
   auth?: {
     tokenInfo?: TokenInfo;
+    clientId?: string;
+    clientSecret?: string;
   };
   sandboxAccountType?: string | null;
   parentAccountId?: number | null;
@@ -30,6 +32,8 @@ export interface CLIAccount_DEPRECATED {
   authType?: AuthType;
   auth?: {
     tokenInfo?: TokenInfo;
+    clientId?: string;
+    clientSecret?: string;
   };
   sandboxAccountType?: string | null;
   parentAccountId?: number | null;

diff --git a/types/Build.ts b/types/Build.ts
@@ -6,18 +6,19 @@ import {
 } from '../enums/build';
 import { ActivitySource } from './Activity';
 import { DeployStatusTaskLocator } from './Deploy';
-import { OptionalError } from './Error';
+import { ProjectStandardError } from './Project';
 
 export type SubbuildStatus = {
   buildName: string;
   buildType: ValueOf<typeof SUBBUILD_TYPES>;
   errorMessage: string;
   finishedAt: string;
   rootPath: string;
-  standardError?: OptionalError;
+  standardError: ProjectStandardError | null;
   startedAt: string;
   status: ValueOf<typeof BUILD_STATUS>;
   id: string;
+  visible: boolean;
 };
 
 export type Build = {
@@ -35,6 +36,7 @@ export type Build = {
   status: ValueOf<typeof BUILD_STATUS>;
   subbuildStatuses: Array<SubbuildStatus>;
   uploadMessage: string;
+  autoDeployId: number;
 };
 
 export type FetchProjectBuildsResponse = {

diff --git a/types/Deploy.ts b/types/Deploy.ts
@@ -2,7 +2,7 @@ import { ValueOf } from './Utils';
 import { ACTIVITY_SOURCE } from '../enums/project';
 import { DEPLOY_ACTION, DEPLOY_STATUS } from '../enums/deploy';
 import { COMPONENT_TYPES, SUBCOMPONENT_TYPES } from '../enums/build';
-import { OptionalError } from './Error';
+import { ProjectStandardError } from './Project';
 
 export type DeployStatus = ValueOf<typeof DEPLOY_STATUS>;
 
@@ -14,10 +14,11 @@ export type SubdeployStatus = {
     | ValueOf<typeof SUBCOMPONENT_TYPES>;
   errorMessage: string;
   finishedAt: string;
-  standardError?: OptionalError;
+  standardError: ProjectStandardError | null;
   startedAt: string;
   status: DeployStatus;
   id: string;
+  visible: boolean;
 };
 
 export type Deploy = {

diff --git a/types/Error.ts b/types/Error.ts
@@ -36,6 +36,7 @@ export interface HubSpotHttpErrorContext extends FileSystemErrorContext {
   projectName?: string;
 }
 
+// TODO: Remove in next major release
 export type OptionalError = BaseError | null | undefined;
 
 export type ErrorContext = {

diff --git a/types/Migration.ts b/types/Migration.ts
@@ -1,5 +1,6 @@
 import { ValueOf } from './Utils';
-import { OptionalError } from './Error';
+import { ProjectStandardError } from './Project';
+
 export const MIGRATION_STATUS = {
   BUILDING: 'BUILDING',
   FAILURE: 'FAILURE',
@@ -21,6 +22,6 @@ export type CloneAppResponse = {
 export type PollAppResponse = {
   id: number;
   project?: { id: number; name: string; buildId: number; deployId: number };
-  error?: OptionalError;
+  error: ProjectStandardError | null;
   status: ValueOf<typeof MIGRATION_STATUS>;
 };
diff --git a/types/Project.ts b/types/Project.ts
@@ -1,5 +1,6 @@
 import { Build } from './Build';
 import { GithubSourceData } from './Github';
+import { ProjectLog } from './ProjectLog';
 
 export type Project = {
   createdAt: number;
@@ -50,3 +51,24 @@ export type FetchPlatformVersionResponse = {
   defaultPlatformVersion: string;
   activePlatformVersions: Array<string>;
 };
+
+export type ProjectStandardError = {
+  status: string;
+  id?: string;
+  category: string;
+  subCategory?: string;
+  message?: string;
+  errors?: Array<{
+    message: string;
+    in?: string;
+    code?: string;
+    subcateogy?: string;
+    context: object;
+  }>;
+  context: object;
+  links: { [key: string]: string };
+};
+
+export type WarnLogsResponse = {
+  logs: Array<ProjectLog>;
+};