Skip to content

Commit

Permalink
Merge branch 'main' into renovate-major-external-major
Browse files Browse the repository at this point in the history
  • Loading branch information
solaris007 authored Sep 30, 2024
2 parents 31ec3ac + 19322bb commit a4585b4
Show file tree
Hide file tree
Showing 46 changed files with 1,465 additions and 957 deletions.
1,056 changes: 518 additions & 538 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@
"@semantic-release/changelog": "6.0.3",
"@semantic-release/git": "10.0.1",
"@semantic-release/npm": "12.0.1",
"@typescript-eslint/eslint-plugin": "8.6.0",
"@typescript-eslint/parser": "8.6.0",
"@typescript-eslint/eslint-plugin": "8.7.0",
"@typescript-eslint/parser": "8.7.0",
"ajv": "8.17.1",
"c8": "10.1.2",
"eslint": "8.57.1",
"husky": "9.1.6",
"jsdoc-to-markdown": "9.0.1",
"jsdoc-to-markdown": "9.0.2",
"lint-staged": "15.2.10",
"mocha": "10.7.3",
"mocha-multi-reporters": "1.5.1",
"nock": "13.5.5",
"semantic-release": "24.1.1",
"semantic-release": "24.1.2",
"semantic-release-monorepo": "8.0.2",
"typescript": "5.6.2"
},
Expand Down
14 changes: 14 additions & 0 deletions packages/spacecat-shared-ahrefs-client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [@adobe/spacecat-shared-ahrefs-client-v1.5.5](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-ahrefs-client-v1.5.4...@adobe/spacecat-shared-ahrefs-client-v1.5.5) (2024-09-22)


### Bug Fixes

