Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into v2.x.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/cli/package.json
#	packages/framework-provider-aws-infrastructure/package.json
#	packages/framework-provider-aws/package.json
#	packages/framework-provider-azure-infrastructure/package.json
#	packages/metadata-booster/package.json
  • Loading branch information
javiertoledo committed Oct 31, 2023
2 parents 7d09270 + 7fab52d commit 9d2fd48
Show file tree
Hide file tree
Showing 32 changed files with 180 additions and 141 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: Bug Report
about: Use this template for reporting a bug.
labels: bug
---

# Bug Report
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Documentation issue
about: Use this template for reporting issue or improvements for documentation.
labels: documentation
---

## Documentation bug, improvement
# Documentation issue

## Description

Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Feature request
about: Use this template to suggest an idea for this project.
labels: feature-request
---

## Feature Request
# Feature Request

## Description

Expand Down
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/maintainance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Maintainance task
about: Use this template to propose a maintainance task.
labels: maintainance
---

# Maintainance task

## Description

<!--- Description of the maintainance task you are proposing. Please include as much context and information as possible. -->

## Possible Solution

<!--- Only if you have suggestions on a implementation -->

## Additional information

<!-- Only if you want to share additional context or related information -->
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/sweep-template.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/re_test-integration-prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.18

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wf_publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
working-directory: website
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.18
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wf_publish-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
USER_NAME: ${{ secrets.DEPLOYING_USER_NAME }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN_ACTION }} # Token for pushing

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.18
registry-url: https://registry.npmjs.org/
Expand Down
4 changes: 4 additions & 0 deletions booster.code-workspace
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"folders": [
{
"name": "✨ root",
"path": "."
},
{
"name": "📦 @boostercloud/application-tester",
"path": "packages/application-tester"
Expand Down
2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@
"definitionName": "lockStepVersion",
"policyName": "booster",
"mainProject": "@boostercloud/framework-core",
"version": "1.20.0"
"version": "1.21.0"
}
]
6 changes: 3 additions & 3 deletions packages/application-tester/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@boostercloud/application-tester",
"version": "1.20.0",
"version": "1.21.0",
"description": "Contains Booster types related to the information extracted from the user project",
"keywords": [
"application-tester"
Expand Down Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@apollo/client": "3.7.13",
"@boostercloud/framework-types": "workspace:^1.20.0",
"@boostercloud/framework-types": "workspace:^1.21.0",
"cross-fetch": "3.1.5",
"graphql": "^16.6.0",
"jsonwebtoken": "9.0.1",
Expand All @@ -48,7 +48,7 @@
"@effect-ts/core": "^0.60.4"
},
"devDependencies": {
"@boostercloud/eslint-config": "workspace:^1.20.0",
"@boostercloud/eslint-config": "workspace:^1.21.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"eslint": "^8.23.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@boostercloud/cli",
"description": "CLI of the Booster Framework, the next level of abstraction for cloud-native applications",
"version": "1.20.0",
"version": "1.21.0",
"author": "Boosterin Labs SLU",
"homepage": "https://boosterframework.com",
"publishConfig": {
Expand All @@ -12,8 +12,8 @@
},
"bugs": "https://github.com/boostercloud/booster/issues",
"dependencies": {
"@boostercloud/framework-core": "workspace:^1.20.0",
"@boostercloud/framework-types": "workspace:^1.20.0",
"@boostercloud/framework-core": "workspace:^1.21.0",
"@boostercloud/framework-types": "workspace:^1.21.0",
"@oclif/core" : "^3.9.0",
"@oclif/plugin-help": "^5",
"chalk": "^2.4.2",
Expand All @@ -30,8 +30,8 @@
"@effect-ts/core": "^0.60.4"
},
"devDependencies": {
"@boostercloud/eslint-config": "workspace:^1.20.0",
"@boostercloud/application-tester": "workspace:^1.20.0",
"@boostercloud/eslint-config": "workspace:^1.21.0",
"@boostercloud/application-tester": "workspace:^1.21.0",
"@oclif/test": "^3.0.3",
"@types/chai": "4.2.18",
"@types/chai-as-promised": "7.1.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/framework-common-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@boostercloud/framework-common-helpers",
"version": "1.20.0",
"version": "1.21.0",
"description": "Contains Booster common helpers used by the core and provider packages",
"keywords": [
"framework-common-helpers"
Expand Down Expand Up @@ -36,13 +36,13 @@
"node": ">=18.0.0 <19.0.0"
},
"dependencies": {
"@boostercloud/framework-types": "workspace:^1.20.0",
"@boostercloud/framework-types": "workspace:^1.21.0",
"child-process-promise": "^2.2.1",
"tslib": "^2.4.0",
"@effect-ts/core": "^0.60.4"
},
"devDependencies": {
"@boostercloud/eslint-config": "workspace:^1.20.0",
"@boostercloud/eslint-config": "workspace:^1.21.0",
"@types/chai": "4.2.18",
"@types/chai-as-promised": "7.1.4",
"@types/child-process-promise": "^2.2.1",
Expand Down
28 changes: 28 additions & 0 deletions packages/framework-core/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
{
"name": "@boostercloud/framework-core",
"entries": [
{
"version": "1.21.0",
"tag": "@boostercloud/framework-core_v1.21.0",
"date": "Mon, 30 Oct 2023 16:27:59 GMT",
"comments": {
"minor": [
{
"comment": "Add elapsed time to data migration entities",
"author": "gonzalojaubert <[email protected]>",
"commit": "b37bb4430ee9dc6708f53f7b0f56431bb717464d"
}
],
"dependency": [
{
"comment": "Updating dependency \"@boostercloud/framework-common-helpers\" from `^1.20.0` to `^1.21.0`"
},
{
"comment": "Updating dependency \"@boostercloud/framework-types\" from `^1.20.0` to `^1.21.0`"
},
{
"comment": "Updating dependency \"@boostercloud/metadata-booster\" from `^1.20.0` to `^1.21.0`"
},
{
"comment": "Updating dependency \"@boostercloud/eslint-config\" from `^1.20.0` to `^1.21.0`"
}
]
}
},
{
"version": "1.20.0",
"tag": "@boostercloud/framework-core_v1.20.0",
Expand Down
9 changes: 8 additions & 1 deletion packages/framework-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log - @boostercloud/framework-core

This log was last generated on Tue, 10 Oct 2023 12:54:54 GMT and should not be manually modified.
This log was last generated on Mon, 30 Oct 2023 16:27:59 GMT and should not be manually modified.

## 1.21.0
Mon, 30 Oct 2023 16:27:59 GMT

### Minor changes

- Add elapsed time to data migration entities

## 1.20.0
Tue, 10 Oct 2023 12:54:54 GMT
Expand Down
10 changes: 5 additions & 5 deletions packages/framework-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@boostercloud/framework-core",
"version": "1.20.0",
"version": "1.21.0",
"description": "Library for your Booster apps",
"author": "Boosterin Labs SLU",
"homepage": "https://boosterframework.com",
Expand Down Expand Up @@ -36,8 +36,8 @@
"graphql": "^16.6.0"
},
"dependencies": {
"@boostercloud/framework-common-helpers": "workspace:^1.20.0",
"@boostercloud/framework-types": "workspace:^1.20.0",
"@boostercloud/framework-common-helpers": "workspace:^1.21.0",
"@boostercloud/framework-types": "workspace:^1.21.0",
"fp-ts": "^2.11.0",
"graphql-scalars": "^1.17.0",
"graphql-subscriptions": "2.0.0",
Expand All @@ -51,8 +51,8 @@
"@effect-ts/core": "^0.60.4"
},
"devDependencies": {
"@boostercloud/metadata-booster": "workspace:^1.20.0",
"@boostercloud/eslint-config": "workspace:^1.20.0",
"@boostercloud/metadata-booster": "workspace:^1.21.0",
"@boostercloud/eslint-config": "workspace:^1.21.0",
"@types/chai": "4.2.18",
"@types/chai-as-promised": "7.1.4",
"@types/faker": "5.1.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
import { DataMigrationStatus } from '@boostercloud/framework-types'
import { BoosterDataMigrationEntityDuration, DataMigrationStatus } from '@boostercloud/framework-types'
import { BoosterDataMigrationStarted } from '../events/booster-data-migration-started'
import { BoosterDataMigrationFinished } from '../events/booster-data-migration-finished'

export class BoosterDataMigrationEntity {
public constructor(public id: string, public status: DataMigrationStatus, public lastUpdated: string) {}
public constructor(
public id: string,
public status: DataMigrationStatus,
public lastUpdated: string,
public duration?: BoosterDataMigrationEntityDuration
) {}

public static started(
event: BoosterDataMigrationStarted,
currentDataMigration: BoosterDataMigrationEntity
): BoosterDataMigrationEntity {
return new BoosterDataMigrationEntity(event.name, DataMigrationStatus.RUNNING, event.lastUpdated)
const duration = {
start: new Date().toISOString(),
}
return new BoosterDataMigrationEntity(event.name, DataMigrationStatus.RUNNING, event.lastUpdated, duration)
}

public static finished(
event: BoosterDataMigrationFinished,
currentDataMigration: BoosterDataMigrationEntity
): BoosterDataMigrationEntity {
const current = new Date()
if (currentDataMigration.duration?.start) {
const start = currentDataMigration.duration.start
const end = current.toISOString()
const startTime = Date.parse(start)
const endTime = current.getTime()
const elapsedTime = endTime - startTime
const duration: BoosterDataMigrationEntityDuration = {
start: start,
end: end,
elapsedMilliseconds: elapsedTime,
}
return new BoosterDataMigrationEntity(event.name, DataMigrationStatus.FINISHED, event.lastUpdated, duration)
}
return new BoosterDataMigrationEntity(event.name, DataMigrationStatus.FINISHED, event.lastUpdated)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,10 @@ describe('Entities end-to-end tests', () => {
})
},
(result) => {
const count = result?.data?.ListDataMigrationsReadModels?.count
const resultReadModels = result?.data?.ListDataMigrationsReadModels
const count = resultReadModels?.count
if (count < 2) {
return `Waiting for ${count} migrations. Done ${count} migrations`
return `Waiting for at least 2 migrations. Done ${count} migrations. ${JSON.stringify(resultReadModels)}`
}
return true
}
Expand Down
28 changes: 14 additions & 14 deletions packages/framework-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{
"name": "@boostercloud/framework-integration-tests",
"description": "Example project for Booster",
"version": "1.20.0",
"version": "1.21.0",
"author": "Boosterin Labs SLU",
"homepage": "https://boosterframework.com",
"publishConfig": {
"access": "restricted"
},
"bugs": "https://github.com/boostercloud/booster/issues",
"dependencies": {
"@boostercloud/framework-common-helpers": "workspace:^1.20.0",
"@boostercloud/framework-core": "workspace:^1.20.0",
"@boostercloud/framework-provider-aws": "workspace:^1.20.0",
"@boostercloud/framework-provider-azure": "workspace:^1.20.0",
"@boostercloud/framework-provider-local": "workspace:^1.20.0",
"@boostercloud/framework-types": "workspace:^1.20.0",
"@boostercloud/framework-common-helpers": "workspace:^1.21.0",
"@boostercloud/framework-core": "workspace:^1.21.0",
"@boostercloud/framework-provider-aws": "workspace:^1.21.0",
"@boostercloud/framework-provider-azure": "workspace:^1.21.0",
"@boostercloud/framework-provider-local": "workspace:^1.21.0",
"@boostercloud/framework-types": "workspace:^1.21.0",
"aws-sdk": "2.853.0",
"graphql": "^16.6.0",
"tslib": "^2.4.0",
"@effect-ts/core": "^0.60.4",
"express-unless": "2.1.3"
},
"devDependencies": {
"@boostercloud/eslint-config": "workspace:^1.20.0",
"@boostercloud/application-tester": "workspace:^1.20.0",
"@boostercloud/cli": "workspace:^1.20.0",
"@boostercloud/framework-provider-aws-infrastructure": "workspace:^1.20.0",
"@boostercloud/framework-provider-azure-infrastructure": "workspace:^1.20.0",
"@boostercloud/framework-provider-local-infrastructure": "workspace:^1.20.0",
"@boostercloud/metadata-booster": "workspace:^1.20.0",
"@boostercloud/eslint-config": "workspace:^1.21.0",
"@boostercloud/application-tester": "workspace:^1.21.0",
"@boostercloud/cli": "workspace:^1.21.0",
"@boostercloud/framework-provider-aws-infrastructure": "workspace:^1.21.0",
"@boostercloud/framework-provider-azure-infrastructure": "workspace:^1.21.0",
"@boostercloud/framework-provider-local-infrastructure": "workspace:^1.21.0",
"@boostercloud/metadata-booster": "workspace:^1.21.0",
"@types/aws-lambda": "8.10.48",
"@types/chai": "4.2.18",
"@types/chai-arrays": "2.0.0",
Expand Down
Loading

0 comments on commit 9d2fd48

Please sign in to comment.