Skip to content

Commit 9888349

Browse files
committed
Merge branch 'main' into chore/gh-actions-reorg-for-install-tests
2 parents de36329 + f45a4c7 commit 9888349

31 files changed

+2040
-1640
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ updates:
66
directory: /
77
schedule:
88
interval: daily
9+
cooldown:
10+
default-days: 7
11+
include:
12+
- "*"
913
allow:
1014
- dependency-name: mongodb
1115
- dependency-name: bson

.github/workflows/actions/test-and-build/action.yaml

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ runs:
6868
- name: Run Tests
6969
env:
7070
NODE_OPTIONS: "--max_old_space_size=4096"
71+
MDB_IS_TEST: "true"
7172
run: |
7273
npm run test
7374
shell: bash
@@ -118,30 +119,31 @@ runs:
118119
run: |
119120
npm run snyk-test > /dev/null 2>&1
120121
121-
- name: Create Jira Tickets
122-
if: >
123-
runner.os == 'Linux' &&
124-
(
125-
github.event_name == 'push' && github.ref == 'refs/heads/main' ||
126-
github.event_name == 'workflow_dispatch' ||
127-
github.event_name == 'schedule'
128-
)
129-
shell: bash
130-
env:
131-
JIRA_API_TOKEN: ${{ inputs.JIRA_API_TOKEN }}
132-
JIRA_BASE_URL: "https://jira.mongodb.org"
133-
JIRA_PROJECT: "VSCODE"
134-
JIRA_VULNERABILITY_BUILD_INFO: "- [GitHub Run|https://github.com/mongodb-js/vscode/actions/runs/${{github.run_id}}/jobs/${{github.job}}]"
135-
run: |
136-
npm run create-vulnerability-tickets > /dev/null
122+
# TODO(VSCODE-706): Fix Snyk vuln ticket generation
123+
# - name: Create Jira Tickets
124+
# if: >
125+
# runner.os == 'Linux' &&
126+
# (
127+
# github.event_name == 'push' && github.ref == 'refs/heads/main' ||
128+
# github.event_name == 'workflow_dispatch' ||
129+
# github.event_name == 'schedule'
130+
# )
131+
# shell: bash
132+
# env:
133+
# JIRA_API_TOKEN: ${{ inputs.JIRA_API_TOKEN }}
134+
# JIRA_BASE_URL: "https://jira.mongodb.org"
135+
# JIRA_PROJECT: "VSCODE"
136+
# JIRA_VULNERABILITY_BUILD_INFO: "- [GitHub Run|https://github.com/mongodb-js/vscode/actions/runs/${{github.run_id}}/jobs/${{github.job}}]"
137+
# run: |
138+
# npm run create-vulnerability-tickets > /dev/null
137139

138-
- name: Generate Vulnerability Report (Fail on >= High)
139-
if: runner.os == 'Linux'
140-
continue-on-error: ${{ github.event_name == 'pull_request' }}
141-
shell: bash
142-
run: |
143-
# The standard output is suppressed since Github Actions logs are
144-
# available for everyone with read access to the repo, which is everyone that is
145-
# logged in for public repos.
146-
# This command is only here to fail on failures for `main` and tags.
147-
npm run generate-vulnerability-report > /dev/null
140+
# - name: Generate Vulnerability Report (Fail on >= High)
141+
# if: runner.os == 'Linux'
142+
# continue-on-error: ${{ github.event_name == 'pull_request' }}
143+
# shell: bash
144+
# run: |
145+
# # The standard output is suppressed since Github Actions logs are
146+
# # available for everyone with read access to the repo, which is everyone that is
147+
# # logged in for public repos.
148+
# # This command is only here to fail on failures for `main` and tags.
149+
# npm run generate-vulnerability-report > /dev/null
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Dependabot PR
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
branches:
7+
- main
8+
9+
permissions:
10+
pull-requests: write
11+
12+
jobs:
13+
enable-auto-merge-on-dependabot-pr:
14+
name: Enable auto-merge for Dependabot PRs
15+
if: github.event.pull_request.user.login == 'dependabot[bot]'
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Enable auto-merge for Dependabot PRs
19+
run: gh pr merge --auto --squash "$PR_URL"
20+
env:
21+
PR_URL: ${{github.event.pull_request.html_url}}
22+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/draft-release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
GARASIGN_USERNAME: ${{ secrets.GARASIGN_USERNAME }}
130130
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
131131
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
132+
MDB_IS_TEST: "true"
132133

133134
test:
134135
name: Test

.github/workflows/test-and-build-from-fork.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name: Test and Build (from fork)
22
on:
3-
pull_request_target:
3+
pull_request:
44
branches:
55
- main
66
permissions:
7-
contents: write
8-
pull-requests: write
7+
contents: read
98

109
jobs:
1110
build-and-package:
@@ -54,10 +53,6 @@ jobs:
5453
steps:
5554
- name: Checkout
5655
uses: actions/checkout@v4
57-
with:
58-
fetch-depth: 0
59-
ref: ${{github.event.pull_request.head.ref}}
60-
repository: ${{github.event.pull_request.head.repo.full_name}}
6156

