diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aec89df3a..947942249 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,6 +47,31 @@ jobs: with: name: build-artifact path: dist + deprecate: + name: Deprecate the package in package managers if needed + needs: + - release + - release_npm + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Checkout + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Install + run: yarn install + - name: Check deprecation status + id: check_status + run: |- + IS_DEPRECATED=$(npm pkg get cdktf.isDeprecated | tr -d '"') + echo "is_deprecated=$IS_DEPRECATED" + echo "is_deprecated=$IS_DEPRECATED" >> $GITHUB_OUTPUT + - name: Deprecate the package on NPM + if: steps.check_status.outputs.is_deprecated + env: + NPM_REGISTRY: registry.npmjs.org + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: npm deprecate @cdktf/provider-hcp "See https://cdk.tf/imports for details on how to continue to use the hcp provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases needs: release diff --git a/.gitignore b/.gitignore index 5333a8dd3..6d3f63e91 100644 --- a/.gitignore +++ b/.gitignore @@ -49,8 +49,6 @@ tsconfig.json package-lock.json !/cdktf.json !/README.md -!/scripts/check-for-upgrades.js -!/.github/workflows/provider-upgrade.yml !/LICENSE !/.github/ISSUE_TEMPLATE/config.yml !/.github/workflows/auto-approve.yml @@ -58,6 +56,8 @@ package-lock.json !/.github/workflows/auto-close-community-prs.yml !/.github/workflows/automerge.yml !/.github/workflows/lock.yml +!/scripts/check-for-upgrades.js +!/.github/workflows/provider-upgrade.yml !/.github/workflows/alert-open-prs.yml !/.github/workflows/force-release.yml !/.github/CODEOWNERS diff --git a/.projen/deps.json b/.projen/deps.json index b42802948..2e8a4c9c8 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -7,7 +7,7 @@ }, { "name": "@cdktf/provider-project", - "version": "~0.4.0", + "version": "^0.5.0", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index dae316013..f4747a4fd 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -333,13 +333,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@types/node,cdktf-cli,cdktf,constructs,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@cdktf/provider-project,@types/node,cdktf-cli,cdktf,constructs,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @actions/core @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" + "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index a27b4ac5b..ba3b6853f 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -12,9 +12,8 @@ const project = new CdktfProviderProject({ minNodeVersion: "18.12.0", jsiiVersion: "~5.2.0", typescriptVersion: "~5.2.0", // NOTE: this should be the same major/minor version as JSII - devDeps: ["@cdktf/provider-project@~0.4.0"], - // Uncomment below when the workflow has been tested on Hashicups and we think the change is safe to roll out: - // isDeprecated: false, + devDeps: ["@cdktf/provider-project@^0.5.0"], + isDeprecated: false, }); project.synth(); diff --git a/README.md b/README.md index 4a8683da3..950a7924e 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ The Maven package is available at [https://mvnrepository.com/artifact/com.hashic ``` - ### Go The go package is generated into the [`github.com/cdktf/cdktf-provider-hcp-go`](https://github.com/cdktf/cdktf-provider-hcp-go) package. diff --git a/package.json b/package.json index 7875cd657..323af4889 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "devDependencies": { "@actions/core": "^1.1.0", - "@cdktf/provider-project": "~0.4.0", + "@cdktf/provider-project": "^0.5.0", "@types/node": "^18", "cdktf": "^0.19.0", "cdktf-cli": "^0.19.0", @@ -56,7 +56,7 @@ "jsii-docgen": "^10.2.3", "jsii-pacmak": "^1.93.0", "jsii-rosetta": "~5.2.0", - "projen": "^0.77.6", + "projen": "^0.78.0", "semver": "^7.5.3", "standard-version": "^9", "typescript": "~5.2.0" @@ -151,6 +151,7 @@ ] }, "cdktf": { + "isDeprecated": false, "provider": { "name": "registry.terraform.io/hashicorp/hcp", "version": "0.78.0" diff --git a/yarn.lock b/yarn.lock index 6ac984a4d..8ca424356 100644 --- a/yarn.lock +++ b/yarn.lock @@ -200,10 +200,10 @@ fs-extra "^8.1.0" jsii-srcmak "^0.1.954" -"@cdktf/provider-project@~0.4.0": - version "0.4.14" - resolved "https://registry.yarnpkg.com/@cdktf/provider-project/-/provider-project-0.4.14.tgz#fc7446f72ee32fc9a819ccf3aed54c6f3787859a" - integrity sha512-cP4s88rkYf2/TToEvonbv/5ml5ezQBppuZ9iLChDy5mk6jjO51+9BA/ei6TqlxlZ17nbrWwy+2+m1LT2KwQ8Tg== +"@cdktf/provider-project@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@cdktf/provider-project/-/provider-project-0.5.0.tgz#516a12d2ee203cc428069f228cdf29a6a470205c" + integrity sha512-HiIkwen1BSk5pM3CJf88i2xOAwqFvm5b7Ow6w5As5dI9riYtHTU0aZ2ONOHnCzKyfj0UXGIWDKJKvzCJP9VgcQ== dependencies: change-case "^4.1.2" fs-extra "^10.1.0" @@ -3309,10 +3309,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.77.6: - version "0.77.6" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.77.6.tgz#480c1af4246bba55e8d0732ff7a9d1804ce414be" - integrity sha512-nXbbDr81UjfLjCfVfHGfGPIjiN7INSyMUa52FYupX0TmybMq+CnvX8o0O45feOLLhsifNq7EHXtF+hgBtpBb8A== +projen@^0.78.0: + version "0.78.0" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.78.0.tgz#3148000da5a2322666013e689227407a26131ba4" + integrity sha512-cLergWOFUGLm+BZy2d0q0MTgyLMw6Htub7XfAgWI7+lsC+anpypeOGvdca3+TcgKZAMZrmPdNjfWNM+5ag6Mew== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3"