Skip to content

feat: support custom endpoint config #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support custom endpoint config #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 166 additions & 0 deletions __tests__/login.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,170 @@ describe('run', () => {
// Act & Assert
await expect(run()).rejects.toThrow(errorMessage);
});

// Tests for endpoint handling logic
test('should use custom endpoint when provided', async () => {
// Arrange
const mockResult = {
data: {
tempUserName: 'temp-user',
authorizationToken: 'temp-token'
}
};

const mockROAClient = {
request: jest.fn().mockResolvedValue(mockResult)
};

ROAClient.mockImplementation(() => mockROAClient);

Docker.getExecOutput.mockResolvedValue({
stderr: '',
exitCode: 0
});

core.getInput.mockImplementation((name) => {
switch (name) {
case 'access-key-id':
return 'test-access-key-id';
case 'access-key-secret':
return 'test-access-key-secret';
case 'region-id':
return 'cn-hangzhou';
case 'instance-id':
return '';
case 'endpoint':
return 'https://custom.endpoint.com';
case 'login-server':
return '';
default:
return '';
}
});

// Act
await run();

// Assert
expect(ROAClient).toHaveBeenCalledWith({
accessKeyId: 'test-access-key-id',
accessKeySecret: 'test-access-key-secret',
securityToken: '',
endpoint: 'https://custom.endpoint.com', // Should use custom endpoint
apiVersion: '2016-06-07'
});

expect(mockROAClient.request).toHaveBeenCalledWith('GET', '/tokens');
});

test('should use default endpoint when endpoint is not provided', async () => {
// Arrange
const mockResult = {
data: {
tempUserName: 'temp-user',
authorizationToken: 'temp-token'
}
};

const mockROAClient = {
request: jest.fn().mockResolvedValue(mockResult)
};

ROAClient.mockImplementation(() => mockROAClient);

Docker.getExecOutput.mockResolvedValue({
stderr: '',
exitCode: 0
});

core.getInput.mockImplementation((name) => {
switch (name) {
case 'access-key-id':
return 'test-access-key-id';
case 'access-key-secret':
return 'test-access-key-secret';
case 'region-id':
return 'cn-hangzhou';
case 'instance-id':
return '';
case 'endpoint':
return ''; // Empty endpoint
case 'login-server':
return '';
default:
return '';
}
});

// Spy on getAPIEndpoint
const { getAPIEndpoint } = require('../src/login.js');
jest.spyOn({ getAPIEndpoint }, 'getAPIEndpoint');
// Act
await run();

// Assert
expect(ROAClient).toHaveBeenCalledWith({
accessKeyId: 'test-access-key-id',
accessKeySecret: 'test-access-key-secret',
securityToken: '',
endpoint: 'https://cr.cn-hangzhou.aliyuncs.com', // Should use default endpoint
apiVersion: '2016-06-07'
});

expect(mockROAClient.request).toHaveBeenCalledWith('GET', '/tokens');
});

test('should use default endpoint when endpoint is empty string', async () => {
// Arrange
const mockResult = {
data: {
tempUserName: 'temp-user',
authorizationToken: 'temp-token'
}
};

const mockROAClient = {
request: jest.fn().mockResolvedValue(mockResult)
};

ROAClient.mockImplementation(() => mockROAClient);

Docker.getExecOutput.mockResolvedValue({
stderr: '',
exitCode: 0
});

core.getInput.mockImplementation((name) => {
switch (name) {
case 'access-key-id':
return 'test-access-key-id';
case 'access-key-secret':
return 'test-access-key-secret';
case 'region-id':
return 'cn-hangzhou';
case 'instance-id':
return '';
case 'endpoint':
return ''; // Empty string endpoint
case 'login-server':
return '';
default:
return '';
}
});

// Act
await run();

// Assert
expect(ROAClient).toHaveBeenCalledWith({
accessKeyId: 'test-access-key-id',
accessKeySecret: 'test-access-key-secret',
securityToken: '',
endpoint: 'https://cr.cn-hangzhou.aliyuncs.com', // Should use default endpoint
apiVersion: '2016-06-07'
});

expect(mockROAClient.request).toHaveBeenCalledWith('GET', '/tokens');
});
});
4 changes: 4 additions & 0 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ inputs:
description: 'Container registry server url'
required: true
default: ''
endpoint:
description: 'Container registry endpoint for OpenAPI'
required: false
default: ''
branding:
color: 'green'
icon: 'anchor'
Expand Down
6 changes: 5 additions & 1 deletion dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111759,14 +111759,18 @@ async function run() {
let regionId = core.getInput('region-id', { required: false });
let instanceId = core.getInput('instance-id', { required: false });
let loginServer = core.getInput('login-server', { required: false });
let endpoint = getAPIEndpoint(regionId);
let endpoint = core.getInput("endpoint", { required: false });

if (accessKeyId.length > 0) {
if (regionId.length === 0) {
core.setFailed(`Action failed for region-id is missing`);
return;
}

if (endpoint.length === 0) {
endpoint = getAPIEndpoint(regionId)
}

if (instanceId.length === 0) {

if (loginServer.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ async function run() {
let regionId = core.getInput('region-id', { required: false });
let instanceId = core.getInput('instance-id', { required: false });
let loginServer = core.getInput('login-server', { required: false });
let endpoint = getAPIEndpoint(regionId);
let endpoint = core.getInput("endpoint", { required: false });

if (accessKeyId.length > 0) {
if (regionId.length === 0) {
core.setFailed(`Action failed for region-id is missing`);
return;
}

if (endpoint.length === 0) {
endpoint = getAPIEndpoint(regionId)
}

if (instanceId.length === 0) {

if (loginServer.length === 0) {
Expand Down