* **deps:** update dependency @adobe/helix-universal to v5.0.6 ([#379](https://github.com/adobe/spacecat-shared/issues/379)) ([6e4abc8](https://github.com/adobe/spacecat-shared/commit/6e4abc8768c61712c2c02d32406fa32acc3cd3a3))

# [@adobe/spacecat-shared-ahrefs-client-v1.5.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-ahrefs-client-v1.5.3...@adobe/spacecat-shared-ahrefs-client-v1.5.4) (2024-09-21)


### Bug Fixes

* **deps:** update adobe fixes ([#374](https://github.com/adobe/spacecat-shared/issues/374)) ([426e61b](https://github.com/adobe/spacecat-shared/commit/426e61b2e77a955a33651245344724881b0f4f55))

# [@adobe/spacecat-shared-ahrefs-client-v1.5.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-ahrefs-client-v1.5.2...@adobe/spacecat-shared-ahrefs-client-v1.5.3) (2024-09-14)


Expand Down
4 changes: 2 additions & 2 deletions packages/spacecat-shared-ahrefs-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/spacecat-shared-ahrefs-client",
"version": "1.5.3",
"version": "1.5.5",
"description": "Shared modules of the Spacecat Services - Ahrefs Client",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"dependencies": {
"@adobe/fetch": "4.1.9",
"@adobe/helix-universal": "5.0.5",
"@adobe/helix-universal": "5.0.6",
"@adobe/spacecat-shared-utils": "1.14.5"
},
"devDependencies": {
Expand Down
28 changes: 28 additions & 0 deletions packages/spacecat-shared-content-client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# [@adobe/spacecat-shared-content-client-v1.1.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-content-client-v1.1.3...@adobe/spacecat-shared-content-client-v1.1.4) (2024-09-28)


### Bug Fixes

* **deps:** update dependency @adobe/spacecat-helix-content-sdk to v1.1.13 ([#386](https://github.com/adobe/spacecat-shared/issues/386)) ([299f9db](https://github.com/adobe/spacecat-shared/commit/299f9db7965b162a3a121b4fe7a828d7540df9bb))

# [@adobe/spacecat-shared-content-client-v1.1.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-content-client-v1.1.2...@adobe/spacecat-shared-content-client-v1.1.3) (2024-09-22)


### Bug Fixes

* **deps:** update dependency @adobe/spacecat-helix-content-sdk to v1.1.12 ([#380](https://github.com/adobe/spacecat-shared/issues/380)) ([26a0f23](https://github.com/adobe/spacecat-shared/commit/26a0f23c52c19faa46ca9a0aa1d8ecd2d0d61bbf))

# [@adobe/spacecat-shared-content-client-v1.1.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-content-client-v1.1.1...@adobe/spacecat-shared-content-client-v1.1.2) (2024-09-22)


### Bug Fixes

* **deps:** update dependency @adobe/helix-universal to v5.0.6 ([#379](https://github.com/adobe/spacecat-shared/issues/379)) ([6e4abc8](https://github.com/adobe/spacecat-shared/commit/6e4abc8768c61712c2c02d32406fa32acc3cd3a3))

# [@adobe/spacecat-shared-content-client-v1.1.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-content-client-v1.1.0...@adobe/spacecat-shared-content-client-v1.1.1) (2024-09-21)


### Bug Fixes

* **deps:** update adobe fixes ([#374](https://github.com/adobe/spacecat-shared/issues/374)) ([426e61b](https://github.com/adobe/spacecat-shared/commit/426e61b2e77a955a33651245344724881b0f4f55))

# [@adobe/spacecat-shared-content-client-v1.1.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-content-client-v1.0.8...@adobe/spacecat-shared-content-client-v1.1.0) (2024-09-19)


Expand Down
6 changes: 3 additions & 3 deletions packages/spacecat-shared-content-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/spacecat-shared-content-client",
"version": "1.1.0",
"version": "1.1.4",
"description": "Shared modules of the Spacecat Services - Content Client",
"type": "module",
"engines": {
Expand Down Expand Up @@ -34,8 +34,8 @@
"access": "public"
},
"dependencies": {
"@adobe/helix-universal": "5.0.5",
"@adobe/spacecat-helix-content-sdk": "1.1.11",
"@adobe/helix-universal": "5.0.6",
"@adobe/spacecat-helix-content-sdk": "1.1.14",
"@adobe/spacecat-shared-utils": "1.19.6",
"graph-data-structure": "4.0.0"
},
Expand Down
42 changes: 42 additions & 0 deletions packages/spacecat-shared-data-access/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
# [@adobe/spacecat-shared-data-access-v1.45.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.3...@adobe/spacecat-shared-data-access-v1.45.4) (2024-09-28)


### Bug Fixes

* **deps:** update external fixes ([#387](https://github.com/adobe/spacecat-shared/issues/387)) ([5f301fb](https://github.com/adobe/spacecat-shared/commit/5f301fb7bfee78ab57c966ebc3559bc148744933))

# [@adobe/spacecat-shared-data-access-v1.45.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.2...@adobe/spacecat-shared-data-access-v1.45.3) (2024-09-26)


### Bug Fixes

* Modify the scope name to imports.all_domains ([#385](https://github.com/adobe/spacecat-shared/issues/385)) ([3462257](https://github.com/adobe/spacecat-shared/commit/34622579fec6e7fd8f49e1836b63576f0983a564))

# [@adobe/spacecat-shared-data-access-v1.45.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.1...@adobe/spacecat-shared-data-access-v1.45.2) (2024-09-25)


### Bug Fixes

* Add a unit test for imports.write_all_domains scope ([#384](https://github.com/adobe/spacecat-shared/issues/384)) ([800ec89](https://github.com/adobe/spacecat-shared/commit/800ec89532cc83f32290ced2b91f1af4fcccb44a))

# [@adobe/spacecat-shared-data-access-v1.45.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.0...@adobe/spacecat-shared-data-access-v1.45.1) (2024-09-24)


### Bug Fixes

* SITES-25634 [Importer] Expose hasCustomImportJs and hasCustomHeaders as two new fields on a import job ([#381](https://github.com/adobe/spacecat-shared/issues/381)) ([b90a7c5](https://github.com/adobe/spacecat-shared/commit/b90a7c5623af90924a2122dbc10077f989a8550b))

# [@adobe/spacecat-shared-data-access-v1.45.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.44.5...@adobe/spacecat-shared-data-access-v1.45.0) (2024-09-24)


### Features

* Add an additional scope to all imports on all domains ([#383](https://github.com/adobe/spacecat-shared/issues/383)) ([92ad32c](https://github.com/adobe/spacecat-shared/commit/92ad32c892b151082b1ac6b67b29f6307dbeba15))

# [@adobe/spacecat-shared-data-access-v1.44.5](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.44.4...@adobe/spacecat-shared-data-access-v1.44.5) (2024-09-23)


### Bug Fixes

* [Importer] Specify the list of supported features ([#362](https://github.com/adobe/spacecat-shared/issues/362)) ([c1cf7e1](https://github.com/adobe/spacecat-shared/commit/c1cf7e19b7a4bfe78a03a1996bb6d6c8667dd823))

# [@adobe/spacecat-shared-data-access-v1.44.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.44.3...@adobe/spacecat-shared-data-access-v1.44.4) (2024-09-21)


Expand Down
28 changes: 28 additions & 0 deletions packages/spacecat-shared-data-access/docs/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -975,13 +975,25 @@
"AttributeName": "successCount",
"AttributeType": "N"
},
{
"AttributeName": "redirectCount",
"AttributeType": "N"
},
{
"AttributeName": "urlCount",
"AttributeType": "N"
},
{
"AttributeName": "initiatedBy",
"AttributeType": "M"
},
{
"AttributeName": "hasCustomHeaders",
"AttributeType": "B"
},
{
"AttributeName": "hasCustomImportJs",
"AttributeType": "B"
}
],
"GlobalSecondaryIndexes": [
Expand All @@ -1000,6 +1012,22 @@
"Projection": {
"ProjectionType": "ALL"
}
},
{
"IndexName": "spacecat-services-all-import-jobs-by-date-range",
"KeyAttributes": {
"PartitionKey": {
"AttributeName": "GSI1PK",
"AttributeType": "S"
},
"SortKey": {
"AttributeName": "startTime",
"AttributeType": "S"
}
},
"Projection": {
"ProjectionType": "ALL"
}
}
],
"DataAccess": {
Expand Down
6 changes: 3 additions & 3 deletions packages/spacecat-shared-data-access/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/spacecat-shared-data-access",
"version": "1.44.4",
"version": "1.45.4",
"description": "Shared modules of the Spacecat Services - Data Access",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,8 +35,8 @@
"dependencies": {
"@adobe/spacecat-shared-dynamo": "1.2.5",
"@adobe/spacecat-shared-utils": "1.2.0",
"@aws-sdk/client-dynamodb": "3.656.0",
"@aws-sdk/lib-dynamodb": "3.656.0",
"@aws-sdk/client-dynamodb": "3.658.1",
"@aws-sdk/lib-dynamodb": "3.658.1",
"@types/joi": "17.2.3",
"joi": "17.13.3",
"uuid": "10.0.0"
Expand Down
29 changes: 19 additions & 10 deletions packages/spacecat-shared-data-access/src/dto/import-job.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
import { createImportJob } from '../models/importer/import-job.js';

/**
* Data Transfer Object for ImportJob
* The ImportJobDto is a helper that can convert an ImportJob object to a DynamoDB item and
* vice versa.
*/

export const ImportJobDto = {

/**
* Converts an ImportJob object into a DynamoDB item.
* @param importJob
* @returns {{duration: *, baseURL: *, failedCount: *, apiKey: *,
* options: *, successCount: *, importQueueId: *, startTime: *, id: *,
* endTime: *, status: *}}
*/
* Converts an ImportJob object into a DynamoDB item.
* @param importJob
* @returns {{duration: *, baseURL: *, failedCount: *, apiKey: *,
* options: *, successCount: *, importQueueId: *, startTime: *, id: *,
* endTime: *, status: *}}
*/
toDynamoItem: (importJob) => ({
id: importJob.getId(),
baseURL: importJob.getBaseURL(),
Expand All @@ -37,14 +37,19 @@ export const ImportJobDto = {
urlCount: importJob.getUrlCount(),
successCount: importJob.getSuccessCount(),
failedCount: importJob.getFailedCount(),
redirectCount: importJob.getRedirectCount(),
importQueueId: importJob.getImportQueueId(),
initiatedBy: importJob.getInitiatedBy(),
hasCustomHeaders: importJob.hasCustomHeaders(),
hasCustomImportJs: importJob.hasCustomImportJs(),
GSI1PK: 'ALL_IMPORT_JOBS',
}),

/**
* Converts a DynamoDB item into an ImportJob object.
*/
* Converts a DynamoDB item into an ImportJob object.
* @param {object} dynamoItem - The DynamoDB item to convert.
* @returns {ImportJob} - The ImportJob object.
*/
fromDynamoItem: (dynamoItem) => {
const importJobData = {
id: dynamoItem.id,
Expand All @@ -58,10 +63,14 @@ export const ImportJobDto = {
urlCount: dynamoItem.urlCount,
successCount: dynamoItem.successCount,
failedCount: dynamoItem.failedCount,
redirectCount: dynamoItem.redirectCount,
importQueueId: dynamoItem.importQueueId,
initiatedBy: dynamoItem.initiatedBy,
hasCustomHeaders: dynamoItem.hasCustomHeaders,
hasCustomImportJs: dynamoItem.hasCustomImportJs,
};

return createImportJob(importJobData);
},

};
15 changes: 9 additions & 6 deletions packages/spacecat-shared-data-access/src/dto/import-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
import { createImportUrl } from '../models/importer/import-url.js';

/**
* Data Transfer Object for ImportUrl
* The ImportUrlDto is a helper that can convert an ImportUrl object to a DynamoDB item and
* vice versa.
*/

export const ImportUrlDto = {

/**
* Converts an importUrl object to a DynamoDB item
*/
* Converts an ImportUrl object to a DynamoDB item.
* @returns {object} The new DynamoDB item.
*/
toDynamoItem: (importUrl) => ({
id: importUrl.getId(),
jobId: importUrl.getJobId(),
Expand All @@ -32,8 +33,10 @@ export const ImportUrlDto = {
}),

/**
* Converts a DynamoDB item into an ImportUrl object
*/
* Converts a DynamoDB item into an ImportUrl object.
* @param {object} dynamoItem - The DynamoDB item to convert.
* @returns {ImportUrl} - The ImportUrl object.
*/
fromDynamoItem: (dynamoItem) => {
const importUrlData = {
id: dynamoItem.id,
Expand Down
Loading

0 comments on commit a4585b4

Please sign in to comment.