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

Update CDKTF packages #1486

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update CDKTF packages #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69ffc7d
upgraded cdktf to 0.19 and helper packages
samueldominguez Oct 27, 2023
90c856e
upgraded node version to 18.12 whereever cdk packages are used
samueldominguez Oct 27, 2023
4fc7a59
Merge remote-tracking branch 'origin/v2.x.x' into upgrade/cdktf-0.19
javiertoledo Oct 30, 2023
1e4231d
rush should use use at least 18.20 to run integration tests
samueldominguez Oct 31, 2023
7329f16
azure min node version set to 18.12
samueldominguez Nov 10, 2023
b32d852
Merge branch 'main' into upgrade/cdktf-0.19
samueldominguez Nov 10, 2023
4d3cb2e
added change description for rush
samueldominguez Nov 10, 2023
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
10 changes: 10 additions & 0 deletions common/changes/@boostercloud/framework-core/upgrade-cdktf-0.19_2023-11-10-12-09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@boostercloud/framework-core",
"comment": "",
"type": "none"
}
],
"packageName": "@boostercloud/framework-core"
}
1,271 changes: 929 additions & 342 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/framework-integration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"@apollo/client": "3.7.13",
"cdktf": "^0.15.0",
"cdktf-cli": "^0.14.3",
"cdktf": "^0.19.0",
"cdktf-cli": "^0.19.0",
"ink": "^3.0.5",
"react": "^17.0.0",
"constructs": "^10.0.0",
Expand Down Expand Up @@ -78,7 +78,7 @@
"eslint-plugin-unicorn": "~44.0.2"
},
"engines": {
"node": ">=18.0.0 <19.0.0"
"node": ">=18.12.0 <19.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a requirement of the new CDK version? Otherwise, I'd leave it as 18.0.0 in order to be less restrictive for end users.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@javiertoledo yes, it seems to be a requirement for the new cdk tf version, see here. If it presents an issue, we can go back to version 0.17 I believe

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, no objections then!

},
"license": "Apache-2.0",
"main": "dist/index.js",
Expand Down Expand Up @@ -113,4 +113,4 @@
"integration/azure-func": "TS_NODE_PROJECT=\"./tsconfig.integration.json\" TESTED_PROVIDER=AZURE BOOSTER_ENV=azure mocha --forbid-only --exit --config \"integration/provider-unaware/end-to-end/.mocharc.yml\" \"integration/provider-unaware/functionality/**/*.integration.ts\""
},
"types": "dist/index.d.ts"
}
}
4 changes: 2 additions & 2 deletions packages/framework-provider-aws-infrastructure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"url": "git+https://github.com/boostercloud/booster.git"
},
"engines": {
"node": ">=18.0.0 <19.0.0"
"node": ">=18.12.0 <19.0.0"
},
"dependencies": {
"@aws-cdk/aws-apigateway": "^1.170.0",
Expand Down Expand Up @@ -112,4 +112,4 @@
"node-fetch@<2.6.1": ">=2.6.1"
}
}
}
}
12 changes: 6 additions & 6 deletions packages/framework-provider-azure-infrastructure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"url": "git+https://github.com/boostercloud/booster.git"
},
"engines": {
"node": ">=18.0.0 <19.0.0"
"node": ">=18.12.0 <19.0.0"
},
"dependencies": {
"@azure/arm-appservice": "^13.0.0",
Expand All @@ -29,14 +29,14 @@
"@boostercloud/framework-core": "workspace:^2.1.0",
"@boostercloud/framework-provider-azure": "workspace:^2.1.0",
"@boostercloud/framework-types": "workspace:^2.1.0",
"@cdktf/provider-azurerm": "5.0.13",
"@cdktf/provider-time": "5.0.0",
"@cdktf/provider-azurerm": "11.0.2",
"@cdktf/provider-time": "9.0.0",
"@types/archiver": "5.1.0",
"@types/needle": "^2.0.4",
"archiver": "5.3.0",
"@azure/arm-resources": "^5.0.1",
"cdktf": "^0.15.0",
"cdktf-cli": "^0.14.3",
"cdktf": "^0.19.0",
"cdktf-cli": "^0.19.0",
"ink": "^3.0.5",
"react": "^17.0.0",
"chai": "4.2.0",
Expand Down Expand Up @@ -104,4 +104,4 @@
"node-fetch@<2.6.1": ">=2.6.1"
}
}
}
}
4 changes: 2 additions & 2 deletions packages/framework-provider-azure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"url": "git+https://github.com/boostercloud/booster.git"
},
"engines": {
"node": ">=18.0.0 <19.0.0"
"node": ">=18.12.0 <19.0.0"
},
"dependencies": {
"@azure/cosmos": "^4.0.0",
Expand Down Expand Up @@ -83,4 +83,4 @@
"node-fetch@<2.6.1": ">=2.6.1"
}
}
}
}
23 changes: 1 addition & 22 deletions rush.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
{
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",

/**
* (Required) This specifies the version of the Rush engine to be used in this repo.
* Rush's "version selector" feature ensures that the globally installed tool will
Expand All @@ -17,7 +16,6 @@
* correct error-underlining and tab-completion for editors such as VS Code.
*/
"rushVersion": "5.76.1",

/**
* The next field selects which package manager should be installed and determines its version.
* Rush installs its own local copy of the package manager to ensure that your build process
Expand All @@ -27,10 +25,8 @@
* for details about these alternatives.
*/
"pnpmVersion": "7.9.5",

// "npmVersion": "6.14.15",
// "yarnVersion": "1.9.4",

/**
* Options that are only used when the PNPM package manager is selected
*/
Expand Down Expand Up @@ -108,7 +104,6 @@
*/
"useWorkspaces": true
},

