Skip to content

Commit

Permalink
Fix update command to keep catalog resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@Syuparn
Syuparn committed May 27, 2023
1 parent 1d93659 commit 6178063
Show file tree
Hide file tree
Showing 3 changed files with 239 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libs/action_helper/installer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ const getInstallList = (contents: Content[]) => {
name: content.name,
url: content.url,
path: fullPath,
catalogUrl: null,
catalogResourceId: null,
catalogUrl: content.catalogUrl,
catalogResourceId: content.catalogResourceId,
lastModified: lastModified,
eTag: headers.get("etag")?.replace(/^"(.*)"$/, "$1") ?? null,
lastDownloaded: new Date(),
Expand Down
2 changes: 2 additions & 0 deletions libs/actions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ export class UpdateAction {
name,
content.postProcesses,
content.headers,
content.catalogUrl,
content.catalogResourceId,
).catch(
(error) => {
console.error(
Expand Down
235 changes: 235 additions & 0 deletions tests/libs/actions.update.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,112 @@ describe("UpdateAction", () => {
}
});

it("check if catalogResourceId and catalogResourceUrl in dim.json and dim-lock.json are not updated when they have been already set", async () => {
const dimData: DimJSON = {
fileVersion: "1.1",
contents: [
{
name: "example",
url: "dummy",
catalogUrl: "https://example.com",
catalogResourceId: "00000000-0000-0000-0000-000000000000",
postProcesses: [],
headers: {},
},
],
};
const dimLockData: DimLockJSON = {
lockFileVersion: "1.1",
contents: [{
catalogUrl: "https://example.com",
catalogResourceId: "00000000-0000-0000-0000-000000000000",
eTag: null,
headers: {},
integrity: "405906c9d5be6ae5393ca65fb0e7c38e0d585ecb",
lastDownloaded: new Date("2020-01-02T03:04:05.678Z"),
lastModified: null,
name: "example",
path: "./data_files/example/dummy.csv",
postProcesses: [],
url: "https://example.com/dummy.csv",
}],
};
await Deno.writeTextFile(
"./dim.json",
JSON.stringify(dimData, null, 2),
);
await Deno.writeTextFile(
"./dim-lock.json",
JSON.stringify(dimLockData, null, 2),
);
Deno.mkdirSync("data_files/example", { recursive: true });
Deno.writeTextFileSync("data_files/example/dummy.csv", "before");

const kyGetStub = createKyGetStub("after", {
headers: {
"etag": '"12345-1234567890abc"',
"last-modified": "Thu, 3 Feb 2022 04:05:06 GMT",
},
});
try {
await new UpdateAction().execute({}, "example");

const fileContent = Deno.readTextFileSync(
"data_files/example/dummy.csv",
);
assertEquals(fileContent, "after");

const dimJson = JSON.parse(
Deno.readTextFileSync("./dim.json"),
);
assertEquals(dimJson, {
fileVersion: "1.1",
contents: [{
catalogUrl: "https://example.com",
catalogResourceId: "00000000-0000-0000-0000-000000000000",
headers: {},
name: "example",
postProcesses: [],
url: "https://example.com/dummy.csv",
}],
});

const dimLockJson = JSON.parse(
Deno.readTextFileSync("./dim-lock.json"),
);
assertEquals(dimLockJson, {
lockFileVersion: "1.1",
contents: [{
catalogUrl: "https://example.com",
catalogResourceId: "00000000-0000-0000-0000-000000000000",
eTag: "12345-1234567890abc",
headers: {},
integrity: "405906c9d5be6ae5393ca65fb0e7c38e0d585ecb",
lastDownloaded: "2022-01-02T03:04:05.678Z",
lastModified: "2022-02-03T04:05:06.000Z",
name: "example",
path: "./data_files/example/dummy.csv",
postProcesses: [],
url: "https://example.com/dummy.csv",
}],
});

assertSpyCall(consoleLogStub, 0, {
args: [
Colors.green(
"Updated example.",
),
"\nFile path:",
Colors.yellow(
"./data_files/example/dummy.csv",
),
],
});
} finally {
kyGetStub.restore();
}
});

it('exit with error when run with "name" not listed in dim-lock.json', async () => {
createEmptyDimJson();
await new UpdateAction().execute({}, "example2").catch(() => {
Expand Down Expand Up @@ -253,6 +359,135 @@ describe("UpdateAction", () => {
}
});

it("check if catalogResourceId and catalogResourceUrl in dim.json and dim-lock.json are not updated when they have been already set", async () => {
const kyGetStub = createKyGetStub("after", {
headers: {
"etag": '"12345-1234567890abc"',
"last-modified": "Thu, 3 Feb 2022 04:05:06 GMT",
},
});
try {
Deno.mkdirSync("data_files/test1", { recursive: true });
Deno.writeTextFileSync("data_files/test1/dummy.txt", "before");
const dimData: DimJSON = {
"fileVersion": "1.1",
"contents": [
{
name: "test1",
url: "https://example.com/dummy.txt",
catalogUrl: "https://example.com/test1",
catalogResourceId: "00000000-0000-0000-0000-000000000001",
postProcesses: [
"encoding-utf-8",
],
headers: {},
},
{
name: "test2",
url: "https://example.com/dummy.csv",
catalogUrl: "https://example.com/test2",
catalogResourceId: "00000000-0000-0000-0000-000000000002",
postProcesses: [],
headers: {},
},
{
url: "https://example.com/dummy.zip",
name: "test3",
catalogUrl: "https://example.com/test3",
catalogResourceId: "00000000-0000-0000-0000-000000000003",
postProcesses: [],
headers: {},
},
],
};
await Deno.writeTextFile(
"./dim.json",
JSON.stringify(dimData, null, 2),
);
await new UpdateAction().execute({}, undefined);
const dimLockJson = JSON.parse(
Deno.readTextFileSync("./dim-lock.json"),
);
assertEquals(dimLockJson, {
lockFileVersion: "1.1",
contents: [{
catalogResourceId: "00000000-0000-0000-0000-000000000001",
catalogUrl: "https://example.com/test1",
eTag: "12345-1234567890abc",
headers: {},
integrity: "405906c9d5be6ae5393ca65fb0e7c38e0d585ecb",
lastDownloaded: "2022-01-02T03:04:05.678Z",
lastModified: "2022-02-03T04:05:06.000Z",
name: "test1",
path: "./data_files/test1/dummy.txt",
postProcesses: ["encoding-utf-8"],
url: "https://example.com/dummy.txt",
}, {
catalogResourceId: "00000000-0000-0000-0000-000000000002",
catalogUrl: "https://example.com/test2",
eTag: "12345-1234567890abc",
headers: {},
integrity: "405906c9d5be6ae5393ca65fb0e7c38e0d585ecb",
lastDownloaded: "2022-01-02T03:04:05.678Z",
lastModified: "2022-02-03T04:05:06.000Z",
name: "test2",
path: "./data_files/test2/dummy.csv",
postProcesses: [],
url: "https://example.com/dummy.csv",
}, {
catalogResourceId: "00000000-0000-0000-0000-000000000003",
catalogUrl: "https://example.com/test3",
eTag: "12345-1234567890abc",
headers: {},
integrity: "405906c9d5be6ae5393ca65fb0e7c38e0d585ecb",
lastDownloaded: "2022-01-02T03:04:05.678Z",
lastModified: "2022-02-03T04:05:06.000Z",
name: "test3",
path: "./data_files/test3/dummy.zip",
postProcesses: [],
url: "https://example.com/dummy.zip",
}],
});

const dimJson = JSON.parse(
Deno.readTextFileSync("./dim.json"),
);
assertEquals(dimJson, {
"fileVersion": "1.1",
"contents": [
{
name: "test1",
url: "https://example.com/dummy.txt",
catalogUrl: "https://example.com/test1",
catalogResourceId: "00000000-0000-0000-0000-000000000001",
postProcesses: [
"encoding-utf-8",
],
headers: {},
},
{
name: "test2",
url: "https://example.com/dummy.csv",
catalogUrl: "https://example.com/test2",
catalogResourceId: "00000000-0000-0000-0000-000000000002",
postProcesses: [],
headers: {},
},
{
url: "https://example.com/dummy.zip",
name: "test3",
catalogUrl: "https://example.com/test3",
catalogResourceId: "00000000-0000-0000-0000-000000000003",
postProcesses: [],
headers: {},
},
],
});
} finally {
kyGetStub.restore();
}
});

it("exit with error when if the URL is incorrectly described.", async () => {
const kyGetStub = createKyGetStub("dummy", {
headers: {
Expand Down

0 comments on commit 6178063

Please sign in to comment.