Skip to content

Commit

Permalink
feat(hole-punch): update rust v0.52 to master (#317)
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaseizinger authored Oct 27, 2023
1 parent 5332a26 commit eb21984
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image_name := rust-v0.52
commitSha := 1ead41ed04ce89e50b11a078586e47d89e17d3c4
image_name := rust-master
commitSha := 461209ab1ba6b8e2a653ca354a5aad38802a35f9

all: image.json

Expand Down
24 changes: 12 additions & 12 deletions hole-punch-interop/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@ export type Version = {

export const versions: Array<Version> = [
{
id: "rust-v0.52",
id: "rust-master",
transports: ["tcp", "quic"],
},
].map((v: Version) => (typeof v.containerImageID === "undefined" ? ({ ...v, containerImageID: canonicalImageIDLookup(v.id) }) : v))
containerImageID: readImageId("./impl/rust/master/image.json"),
} as Version,
].map((v: Version) => (typeof v.containerImageID === "undefined" ? ({ ...v, containerImageID: readImageId(canonicalImagePath(v.id)) }) : v))

function readImageId(path: string): string {
return JSON.parse(fs.readFileSync(path, "utf8")).imageID;
}

// Finds the `image.json` for the given version id.
//
// Expects the form of "<impl>-vX.Y.Z" or "<impl>vX.Y".
// The image id must be in the file "./impl/<impl>/vX.Y/image.json" or "./impl/<impl>/v0.0.Z/image.json".
function canonicalImagePath(id: string): string {
// Split by implementation and version
const [impl, version] = id.split("-v")
Expand All @@ -28,12 +37,3 @@ function canonicalImagePath(id: string): string {
// Read the image ID from the JSON file on the filesystem
return `./impl/${impl}/${versionFolder}/image.json`
}

// Loads the container image id for the given version id. Expects the form of
// "<impl>-vX.Y.Z" or "<impl>vX.Y" and the image id to be in the file
// "./impl/<impl>/vX.Y/image.json" or "./impl/<impl>/v0.0.Z/image.json"
function canonicalImageIDLookup(id: string): string {
const imageIDJSON = fs.readFileSync(canonicalImagePath(id), "utf8")
const imageID = JSON.parse(imageIDJSON).imageID
return imageID
}

0 comments on commit eb21984

Please sign in to comment.