Skip to content

Commit

Permalink
feat(manager/cargo): support for cargo repository source replacement (#…
Browse files Browse the repository at this point in the history 
…23956)

Co-authored-by: Michael Kriese <[email protected]>
Co-authored-by: Rhys Arkins <[email protected]>
  • Loading branch information
@dylanowen @viceice @rarkins
3 people authored Aug 25, 2023
1 parent 48ece9a commit 151435a
Show file tree
Hide file tree
Showing 5 changed files with 339 additions and 16 deletions.
2 changes: 1 addition & 1 deletion lib/modules/manager/cargo/__fixtures__/cargo.6.config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
private-crates = { index = "https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git" }

[registries.mcorbin]
index = "https://github.com/mcorbin/testregistry"
index = "https://github.com/mcorbin/testregistry"
255 changes: 255 additions & 0 deletions lib/modules/manager/cargo/extract.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,157 @@ describe('modules/manager/cargo/extract', () => {
expect(res?.deps).toHaveLength(3);
});

it('extracts overridden registry indexes from .cargo/config.toml', async () => {
await writeLocalFile(
'.cargo/config.toml',
codeBlock`[registries]
private-crates = { index = "https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git" }
[registries.mcorbin]
index = "https://github.com/mcorbin/testregistry"
[source.crates-io]
replace-with = "mcorbin"
[source.mcorbin]
replace-with = "private-crates"`
);
const res = await extractPackageFile(cargo6toml, 'Cargo.toml', {
...config,
});
expect(res?.deps).toEqual([
{
currentValue: '0.1.0',
datasource: 'crate',
depName: 'proprietary-crate',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
registryUrls: [
'https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git',
],
},
{
currentValue: '3.0.0',
datasource: 'crate',
depName: 'mcorbin-test',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
registryUrls: [
'https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git',
],
},
{
currentValue: '0.2',
datasource: 'crate',
depName: 'tokio',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
registryUrls: [
'https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git',
],
},
]);
});

it('extracts registries overridden to the default', async () => {
await writeLocalFile(
'.cargo/config.toml',
codeBlock`[source.mcorbin]
replace-with = "crates-io"
[source.private-crates]
replace-with = "mcorbin"`
);
const res = await extractPackageFile(cargo6toml, 'Cargo.toml', {
...config,
});
expect(res?.deps).toEqual([
{
currentValue: '0.1.0',
datasource: 'crate',
depName: 'proprietary-crate',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
},
{
currentValue: '3.0.0',
datasource: 'crate',
depName: 'mcorbin-test',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
},
{
currentValue: '0.2',
datasource: 'crate',
depName: 'tokio',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
},
]);
});

it('extracts registries with an empty config.toml', async () => {
await writeLocalFile('.cargo/config.toml', ``);
const res = await extractPackageFile(cargo5toml, 'Cargo.toml', {
...config,
});
expect(res?.deps).toEqual([
{
currentValue: '0.2.37',
datasource: 'crate',
depName: 'wasm-bindgen',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
target: 'cfg(target_arch = "wasm32")',
},
{
currentValue: '0.3.14',
datasource: 'crate',
depName: 'js-sys',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
target: 'cfg(target_arch = "wasm32")',
},
{
currentValue: '',
datasource: 'crate',
depName: 'js_relative_import',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
skipReason: 'path-dependency',
target: 'cfg(target_arch = "wasm32")',
},
{
currentValue: '0.3.14',
datasource: 'crate',
depName: 'web-sys',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
target: 'cfg(target_arch = "wasm32")',
},
]);
});

it('extracts registry urls from environment', async () => {
process.env.CARGO_REGISTRIES_PRIVATE_CRATES_INDEX =
'https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git';
Expand Down Expand Up @@ -249,6 +400,110 @@ tokio = { version = "1.21.1" }`;
expect(res?.deps).toHaveLength(3);
});

it('ignore cargo config source replaced registries with missing index', async () => {
await writeLocalFile(
'.cargo/config',
codeBlock`[registries.mine]
foo = "bar"
[source.crates-io]
replace-with = "mine"`
);

const res = await extractPackageFile(cargo6toml, 'Cargo.toml', {
...config,
});
expect(res?.deps).toEqual([
{
currentValue: '0.1.0',
datasource: 'crate',
depName: 'proprietary-crate',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
skipReason: 'unknown-registry',
},
{
currentValue: '3.0.0',
datasource: 'crate',
depName: 'mcorbin-test',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
skipReason: 'unknown-registry',
},
{
currentValue: '0.2',
datasource: 'crate',
depName: 'tokio',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
skipReason: 'unknown-registry',
},
]);
});

it('ignore cargo config with circular registry source replacements', async () => {
await writeLocalFile(
'.cargo/config',
codeBlock`[registries]
private-crates = { index = "https://dl.cloudsmith.io/basic/my-org/my-repo/cargo/index.git" }
[registries.mcorbin]
index = "https://github.com/mcorbin/testregistry"
[source.crates-io]
replace-with = "mcorbin"
[source.mcorbin]
replace-with = "private-crates"
[source.private-crates]
replace-with = "mcorbin"
`
);

const res = await extractPackageFile(cargo6toml, 'Cargo.toml', {
...config,
});
expect(res?.deps).toEqual([
{
currentValue: '0.1.0',
datasource: 'crate',
depName: 'proprietary-crate',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
skipReason: 'unknown-registry',
},
{
currentValue: '3.0.0',
datasource: 'crate',
depName: 'mcorbin-test',
depType: 'dependencies',
managerData: {
nestedVersion: true,
},
skipReason: 'unknown-registry',
},
{
currentValue: '0.2',
datasource: 'crate',
depName: 'tokio',
depType: 'dependencies',
managerData: {
nestedVersion: false,
},
skipReason: 'unknown-registry',
},
]);
});

it('extracts original package name of renamed dependencies', async () => {
const cargotoml =
'[dependencies]\nboolector-solver = { package = "boolector", version = "0.4.0" }';
Expand Down
Loading

0 comments on commit 151435a

Please sign in to comment.