Skip to content

Commit 3c1d3fc

Browse files
authored
Merge branch 'main' into MCP-5
2 parents 4389e6c + 48bce63 commit 3c1d3fc

File tree

3 files changed

+28
-16
lines changed

3 files changed

+28
-16
lines changed

.github/workflows/code_health_fork.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,3 @@ jobs:
3434
with:
3535
name: test-results
3636
path: coverage/lcov.info
37-
38-
merge-dependabot-pr:
39-
name: Merge Dependabot PR
40-
if: github.event.pull_request.user.login == 'dependabot[bot]'
41-
runs-on: ubuntu-latest
42-
permissions:
43-
pull-requests: write
44-
contents: write
45-
steps:
46-
- name: Enable auto-merge for Dependabot PRs
47-
run: gh pr merge --auto --squash "$PR_URL"
48-
env:
49-
PR_URL: ${{github.event.pull_request.html_url}}
50-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/dependabot_pr.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: Dependabot PR
3+
on:
4+
pull_request:
5+
types: [opened]
6+
branches:
7+
- main
8+
9+
permissions: {}
10+
11+
jobs:
12+
merge-dependabot-pr:
13+
name: Merge Dependabot PR
14+
if: github.event.pull_request.user.login == 'dependabot[bot]'
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: mongodb-js/devtools-shared/actions/setup-bot-token@main
18+
id: app-token
19+
with:
20+
app-id: ${{ vars.DEVTOOLS_BOT_APP_ID }}
21+
private-key: ${{ secrets.DEVTOOLS_BOT_PRIVATE_KEY }}
22+
- name: Enable auto-merge for Dependabot PRs
23+
run: gh pr merge --auto --squash "$PR_URL"
24+
env:
25+
PR_URL: ${{github.event.pull_request.html_url}}
26+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

src/tools/atlas/connect/connectCluster.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@ export class ConnectClusterTool extends AtlasToolBase {
213213
],
214214
};
215215
}
216-
case "connecting": {
216+
case "connecting":
217+
case "unknown": {
217218
break;
218219
}
219220
case "connected-to-other-cluster":
220221
case "disconnected":
221-
case "unknown":
222222
default: {
223223
await this.session.disconnect();
224224
const connectionString = await this.prepareClusterConnection(projectId, clusterName);

0 commit comments

Comments
 (0)