Skip to content

Commit e2b16c1

Browse files
authored
Merge pull request #850 from puppetlabs/CAT-1491-fix_broken_module_links
(CAT-1491) - Fix broken forge urls in Puppetfile
2 parents 6865447 + 0dae3bf commit e2b16c1

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Happy linting! 💖
4040
"no-template-curly-in-string": "error",
4141
"require-atomic-updates": "error",
4242
"no-useless-backreference": "error",
43-
"@typescript-eslint/class-name-casing": "warn",
43+
"@typescript-eslint/naming-convention": "warn",
4444
"@typescript-eslint/member-delimiter-style": [
4545
"warn",
4646
{

src/forge.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/naming-convention */
12
import axios from 'axios';
23
import { extensions, MarkdownString } from 'vscode';
34
import { ILogger } from './logging';
@@ -46,7 +47,6 @@ export function getPDKVersion(logger: ILogger): Promise<string> {
4647
return axios
4748
.get('https://s3.amazonaws.com/puppet-pdk/pdk/LATEST', {
4849
params: {
49-
// eslint-disable-next-line @typescript-eslint/camelcase
5050
exclude_fields: 'readme changelog license reference',
5151
},
5252
headers: {
@@ -57,7 +57,7 @@ export function getPDKVersion(logger: ILogger): Promise<string> {
5757
.then((response) => {
5858
if (response.status !== 200) {
5959
logger.error(`Error getting Puppet forge data. Status: ${response.status}:${response.statusText}`);
60-
resolve();
60+
resolve(undefined);
6161
}
6262
return response.data;
6363
});
@@ -69,7 +69,6 @@ export function getModuleInfo(title: string, logger: ILogger): Promise<PuppetFor
6969
return axios
7070
.get(`https://forgeapi.puppet.com/v3/modules/${title}`, {
7171
params: {
72-
// eslint-disable-next-line @typescript-eslint/camelcase
7372
exclude_fields: 'readme changelog license reference',
7473
},
7574
headers: {
@@ -80,7 +79,7 @@ export function getModuleInfo(title: string, logger: ILogger): Promise<PuppetFor
8079
.then((response) => {
8180
if (response.status !== 200) {
8281
logger.error(`Error getting Puppet forge data. Status: ${response.status}:${response.statusText}`);
83-
resolve();
82+
resolve(undefined);
8483
}
8584

8685
const info = response.data;
@@ -93,7 +92,7 @@ export function getModuleInfo(title: string, logger: ILogger): Promise<PuppetFor
9392
created: new Date(info.created_at),
9493
updated: new Date(info.updated_at),
9594
endorsement: info.endorsement ?? '',
96-
forgeUrl: `https://forge.puppet.com/${info.owner.username}/${info.name}`,
95+
forgeUrl: `https://forge.puppet.com/modules/${info.owner.username}/${info.name}`,
9796
homepageUrl: info.homepage_url ?? '',
9897
version: info.current_release.version,
9998
owner: {
@@ -109,7 +108,7 @@ export function getModuleInfo(title: string, logger: ILogger): Promise<PuppetFor
109108
})
110109
.catch((error) => {
111110
logger.error(`Error getting Puppet forge data: ${error}`);
112-
resolve();
111+
resolve(undefined);
113112
});
114113
});
115114
}
@@ -119,7 +118,6 @@ export function getPuppetModuleCompletion(text: string, logger: ILogger): Promis
119118
return axios
120119
.get(`https://forgeapi.puppet.com/private/modules?starts_with=${text}`, {
121120
params: {
122-
// eslint-disable-next-line @typescript-eslint/camelcase
123121
exclude_fields: 'readme changelog license reference',
124122
},
125123
headers: {
@@ -130,7 +128,7 @@ export function getPuppetModuleCompletion(text: string, logger: ILogger): Promis
130128
.then((response) => {
131129
if (response.status !== 200) {
132130
logger.error(`Error getting Puppet forge data. Status: ${response.status}:${response.statusText}`);
133-
resolve();
131+
resolve(undefined);
134132
}
135133

136134
const info = response.data;
@@ -144,7 +142,7 @@ export function getPuppetModuleCompletion(text: string, logger: ILogger): Promis
144142
})
145143
.catch((error) => {
146144
logger.error(`Error getting Puppet forge data: ${error}`);
147-
resolve();
145+
resolve(undefined);
148146
});
149147
});
150148
}

0 commit comments

Comments
 (0)