Skip to content

relax validation #1472

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

Merged
ricardo-devis-agullo merged 1 commit into from
May 20, 2026
Merged

relax validation #1472

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
4 changes: 3 additions & 1 deletion src/registry/domain/validators/oc-cli-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ export default function ocCliVersion(userAgent?: string): Result {
}

const cliVersion = matchVersion[1];
if (semver.lt(cliVersion, packageInfo.version)) {
const cliMajorMinor = `${semver.major(cliVersion)}.${semver.minor(cliVersion)}.0`;
const registryMajorMinor = `${semver.major(packageInfo.version)}.${semver.minor(packageInfo.version)}.0`;
if (semver.lt(cliMajorMinor, registryMajorMinor)) {
return baseError({ code: 'old_version', cliVersion });
}

Expand Down
28 changes: 20 additions & 8 deletions test/unit/registry-domain-validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ describe('registry : domain : validator', () => {
'../../dist/registry/domain/validators/oc-cli-version.js',
{
'fs-extra': {
readJsonSync: () => ({ version: '0.16.34' })
readJsonSync: () => ({ version: '0.50.47' })
}
},
{
Expand All @@ -1298,7 +1298,7 @@ describe('registry : domain : validator', () => {
});

it('should suggest correct version of CLI', () => {
expect(result.error.suggestedVersion).to.equal('0.16.X');
expect(result.error.suggestedVersion).to.equal('0.50.X');
});
});

Expand All @@ -1310,24 +1310,24 @@ describe('registry : domain : validator', () => {
});

it('should suggest correct version of CLI', () => {
expect(result.error.suggestedVersion).to.equal('0.16.X');
expect(result.error.suggestedVersion).to.equal('0.50.X');
});
});

describe('when OC CLI version in user-agent header is lower than Registry version', () => {
const result = validate('oc-cli-0.2.3/v0.10.35-darwin-x64');
const result = validate('oc-cli-0.49.99/v0.10.35-darwin-x64');

it('should be invalid', () => {
expect(result.isValid).to.be.false;
});

it('should suggest correct version of CLI', () => {
expect(result.error.suggestedVersion).to.equal('0.16.X');
expect(result.error.suggestedVersion).to.equal('0.50.X');
});
});

describe('when OC CLI version in user-agent header is equal to Registry version', () => {
const result = validate('oc-cli-0.16.34/v0.10.35-darwin-x64');
describe('when OC CLI version in user-agent header is equal to Registry version (same major.minor)', () => {
const result = validate('oc-cli-0.50.40/v0.10.35-darwin-x64');

it('should be valid', () => {
expect(result.isValid).to.be.true;
Expand All @@ -1339,7 +1339,19 @@ describe('registry : domain : validator', () => {
});

describe('when OC CLI version in user-agent header is higher than Registry version', () => {
const result = validate('oc-cli-0.16.35/v0.10.35-darwin-x64');
const result = validate('oc-cli-0.51.0/v0.10.35-darwin-x64');

it('should be valid', () => {
expect(result.isValid).to.be.true;
});

it('should not return an error', () => {
expect(result.error).to.be.undefined;
});
});

describe('when OC CLI version has different patch version but same major.minor', () => {
const result = validate('oc-cli-0.50.99/v0.10.35-darwin-x64');

it('should be valid', () => {
expect(result.isValid).to.be.true;
Expand Down
Loading