Skip to content

fix: replace url with baseurl validation for schema and other checks #1256

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

Draft
martinst06 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: replace url with baseurl validation for schema and other checks #1256

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: 2 additions & 2 deletions packages/spacecat-shared-data-access/src/models/import-job/import-job.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
isNonEmptyObject,
isNumber,
isObject,
isValidUrl,
isValidBaseUrl,
} from '@adobe/spacecat-shared-utils';

import SchemaBuilder from '../base/schema.builder.js';
Expand Down Expand Up @@ -83,7 +83,7 @@ const schema = new SchemaBuilder(ImportJob, ImportJobCollection)
.addAttribute('baseURL', {
type: 'string',
required: true,
validate: (value) => isValidUrl(value),
validate: (value) => isValidBaseUrl(value),
})
.addAttribute('duration', {
type: 'number',
Expand Down
4 changes: 2 additions & 2 deletions packages/spacecat-shared-data-access/src/models/scrape-job/scrape-job.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
isIsoDate,
isNumber,
isObject,
isValidUrl,
isValidBaseUrl,
isString,
} from '@adobe/spacecat-shared-utils';

Expand All @@ -37,7 +37,7 @@ const schema = new SchemaBuilder(ScrapeJob, ScrapeJobCollection)
.addAttribute('baseURL', {
type: 'string',
required: true,
validate: (value) => isValidUrl(value),
validate: (value) => isValidBaseUrl(value),
})
.addAttribute('processingType', {
type: 'string',
Expand Down
4 changes: 2 additions & 2 deletions packages/spacecat-shared-data-access/src/models/site-candidate/site-candidate.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

/* c8 ignore start */

import { isObject, isValidUrl, isValidUUID } from '@adobe/spacecat-shared-utils';
import { isObject, isValidBaseUrl, isValidUUID } from '@adobe/spacecat-shared-utils';

import SchemaBuilder from '../base/schema.builder.js';
import SiteCandidate from './site-candidate.model.js';
Expand All @@ -33,7 +33,7 @@ const schema = new SchemaBuilder(SiteCandidate, SiteCandidateCollection)
.addAttribute('baseURL', {
type: 'string',
required: true,
validate: (value) => isValidUrl(value),
validate: (value) => isValidBaseUrl(value),
})
.addAttribute('hlxConfig', {
type: 'any',
Expand Down
3 changes: 2 additions & 1 deletion packages/spacecat-shared-data-access/src/models/site/site.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
isNonEmptyObject,
isObject,
isValidUrl,
isValidBaseUrl,
} from '@adobe/spacecat-shared-utils';

import { Config, DEFAULT_CONFIG, validateConfiguration } from './config.js';
Expand Down Expand Up @@ -51,7 +52,7 @@ const schema = new SchemaBuilder(Site, SiteCollection)
.addAttribute('baseURL', {
type: 'string',
required: true,
validate: (value) => isValidUrl(value),
validate: (value) => isValidBaseUrl(value),
})
.addAttribute('name', {
type: 'string',
Expand Down
3 changes: 2 additions & 1 deletion packages/spacecat-shared-google-client/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
isInteger,
isValidDate,
isValidUrl,
isValidBaseUrl,
resolveCustomerSecretsName,
} from '@adobe/spacecat-shared-utils';
import { fetch as httpFetch } from './utils.js';
Expand Down Expand Up @@ -61,7 +62,7 @@ export default class GoogleClient {
}

static async createFrom(context, baseURL) {
if (!isValidUrl(baseURL)) {
if (!isValidBaseUrl(baseURL)) {
throw new Error('Error creating GoogleClient: Invalid base URL');
}

Expand Down
Loading