Merge branch 'main' into use-tool-versions

This commit is contained in:
Luke van der Hoeven 2024-02-12 10:52:59 -05:00 committed by GitHub
commit 79afc3e329
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 41 deletions

View file

@ -4,3 +4,10 @@ updates:
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
# Dependabot only updates hashicorp GHAs, external GHAs are managed by internal tooling (tsccr)
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
allow:
- dependency-name: "hashicorp/*"

1
.husky/.gitignore vendored
View file

@ -1 +0,0 @@
_

View file

@ -1,4 +0,0 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npm run build && git add dist/

View file

@ -90,7 +90,7 @@ defaults:
permissions: permissions:
pull-requests: write pull-requests: write
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v3 - uses: hashicorp/setup-terraform@v3
- name: Terraform fmt - name: Terraform fmt
@ -158,7 +158,7 @@ defaults:
permissions: permissions:
pull-requests: write pull-requests: write
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v3 - uses: hashicorp/setup-terraform@v3
- name: Terraform fmt - name: Terraform fmt

2
dist/index1.js vendored
View file

@ -27222,7 +27222,7 @@ async function checkTerraform () {
const options = { const options = {
listeners, listeners,
ignoreReturnCode: true, ignoreReturnCode: true,
silent: true, // avoid printing command in stdout: https://github.com/actions/toolkit/issues/649 silent: true // avoid printing command in stdout: https://github.com/actions/toolkit/issues/649
}; };
const exitCode = await exec(pathToCLI, args, options); const exitCode = await exec(pathToCLI, args, options);

36
package-lock.json generated
View file

@ -18,9 +18,8 @@
}, },
"devDependencies": { "devDependencies": {
"@vercel/ncc": "^0.38.1", "@vercel/ncc": "^0.38.1",
"husky": "^8.0.3",
"jest": "^29.7.0", "jest": "^29.7.0",
"nock": "^13.5.0", "nock": "^13.5.1",
"semistandard": "^17.0.0" "semistandard": "^17.0.0"
} }
}, },
@ -3658,21 +3657,6 @@
"node": ">=10.17.0" "node": ">=10.17.0"
} }
}, },
"node_modules/husky": {
"version": "8.0.3",
"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
"integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
"dev": true,
"bin": {
"husky": "lib/bin.js"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/sponsors/typicode"
}
},
"node_modules/ignore": { "node_modules/ignore": {
"version": "5.2.4", "version": "5.2.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@ -5194,9 +5178,9 @@
"dev": true "dev": true
}, },
"node_modules/nock": { "node_modules/nock": {
"version": "13.5.0", "version": "13.5.1",
"resolved": "https://registry.npmjs.org/nock/-/nock-13.5.0.tgz", "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
"integrity": "sha512-9hc1eCS2HtOz+sE9W7JQw/tXJktg0zoPSu48s/pYe73e25JW9ywiowbqnUSd7iZPeVawLcVpPZeZS312fwSY+g==", "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"debug": "^4.1.0", "debug": "^4.1.0",
@ -9491,12 +9475,6 @@
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
"dev": true "dev": true
}, },
"husky": {
"version": "8.0.3",
"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
"integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
"dev": true
},
"ignore": { "ignore": {
"version": "5.2.4", "version": "5.2.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@ -10632,9 +10610,9 @@
"dev": true "dev": true
}, },
"nock": { "nock": {
"version": "13.5.0", "version": "13.5.1",
"resolved": "https://registry.npmjs.org/nock/-/nock-13.5.0.tgz", "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.1.tgz",
"integrity": "sha512-9hc1eCS2HtOz+sE9W7JQw/tXJktg0zoPSu48s/pYe73e25JW9ywiowbqnUSd7iZPeVawLcVpPZeZS312fwSY+g==", "integrity": "sha512-+s7b73fzj5KnxbKH4Oaqz07tQ8degcMilU4rrmnKvI//b0JMBU4wEXFQ8zqr+3+L4eWSfU3H/UoIVGUV0tue1Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^4.1.0", "debug": "^4.1.0",

View file

@ -13,7 +13,6 @@
"test": "semistandard --env jest && jest --coverage", "test": "semistandard --env jest && jest --coverage",
"lint": "semistandard --env jest --fix", "lint": "semistandard --env jest --fix",
"build": "ncc build wrapper/terraform.js --out wrapper/dist && ncc build index.js --out dist", "build": "ncc build wrapper/terraform.js --out wrapper/dist && ncc build index.js --out dist",
"prepare": "husky install",
"format-check": "echo \"unimplemented for actions/reusable-workflows basic-validation\"" "format-check": "echo \"unimplemented for actions/reusable-workflows basic-validation\""
}, },
"keywords": [], "keywords": [],
@ -28,9 +27,8 @@
}, },
"devDependencies": { "devDependencies": {
"@vercel/ncc": "^0.38.1", "@vercel/ncc": "^0.38.1",
"husky": "^8.0.3",
"jest": "^29.7.0", "jest": "^29.7.0",
"nock": "^13.5.0", "nock": "^13.5.1",
"semistandard": "^17.0.0" "semistandard": "^17.0.0"
}, },
"semistandard": { "semistandard": {

View file

@ -34,7 +34,7 @@ async function checkTerraform () {
const options = { const options = {
listeners, listeners,
ignoreReturnCode: true, ignoreReturnCode: true,
silent: true, // avoid printing command in stdout: https://github.com/actions/toolkit/issues/649 silent: true // avoid printing command in stdout: https://github.com/actions/toolkit/issues/649
}; };
const exitCode = await exec(pathToCLI, args, options); const exitCode = await exec(pathToCLI, args, options);