Skip to content

Commit fbd4b35

Browse files
committed
Introduce a magic constant instead of empty strings
1 parent 1594c9b commit fbd4b35

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

components/server/src/repohost/file-provider.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class RevisionNotFoundError extends Error {
1414
this.name = "RevisionNotFoundError";
1515
}
1616
}
17+
export const ImageFileRevisionMissing = "ImageFileRevisionMissing";
1718

1819
export const FileProvider = Symbol("FileProvider");
1920
export interface FileProvider {

components/server/src/workspace/config-provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { Config } from "../config";
3333
import { EntitlementService } from "../billing/entitlement-service";
3434
import { TeamDB } from "@gitpod/gitpod-db/lib";
3535
import { InvalidGitpodYMLError } from "@gitpod/public-api-common/lib/public-api-errors";
36-
import { RevisionNotFoundError } from "../repohost";
36+
import { ImageFileRevisionMissing, RevisionNotFoundError } from "../repohost";
3737

3838
const POD_PATH_WORKSPACE_BASE = "/workspace";
3939

@@ -263,7 +263,7 @@ export class ConfigProvider {
263263
.getLastChangeRevision(repository, revisionOrTagOrBranch, user, dockerFilePath)
264264
.catch((e) => {
265265
if (e instanceof RevisionNotFoundError) {
266-
return "";
266+
return ImageFileRevisionMissing;
267267
}
268268
throw e;
269269
});

components/server/src/workspace/context-parser-service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
1919
import { ConfigProvider } from "./config-provider";
2020
import { InvalidGitpodYMLError } from "@gitpod/public-api-common/lib/public-api-errors";
2121
import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
22+
import { ImageFileRevisionMissing } from "../repohost";
2223

2324
@injectable()
2425
export class ContextParser {
@@ -191,7 +192,7 @@ export class ContextParser {
191192
}
192193

193194
if (ExternalImageConfigFile.is(config.config.image)) {
194-
if (config.config.image.externalSource.revision === "") {
195+
if (config.config.image.externalSource.revision === ImageFileRevisionMissing) {
195196
context.warnings.push("The Dockerfile specified in the .gitpod.yml file was not found.");
196197
}
197198
}

components/server/src/workspace/image-source-provider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
AdditionalContentContext,
2020
} from "@gitpod/gitpod-protocol";
2121
import { createHash } from "crypto";
22-
import { RevisionNotFoundError } from "../repohost";
22+
import { ImageFileRevisionMissing, RevisionNotFoundError } from "../repohost";
2323

2424
@injectable()
2525
export class ImageSourceProvider {
@@ -48,7 +48,7 @@ export class ImageSourceProvider {
4848
.getLastChangeRevision(repository, imgcfg.externalSource.revision, user, imgcfg.file)
4949
.catch((e) => {
5050
if (e instanceof RevisionNotFoundError) {
51-
return "";
51+
return ImageFileRevisionMissing;
5252
}
5353
throw e;
5454
});
@@ -79,7 +79,7 @@ export class ImageSourceProvider {
7979
.getLastChangeRevision(context.repository, context.revision, user, imgcfg.file)
8080
.catch((e) => {
8181
if (e instanceof RevisionNotFoundError) {
82-
return "";
82+
return ImageFileRevisionMissing;
8383
}
8484
throw e;
8585
});

0 commit comments

Comments
 (0)