/**
* Older releases of the Node.js engine may be missing features required by your system.
* Other releases may have bugs. In particular, the "latest" version will not be a
Expand All @@ -122,7 +117,6 @@
*/
// "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
"nodeSupportedVersionRange": ">=18.0.0 <19.0.0",

/**
* Odd-numbered major versions of Node.js are experimental. Even-numbered releases
* spend six months in a stabilization period before the first Long Term Support (LTS) version.
Expand All @@ -135,7 +129,6 @@
* to disable Rush's warning.
*/
// "suppressNodeLtsWarning": false,

/**
* If you would like the version specifiers for your dependencies to be consistent, then
* uncomment this line. This is effectively similar to running "rush check" before any
Expand All @@ -148,7 +141,6 @@
* section of the common-versions.json.
*/
"ensureConsistentVersions": true,

/**
* Large monorepos can become intimidating for newcomers if project folder paths don't follow
* a consistent and recognizable pattern. When the system allows nested folder trees,
Expand All @@ -174,7 +166,6 @@
*/
// "projectFolderMinDepth": 2,
// "projectFolderMaxDepth": 2,

/**
* Today the npmjs.com registry enforces fairly strict naming rules for packages, but in the early
* days there was no standard and hardly any enforcement. A few large legacy projects are still using
Expand All @@ -187,7 +178,6 @@
* The default value is false.
*/
// "allowMostlyStandardPackageNames": true,

/**
* This feature helps you to review and approve new packages before they are introduced
* to your monorepo. For example, you may be concerned about licensing, code quality,
Expand Down Expand Up @@ -223,7 +213,6 @@
// */
// // "ignoredNpmScopes": ["@types"]
// },

/**
* If you use Git as your version control system, this section has some additional
* optional features you can use.
Expand Down Expand Up @@ -267,7 +256,6 @@
*/
// "changeLogUpdateCommitMessage": "Update changelogs [skip ci]"
},

"repository": {
/**
* The URL of this Git repository, used by "rush change" to determine the base branch for your PR.
Expand Down Expand Up @@ -296,7 +284,6 @@
*/
"defaultRemote": "origin"
},

/**
* Event hooks are customized script actions that Rush executes when specific events occur
*/
Expand All @@ -305,23 +292,19 @@
* The list of shell commands to run before the Rush installation starts
*/
"preRushInstall": [],

/**
* The list of shell commands to run after the Rush installation finishes
*/
"postRushInstall": [],

/**
* The list of shell commands to run before the Rush build command starts
*/
"preRushBuild": [],

/**
* The list of shell commands to run after the Rush build command finishes
*/
"postRushBuild": []
},

/**
* Installation variants allow you to maintain a parallel set of configuration files that can be
* used to build the entire monorepo with an alternate set of dependencies. For example, suppose
Expand All @@ -340,7 +323,6 @@
* For more details and instructions, see this article: https://rushjs.io/pages/advanced/installation_variants/
*/
"variants": [],

/**
* Rush can collect anonymous telemetry about everyday developer activity such as
* success/failure of installs, builds, and other operations. You can use this to identify
Expand All @@ -350,21 +332,18 @@
* in the "eventHooks" section.
*/
// "telemetryEnabled": false,

/**
* Allows creation of hotfix changes. This feature is experimental so it is disabled by default.
* If this is set, 'rush change' only allows a 'hotfix' change type to be specified. This change type
* will be used when publishing subsequent changes from the monorepo.
*/
// "hotfixChangeEnabled": false,

/**
* This is an optional, but recommended, list of available tags that can be applied
* to projects. If this property is not specified, any tag is allowed. This
* list is useful in preventing typos when specifying tags for projects.
*/
// "allowedProjectTags": [ "apps", "Web", "tools" ],

/**
* (Required) This is the inventory of projects to be managed by Rush.
*
Expand Down Expand Up @@ -459,4 +438,4 @@
"projectFolder": "packages/metadata-booster"
}
]
}
}