Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc67fad700 | ||
|
|
67a28beebc | ||
|
|
ab07c6ee52 | ||
|
|
1ebaf7335e | ||
|
|
b85449155b | ||
|
|
950d5c5a19 | ||
|
|
4f5c0cdd7c | ||
|
|
d790b19dfe | ||
|
|
8e5fadaee0 | ||
|
|
1590065a78 | ||
|
|
2e1b37d8fb | ||
|
|
3dc747dce1 | ||
|
|
2573e7f4c0 | ||
|
|
5059fd86e9 | ||
|
|
4ebf07e899 | ||
|
|
d722849477 | ||
|
|
d7ee0471b0 | ||
|
|
40314b1002 | ||
|
|
b95ff7bca1 | ||
|
|
9f9136cb72 | ||
|
|
16530875f9 | ||
|
|
955386a494 | ||
|
|
de77530ea5 | ||
|
|
2d1351cb35 | ||
|
|
11da833829 | ||
|
|
823190d895 | ||
|
|
1b71c03ec0 | ||
|
|
579f64ca0a | ||
|
|
3f29bdade4 | ||
|
|
8b56ea036f | ||
|
|
2e2fadf6e3 | ||
|
|
015b1b5f51 | ||
|
|
4b1a4bb484 | ||
|
|
3ba533f0ff | ||
|
|
f866d47eb4 | ||
|
|
03ca5ee9b4 | ||
|
|
a57cec0ff6 | ||
|
|
2a3abf56ec | ||
|
|
9e64bda1bc | ||
|
|
dd732b0272 | ||
|
|
24d9720e95 | ||
|
|
74d5634479 | ||
|
|
f92370924c | ||
|
|
32a61cce5a | ||
|
|
4a4792c2ca | ||
|
|
202973a37c | ||
|
|
728b36f7bb | ||
|
|
3f60feb215 | ||
|
|
812a4d0496 |
2
.github/workflows/automerge-dependabot.yml
vendored
2
.github/workflows/automerge-dependabot.yml
vendored
@@ -6,7 +6,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.actor == 'dependabot[bot]'
|
||||
steps:
|
||||
- uses: peter-evans/enable-pull-request-automerge@v2
|
||||
- uses: peter-evans/enable-pull-request-automerge@v3
|
||||
with:
|
||||
token: ${{ secrets.ACTIONS_BOT_TOKEN }}
|
||||
pull-request-number: ${{ github.event.pull_request.number }}
|
||||
|
||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -92,7 +92,7 @@ jobs:
|
||||
name: dist
|
||||
path: dist
|
||||
- name: Create Pull Request
|
||||
uses: peter-evans/create-pull-request@v4
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
with:
|
||||
token: ${{ secrets.ACTIONS_BOT_TOKEN }}
|
||||
commit-message: 'build: update distribution'
|
||||
|
||||
31
.github/workflows/update-major-version.yml
vendored
Normal file
31
.github/workflows/update-major-version.yml
vendored
Normal file
@@ -0,0 +1,31 @@
|
||||
name: Update Major Version
|
||||
run-name: Update ${{ github.event.inputs.main_version }} to ${{ github.event.inputs.target }}
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
target:
|
||||
description: The target tag or reference
|
||||
required: true
|
||||
main_version:
|
||||
type: choice
|
||||
description: The major version tag to update
|
||||
options:
|
||||
- v3
|
||||
|
||||
jobs:
|
||||
tag:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
token: ${{ secrets.ACTIONS_BOT_TOKEN }}
|
||||
fetch-depth: 0
|
||||
- name: Git config
|
||||
run: |
|
||||
git config user.name actions-bot
|
||||
git config user.email actions-bot@users.noreply.github.com
|
||||
- name: Tag new target
|
||||
run: git tag -f ${{ github.event.inputs.main_version }} ${{ github.event.inputs.target }}
|
||||
- name: Push new tag
|
||||
run: git push origin ${{ github.event.inputs.main_version }} --force
|
||||
@@ -30,8 +30,10 @@ This is useful if you `docker push` your images to Docker Hub. It provides an ea
|
||||
|
||||
#### Content limits
|
||||
|
||||
DockerHub has content limits, which if exceeded will result in the content being automatically truncated.
|
||||
The readme content is limited to 25,000 bytes, and `short-description` is limited to 100 characters.
|
||||
DockerHub has content limits.
|
||||
The readme content is limited to 25,000 bytes, and `short-description` is limited to 100 bytes.
|
||||
This action truncates content to prevent the request being rejected.
|
||||
If the content has been truncated a warning will be issued in the run log.
|
||||
|
||||
#### Specifying the file path
|
||||
|
||||
|
||||
10
__test__/utils.unit.test.ts
Normal file
10
__test__/utils.unit.test.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import {truncateToBytes} from '../src/utils'
|
||||
|
||||
describe('truncate to bytes tests', () => {
|
||||
test('unicode aware truncation to a number of bytes', async () => {
|
||||
expect(truncateToBytes('test string to be truncated', 10)).toEqual(
|
||||
'test strin'
|
||||
)
|
||||
expect(truncateToBytes('😀😁😂🤣😃😄😅', 10)).toEqual('😀😁')
|
||||
})
|
||||
})
|
||||
112
dist/index.js
vendored
112
dist/index.js
vendored
@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.updateRepositoryDescription = exports.getToken = void 0;
|
||||
const core = __importStar(__nccwpck_require__(2186));
|
||||
const fetch = __importStar(__nccwpck_require__(467));
|
||||
const DESCRIPTION_MAX_CHARS = 100;
|
||||
function getToken(username, password) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const body = {
|
||||
@@ -69,7 +68,7 @@ function updateRepositoryDescription(token, repository, description, fullDescrip
|
||||
full_description: fullDescription
|
||||
};
|
||||
if (description) {
|
||||
body['description'] = description.slice(0, DESCRIPTION_MAX_CHARS);
|
||||
body['description'] = description;
|
||||
}
|
||||
yield fetch(`https://hub.docker.com/v2/repositories/${repository}`, {
|
||||
method: 'patch',
|
||||
@@ -238,12 +237,9 @@ const core = __importStar(__nccwpck_require__(2186));
|
||||
const inputHelper = __importStar(__nccwpck_require__(5480));
|
||||
const dockerhubHelper = __importStar(__nccwpck_require__(1812));
|
||||
const readmeHelper = __importStar(__nccwpck_require__(3367));
|
||||
const utils = __importStar(__nccwpck_require__(918));
|
||||
const util_1 = __nccwpck_require__(3837);
|
||||
function getErrorMessage(error) {
|
||||
if (error instanceof Error)
|
||||
return error.message;
|
||||
return String(error);
|
||||
}
|
||||
const SHORT_DESCRIPTION_MAX_BYTES = 100;
|
||||
function run() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
@@ -254,17 +250,23 @@ function run() {
|
||||
core.info('Reading description source file');
|
||||
const readmeContent = yield readmeHelper.getReadmeContent(inputs.readmeFilepath, inputs.enableUrlCompletion, inputs.imageExtensions);
|
||||
core.debug(readmeContent);
|
||||
// Truncate the short description if it is too long
|
||||
const truncatedShortDescription = utils.truncateToBytes(inputs.shortDescription, SHORT_DESCRIPTION_MAX_BYTES);
|
||||
if (truncatedShortDescription.length !== inputs.shortDescription.length) {
|
||||
core.warning(`The short description exceeds DockerHub's limit and has been truncated to ${SHORT_DESCRIPTION_MAX_BYTES} bytes.`);
|
||||
}
|
||||
core.debug(`Truncated short description: ${truncatedShortDescription}`);
|
||||
// Acquire a token for the Docker Hub API
|
||||
core.info('Acquiring token');
|
||||
const token = yield dockerhubHelper.getToken(inputs.username, inputs.password);
|
||||
// Send a PATCH request to update the description of the repository
|
||||
core.info('Sending PATCH request');
|
||||
yield dockerhubHelper.updateRepositoryDescription(token, inputs.repository, inputs.shortDescription, readmeContent);
|
||||
yield dockerhubHelper.updateRepositoryDescription(token, inputs.repository, truncatedShortDescription, readmeContent);
|
||||
core.info('Request successful');
|
||||
}
|
||||
catch (error) {
|
||||
core.debug((0, util_1.inspect)(error));
|
||||
core.setFailed(getErrorMessage(error));
|
||||
core.setFailed(utils.getErrorMessage(error));
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -314,6 +316,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.completeRelativeUrls = exports.getReadmeContent = exports.ENABLE_URL_COMPLETION_DEFAULT = exports.IMAGE_EXTENSIONS_DEFAULT = exports.README_FILEPATH_DEFAULT = void 0;
|
||||
const core = __importStar(__nccwpck_require__(2186));
|
||||
const fs = __importStar(__nccwpck_require__(7147));
|
||||
const utils = __importStar(__nccwpck_require__(918));
|
||||
exports.README_FILEPATH_DEFAULT = './README.md';
|
||||
exports.IMAGE_EXTENSIONS_DEFAULT = 'bmp,gif,jpg,jpeg,png,svg,webp';
|
||||
exports.ENABLE_URL_COMPLETION_DEFAULT = false;
|
||||
@@ -321,6 +324,7 @@ const TITLE_REGEX = `(?: +"[^"]+")?`;
|
||||
const REPOSITORY_URL = `${process.env['GITHUB_SERVER_URL']}/${process.env['GITHUB_REPOSITORY']}`;
|
||||
const BLOB_PREFIX = `${REPOSITORY_URL}/blob/${process.env['GITHUB_REF_NAME']}/`;
|
||||
const RAW_PREFIX = `${REPOSITORY_URL}/raw/${process.env['GITHUB_REF_NAME']}/`;
|
||||
const MAX_BYTES = 25000;
|
||||
function getReadmeContent(readmeFilepath, enableUrlCompletion, imageExtensions) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
// Fetch the readme content
|
||||
@@ -328,7 +332,11 @@ function getReadmeContent(readmeFilepath, enableUrlCompletion, imageExtensions)
|
||||
encoding: 'utf8'
|
||||
});
|
||||
readmeContent = completeRelativeUrls(readmeContent, readmeFilepath, enableUrlCompletion, imageExtensions);
|
||||
return readmeContent;
|
||||
const truncatedReadmeContent = utils.truncateToBytes(readmeContent, MAX_BYTES);
|
||||
if (truncatedReadmeContent.length !== readmeContent.length) {
|
||||
core.warning(`The README content exceeds DockerHub's limit and has been truncated to ${MAX_BYTES} bytes.`);
|
||||
}
|
||||
return truncatedReadmeContent;
|
||||
});
|
||||
}
|
||||
exports.getReadmeContent = getReadmeContent;
|
||||
@@ -432,6 +440,32 @@ function getRelativeUrlRules() {
|
||||
}
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 918:
|
||||
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
||||
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.truncateToBytes = exports.getErrorMessage = void 0;
|
||||
const unicodeSubstring = __nccwpck_require__(6986);
|
||||
function getErrorMessage(error) {
|
||||
if (error instanceof Error)
|
||||
return error.message;
|
||||
return String(error);
|
||||
}
|
||||
exports.getErrorMessage = getErrorMessage;
|
||||
function truncateToBytes(s, n) {
|
||||
let len = n;
|
||||
while (Buffer.byteLength(s) > n) {
|
||||
s = unicodeSubstring(s, 0, len--);
|
||||
}
|
||||
return s;
|
||||
}
|
||||
exports.truncateToBytes = truncateToBytes;
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 7351:
|
||||
@@ -6430,6 +6464,64 @@ if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
|
||||
exports.debug = debug; // for test
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 6986:
|
||||
/***/ ((module) => {
|
||||
|
||||
"use strict";
|
||||
|
||||
|
||||
function charAt(string, index) {
|
||||
var first = string.charCodeAt(index);
|
||||
var second;
|
||||
if (first >= 55296 && first <= 56319 && string.length > index + 1) {
|
||||
second = string.charCodeAt(index + 1);
|
||||
if (second >= 56320 && second <= 57343) {
|
||||
return string.substring(index, index + 2);
|
||||
}
|
||||
}
|
||||
return string[index];
|
||||
}
|
||||
|
||||
function slice(string, start, end) {
|
||||
var accumulator = "";
|
||||
var character;
|
||||
var stringIndex = 0;
|
||||
var unicodeIndex = 0;
|
||||
var length = string.length;
|
||||
|
||||
while (stringIndex < length) {
|
||||
character = charAt(string, stringIndex);
|
||||
if (unicodeIndex >= start && unicodeIndex < end) {
|
||||
accumulator += character;
|
||||
}
|
||||
stringIndex += character.length;
|
||||
unicodeIndex += 1;
|
||||
}
|
||||
return accumulator;
|
||||
}
|
||||
|
||||
function toNumber(value, fallback) {
|
||||
if (value === undefined) {
|
||||
return fallback;
|
||||
} else {
|
||||
return Number(value);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = function (string, start, end) {
|
||||
var realStart = toNumber(start, 0);
|
||||
var realEnd = toNumber(end, string.length);
|
||||
if (realEnd == realStart) {
|
||||
return "";
|
||||
} else if (realEnd > realStart) {
|
||||
return slice(string, realStart, realEnd);
|
||||
} else {
|
||||
return slice(string, realEnd, realStart);
|
||||
}
|
||||
};
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 5840:
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh -l
|
||||
set -eo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
# Execute the action code and output to file
|
||||
node index.js > action.log 2>&1
|
||||
node /index.js > action.log 2>&1
|
||||
exit_code=$?
|
||||
|
||||
# Remove lines containing sensitive information from the log
|
||||
sed -i '/::debug::/d' ./action.log
|
||||
@@ -11,3 +11,6 @@ sed -i '/::add-mask::/d' ./action.log
|
||||
|
||||
# Output the log
|
||||
cat action.log
|
||||
|
||||
# Exit using the exit code of the node command
|
||||
exit $exit_code
|
||||
|
||||
5311
package-lock.json
generated
5311
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
13
package.json
13
package.json
@@ -28,20 +28,21 @@
|
||||
"homepage": "https://github.com/peter-evans/dockerhub-description#readme",
|
||||
"dependencies": {
|
||||
"@actions/core": "^1.10.0",
|
||||
"node-fetch": "^2.6.9"
|
||||
"node-fetch": "^2.6.11",
|
||||
"unicode-substring": "^0.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^27.0.3",
|
||||
"@types/node": "^16.18.12",
|
||||
"@typescript-eslint/parser": "^5.53.0",
|
||||
"@types/node": "^16.18.36",
|
||||
"@typescript-eslint/parser": "^5.59.11",
|
||||
"@vercel/ncc": "^0.36.1",
|
||||
"eslint": "^8.35.0",
|
||||
"eslint-plugin-github": "^4.6.1",
|
||||
"eslint": "^8.43.0",
|
||||
"eslint-plugin-github": "^4.8.0",
|
||||
"eslint-plugin-jest": "^25.7.0",
|
||||
"jest": "^27.5.1",
|
||||
"jest-circus": "^27.5.1",
|
||||
"js-yaml": "^4.1.0",
|
||||
"prettier": "^2.8.4",
|
||||
"prettier": "^2.8.8",
|
||||
"ts-jest": "^27.1.5",
|
||||
"typescript": "^4.9.5"
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import * as core from '@actions/core'
|
||||
import * as fetch from 'node-fetch'
|
||||
|
||||
const DESCRIPTION_MAX_CHARS = 100
|
||||
|
||||
export async function getToken(
|
||||
username: string,
|
||||
password: string
|
||||
@@ -36,7 +34,7 @@ export async function updateRepositoryDescription(
|
||||
full_description: fullDescription
|
||||
}
|
||||
if (description) {
|
||||
body['description'] = description.slice(0, DESCRIPTION_MAX_CHARS)
|
||||
body['description'] = description
|
||||
}
|
||||
await fetch(`https://hub.docker.com/v2/repositories/${repository}`, {
|
||||
method: 'patch',
|
||||
|
||||
22
src/main.ts
22
src/main.ts
@@ -2,12 +2,10 @@ import * as core from '@actions/core'
|
||||
import * as inputHelper from './input-helper'
|
||||
import * as dockerhubHelper from './dockerhub-helper'
|
||||
import * as readmeHelper from './readme-helper'
|
||||
import * as utils from './utils'
|
||||
import {inspect} from 'util'
|
||||
|
||||
function getErrorMessage(error: unknown) {
|
||||
if (error instanceof Error) return error.message
|
||||
return String(error)
|
||||
}
|
||||
const SHORT_DESCRIPTION_MAX_BYTES = 100
|
||||
|
||||
async function run(): Promise<void> {
|
||||
try {
|
||||
@@ -25,6 +23,18 @@ async function run(): Promise<void> {
|
||||
)
|
||||
core.debug(readmeContent)
|
||||
|
||||
// Truncate the short description if it is too long
|
||||
const truncatedShortDescription = utils.truncateToBytes(
|
||||
inputs.shortDescription,
|
||||
SHORT_DESCRIPTION_MAX_BYTES
|
||||
)
|
||||
if (truncatedShortDescription.length !== inputs.shortDescription.length) {
|
||||
core.warning(
|
||||
`The short description exceeds DockerHub's limit and has been truncated to ${SHORT_DESCRIPTION_MAX_BYTES} bytes.`
|
||||
)
|
||||
}
|
||||
core.debug(`Truncated short description: ${truncatedShortDescription}`)
|
||||
|
||||
// Acquire a token for the Docker Hub API
|
||||
core.info('Acquiring token')
|
||||
const token = await dockerhubHelper.getToken(
|
||||
@@ -36,13 +46,13 @@ async function run(): Promise<void> {
|
||||
await dockerhubHelper.updateRepositoryDescription(
|
||||
token,
|
||||
inputs.repository,
|
||||
inputs.shortDescription,
|
||||
truncatedShortDescription,
|
||||
readmeContent
|
||||
)
|
||||
core.info('Request successful')
|
||||
} catch (error) {
|
||||
core.debug(inspect(error))
|
||||
core.setFailed(getErrorMessage(error))
|
||||
core.setFailed(utils.getErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as core from '@actions/core'
|
||||
import * as fs from 'fs'
|
||||
import * as utils from './utils'
|
||||
|
||||
export const README_FILEPATH_DEFAULT = './README.md'
|
||||
export const IMAGE_EXTENSIONS_DEFAULT = 'bmp,gif,jpg,jpeg,png,svg,webp'
|
||||
@@ -10,6 +11,8 @@ const REPOSITORY_URL = `${process.env['GITHUB_SERVER_URL']}/${process.env['GITHU
|
||||
const BLOB_PREFIX = `${REPOSITORY_URL}/blob/${process.env['GITHUB_REF_NAME']}/`
|
||||
const RAW_PREFIX = `${REPOSITORY_URL}/raw/${process.env['GITHUB_REF_NAME']}/`
|
||||
|
||||
const MAX_BYTES = 25000
|
||||
|
||||
type Rule = {
|
||||
/**
|
||||
* all left of the relative url belonging to the markdown image/link
|
||||
@@ -42,7 +45,14 @@ export async function getReadmeContent(
|
||||
imageExtensions
|
||||
)
|
||||
|
||||
return readmeContent
|
||||
const truncatedReadmeContent = utils.truncateToBytes(readmeContent, MAX_BYTES)
|
||||
if (truncatedReadmeContent.length !== readmeContent.length) {
|
||||
core.warning(
|
||||
`The README content exceeds DockerHub's limit and has been truncated to ${MAX_BYTES} bytes.`
|
||||
)
|
||||
}
|
||||
|
||||
return truncatedReadmeContent
|
||||
}
|
||||
|
||||
export function completeRelativeUrls(
|
||||
|
||||
14
src/utils.ts
Normal file
14
src/utils.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import unicodeSubstring = require('unicode-substring')
|
||||
|
||||
export function getErrorMessage(error: unknown) {
|
||||
if (error instanceof Error) return error.message
|
||||
return String(error)
|
||||
}
|
||||
|
||||
export function truncateToBytes(s: string, n: number): string {
|
||||
let len = n
|
||||
while (Buffer.byteLength(s) > n) {
|
||||
s = unicodeSubstring(s, 0, len--)
|
||||
}
|
||||
return s
|
||||
}
|
||||
Reference in New Issue
Block a user