6257
- name: Setup Node.js Environment
6358
uses: actions/setup-node@v4

.github/workflows/test-and-build.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,11 @@ jobs:
7171
uses: ./.github/workflows/actions/run-tests
7272
with:
7373
SEGMENT_KEY: ${{ secrets.SEGMENT_KEY_PROD }}
74+
ARTIFACTORY_HOST: ${{ secrets.ARTIFACTORY_HOST }}
75+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
76+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
77+
GARASIGN_PASSWORD: ${{ secrets.GARASIGN_PASSWORD }}
78+
GARASIGN_USERNAME: ${{ secrets.GARASIGN_USERNAME }}
79+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
80+
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
81+
MDB_IS_TEST: "true"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ constants.json
1111
.eslintcache
1212
.sbom
1313
src/test/ai-accuracy-tests/test-results.html
14+
.yalc
15+
yalc.lock

.vscode/launch.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@
5353
"--extensionTestsPath=${workspaceFolder}/out/test/suite"
5454
],
5555
"env": {
56-
"MOCHA_GREP": "${input:mochaGrep}"
56+
"MOCHA_GREP": "${input:mochaGrep}",
57+
"MDB_IS_TEST": "true"
5758
},
5859
"outFiles": ["${workspaceFolder}/out/**/*.js"],
59-
"preLaunchTask": "npm: compile:extension",
60+
"preLaunchTask": "npm: compile:extension"
6061
}
6162
],
6263
"inputs": [

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
# Change Log
22

3+
## [v1.14.2](https://github.com/mongodb-js/vscode/releases/tag/v1.14.2) - 2025-10-07
4+
5+
## What's Changed
6+
* fix: snyk will now scan vscode project by @himanshusinghs in https://github.com/mongodb-js/vscode/pull/1136
7+
* chore: update CHANGELOG.md by @mongodb-devtools-bot[bot] in https://github.com/mongodb-js/vscode/pull/1148
8+
* chore: update mongodb-mcp-server to fix yargs-parser problem by @himanshusinghs in https://github.com/mongodb-js/vscode/pull/1153
9+
* chore: disable snyk vuln ticket generation by @himanshusinghs in https://github.com/mongodb-js/vscode/pull/1154
10+
11+
12+
**Full Changelog**: https://github.com/mongodb-js/vscode/compare/v1.14.1...v1.14.2
13+
14+
15+
## [v1.14.1](https://github.com/mongodb-js/vscode/releases/tag/v1.14.1) - 2025-10-06
16+
17+
## What's Changed
18+
* chore: update CHANGELOG.md by @mongodb-devtools-bot[bot] in https://github.com/mongodb-js/vscode/pull/1121
19+
* fix: add hosting_mode to mcp telemetry by @nirinchev in https://github.com/mongodb-js/vscode/pull/1134
20+
* chore: update mongosh by @gagik in https://github.com/mongodb-js/vscode/pull/1130
21+
* chore(deps-dev): bump mongodb-runner from 5.9.2 to 5.10.0 by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1139
22+
* chore(deps-dev): bump @mongodb-js/signing-utils from 0.4.0 to 0.4.3 by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1141
23+
* chore(deps-dev): bump @mongodb-js/oidc-mock-provider from 0.11.3 to 0.11.4 by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1140
24+
* fix: disable MCP auto start and instead request on first load and new connection attempts VSCODE-704 by @himanshusinghs in https://github.com/mongodb-js/vscode/pull/1132
25+
* chore(deps): bump mongodb from 6.19.0 to 6.20.0 in the driver group by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1142
26+
* chore(deps): bump @mongodb-js/mongodb-ts-autocomplete from 0.4.7 to 0.4.8 by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1143
27+
* chore(deps): bump @mongodb-js/connection-info from 0.17.1 to 0.21.0 by @dependabot[bot] in https://github.com/mongodb-js/vscode/pull/1138
28+
* chore: bump mongodb-mcp-server to 1.0.2 by @himanshusinghs in https://github.com/mongodb-js/vscode/pull/1146
29+
30+
31+
**Full Changelog**: https://github.com/mongodb-js/vscode/compare/v1.14.0...v1.14.1
32+
33+
334
## [v1.14.0](https://github.com/mongodb-js/vscode/releases/tag/v1.14.0) - 2025-09-16
435

536
## What's Changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ _Note: To use the MongoDB Participant, you must have the [GitHub Copilot](https:
118118
| `mdb.useDefaultTemplateForPlayground` | Choose whether to use the default template for playground files or to start with an empty playground editor. | `true` |
119119
| `mdb.uniqueObjectIdPerCursor` | The default behavior is to generate a single ObjectId and insert it on all cursors. Set to true to generate a unique ObjectId per cursor instead. | `false` |
120120
| `mdb.sendTelemetry` | Opt-in and opt-out for diagnostic and telemetry collection. | `true` |
121-
| `mdb.confirmRunCopilotCode` | Show a confirmation message before running code generated by the MongoDB participant. | `true` |
122121
| `mdb.useSampleDocsInCopilot` | Enable sending sample field values with the VSCode copilot chat @MongoDB participant /query command. | `false` |
123122

124123
## Additional Settings

0 commit comments

Comments
 (0)