Skip to content
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

Jump to bottom

fix(terraform): support github repo source url with underscores #9661

Merged
merged 15 commits into from Apr 23, 2021
Merged

fix(terraform): support github repo source url with underscores #9661

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0f4f453
Add underscore to github ref regex
raspy8766 Apr 21, 2021
93083f3
Merge branch 'master' into master
raspy8766 Apr 21, 2021
d16b3c9
Match only dot and case insensitive
raspy8766 Apr 21, 2021
fb72454
Match only dot and case insensitive for terraform regex
raspy8766 Apr 21, 2021
44cc381
Add unit tests for github source regex
raspy8766 Apr 21, 2021
52548b4
Add unit tests for github source regex
raspy8766 Apr 21, 2021
862c3e1
Fix merge conflict
raspy8766 Apr 21, 2021
2fac617
export terragrunt regex for unit testing
raspy8766 Apr 21, 2021
0e2c5ce
export terraform regex for unit testing
raspy8766 Apr 21, 2021
2412ed2
Merge branch 'master' into master
raspy8766 Apr 21, 2021
ad4478f
Merge branch 'master' into master
raspy8766 Apr 21, 2021
017ef9b
Merge branch 'master' into master
viceice Apr 22, 2021
302589e
Merge branch 'master' into master
rarkins Apr 22, 2021
0086292
Merge branch 'main' into master
viceice Apr 23, 2021
95a47db
Merge branch 'main' into master
viceice Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 64 additions & 0 deletions lib/manager/terraform/modules.spec.ts
View file
Open in desktop
@@ -0,0 +1,64 @@
import { getName } from '../../../test/util';
import { gitTagsRefMatchRegex, githubRefMatchRegex } from './modules';

describe(getName(__filename), () => {
describe('githubRefMatchRegex', () => {
it('should split project and tag from source', () => {
const { project, tag } = githubRefMatchRegex.exec(
'github.com/hashicorp/example?ref=v1.0.0'
).groups;
expect(project).toBe('hashicorp/example');
expect(tag).toBe('v1.0.0');
});

it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
const { project } = githubRefMatchRegex.exec(
'github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
expect(project).toBe('hashicorp/example.repo-123');
});
});
describe('gitTagsRefMatchRegex', () => {
it('should split project and tag from source', () => {
const http = gitTagsRefMatchRegex.exec(
'http://github.com/hashicorp/example?ref=v1.0.0'
).groups;
const https = gitTagsRefMatchRegex.exec(
'https://github.com/hashicorp/example?ref=v1.0.0'
).groups;
const ssh = gitTagsRefMatchRegex.exec(
'ssh://github.com/hashicorp/example?ref=v1.0.0'
).groups;

expect(http.project).toBe('hashicorp/example');
expect(http.tag).toBe('v1.0.0');

expect(https.project).toBe('hashicorp/example');
expect(https.tag).toBe('v1.0.0');

expect(ssh.project).toBe('hashicorp/example');
expect(ssh.tag).toBe('v1.0.0');
});

it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
const http = gitTagsRefMatchRegex.exec(
'http://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
const https = gitTagsRefMatchRegex.exec(
'https://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
const ssh = gitTagsRefMatchRegex.exec(
'ssh://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;

expect(http.project).toBe('hashicorp/example.repo-123');
expect(http.tag).toBe('v1.0.0');

expect(https.project).toBe('hashicorp/example.repo-123');
expect(https.tag).toBe('v1.0.0');

expect(ssh.project).toBe('hashicorp/example.repo-123');
expect(ssh.tag).toBe('v1.0.0');
});
});
});
4 changes: 2 additions & 2 deletions lib/manager/terraform/modules.ts
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ import type { PackageDependency } from '../types';
import { extractTerraformProvider } from './providers';
import { ExtractionResult, TerraformDependencyTypes } from './util';

const githubRefMatchRegex = /github.com([/:])(?<project>[^/]+\/[a-z0-9-.]+).*\?ref=(?<tag>.*)$/;
const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
export const githubRefMatchRegex = /github\.com([/:])(?<project>[^/]+\/[a-z0-9-_.]+).*\?ref=(?<tag>.*)$/i;
export const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
const hostnameMatchRegex = /^(?<hostname>([\w|\d]+\.)+[\w|\d]+)/;

export function extractTerraformModule(
Expand Down
64 changes: 64 additions & 0 deletions lib/manager/terragrunt/modules.spec.ts
View file
Open in desktop
@@ -0,0 +1,64 @@
import { getName } from '../../../test/util';
import { gitTagsRefMatchRegex, githubRefMatchRegex } from './modules';

describe(getName(__filename), () => {
describe('githubRefMatchRegex', () => {
it('should split project and tag from source', () => {
const { project, tag } = githubRefMatchRegex.exec(
'github.com/hashicorp/example?ref=v1.0.0'
).groups;
expect(project).toBe('hashicorp/example');
expect(tag).toBe('v1.0.0');
});

it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
const { project } = githubRefMatchRegex.exec(
'github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
expect(project).toBe('hashicorp/example.repo-123');
});
});
describe('gitTagsRefMatchRegex', () => {
it('should split project and tag from source', () => {
const http = gitTagsRefMatchRegex.exec(
'http://github.com/hashicorp/example?ref=v1.0.0'
).groups;
const https = gitTagsRefMatchRegex.exec(
'https://github.com/hashicorp/example?ref=v1.0.0'
).groups;
const ssh = gitTagsRefMatchRegex.exec(
'ssh://github.com/hashicorp/example?ref=v1.0.0'
).groups;

expect(http.project).toBe('hashicorp/example');
expect(http.tag).toBe('v1.0.0');

expect(https.project).toBe('hashicorp/example');
expect(https.tag).toBe('v1.0.0');

expect(ssh.project).toBe('hashicorp/example');
expect(ssh.tag).toBe('v1.0.0');
});

it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
const http = gitTagsRefMatchRegex.exec(
'http://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
const https = gitTagsRefMatchRegex.exec(
'https://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;
const ssh = gitTagsRefMatchRegex.exec(
'ssh://github.com/hashicorp/example.repo-123?ref=v1.0.0'
).groups;

expect(http.project).toBe('hashicorp/example.repo-123');
expect(http.tag).toBe('v1.0.0');

expect(https.project).toBe('hashicorp/example.repo-123');
expect(https.tag).toBe('v1.0.0');

expect(ssh.project).toBe('hashicorp/example.repo-123');
expect(ssh.tag).toBe('v1.0.0');
});
});
});
4 changes: 2 additions & 2 deletions lib/manager/terragrunt/modules.ts
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ import type { PackageDependency } from '../types';
import { extractTerragruntProvider } from './providers';
import { ExtractionResult, TerragruntDependencyTypes } from './util';

const githubRefMatchRegex = /github.com([/:])(?<project>[^/]+\/[a-z0-9-.]+).*\?ref=(?<tag>.*)$/;
const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
export const githubRefMatchRegex = /github\.com([/:])(?<project>[^/]+\/[a-z0-9-_.]+).*\?ref=(?<tag>.*)$/i;
export const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
const hostnameMatchRegex = /^(?<hostname>([\w|\d]+\.)+[\w|\d]+)/;

export function extractTerragruntModule(
Expand Down