Skip to content

Commit be4ba9a

Browse files
Merge branch 'main' into copilot/fix-2829
2 parents 93ea99c + 5c708e3 commit be4ba9a

File tree

313 files changed

+23497
-4006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+23497
-4006
lines changed

.github/CODEOWNERS

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,32 @@
5050
# PRLabel: %Azure.Identity
5151
/sdk/identity/ @heaths @RickWinter @LarryOsterman @chlowell
5252

53-
###########
54-
# Client SDKs
55-
###########
53+
####################
54+
# Client Libraries
55+
####################
56+
57+
# PRLabel: %Cosmos
58+
/sdk/cosmos/ @analogrelay @Pilchie @kirankumarkolli @tvaron3 @FabianMeiswinkel @kundadebdatta @nehrao1 @kushagraThapar
5659

60+
# ServiceLabel: %Cosmos
5761
# AzureSDKOwners: @heaths
58-
# ServiceLabel: %Storage
62+
# ServiceOwners: @Pilchie
63+
64+
# PRLabel: %KeyVault
65+
/sdk/keyvault/ @Azure/azure-sdk-write-keyvault @heaths
66+
67+
# ServiceLabel: %KeyVault
68+
# ServiceOwners: @Azure/azure-sdk-write-keyvault
69+
5970
# PRLabel: %Storage
60-
/sdk/storage/ @heaths @RickWinter @LarryOsterman @vincenttran-msft @jalauzon-msft
71+
/sdk/storage/ @heaths @RickWinter @LarryOsterman @vincenttran-msft @jalauzon-msft
6172

62-
# AzureSDKOwners: @heaths
63-
# ServiceOwner: @Pilchie
64-
# ServiceLabel: %Cosmos
65-
# PRLabel: %Cosmos
66-
/sdk/cosmos/ @analogrelay @Pilchie @kirankumarkolli @tvaron3 @FabianMeiswinkel @kundadebdatta @nehrao1 @kushagraThapar
73+
# ServiceLabel: %Storage
74+
# AzureSDKOwners: @vincenttran-msft @jalauzon-msft
75+
76+
####################
77+
# Management Libraries
78+
####################
6779

6880
###########
6981
# Eng Sys

.github/copilot-instructions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ You are an expert Rust programmer. You write safe, efficient, maintainable, and
66
- Do not be overly apologetic and focus on clear guidance.
77
- If you cannot confidently generate code or other content, do not generate anything and ask for clarification.
88

9+
## Prerequisites
10+
11+
- To use Azure SDK MCP tool calls, the user must have PowerShell installed. Provide [PowerShell installation instructions](https://learn.microsoft.com/powershell/scripting/install/installing-powershell) if not installed, and recommend restarting the IDE to start the MCP server.
12+
913
## Code Generation
1014

1115
Use these instructions for test generation as well.

.vscode/cspell.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"azsdk",
3434
"azurecli",
3535
"bugbug",
36+
"checkpointstore",
3637
"clippy",
3738
"contoso",
3839
"cplusplus",
@@ -62,30 +63,33 @@
6263
"newtonsoft",
6364
"oidc",
6465
"oncreate",
65-
"otel",
6666
"opentelemetry",
67+
"otel",
6768
"pageable",
6869
"pageables",
6970
"pkce",
7071
"pkcs",
71-
"pwsh",
7272
"posix",
73+
"pwsh",
7374
"reqwest",
7475
"runtimes",
7576
"rustup",
77+
"schannel",
7678
"seekable",
7779
"servicebus",
80+
"spector",
7881
"stylesheet",
7982
"subclient",
8083
"telemetered",
8184
"typespec",
8285
"undelete",
83-
"upvote",
8486
"uninlined",
87+
"upvote",
8588
"userdelegationkey",
8689
"vcpkg",
8790
"versionid",
8891
"virtualmachine",
92+
"webpki",
8993
"worktree"
9094
],
9195
"dictionaryDefinitions": [
@@ -125,6 +129,11 @@
125129
"path": "../sdk/keyvault/.dict.txt",
126130
"noSuggest": true
127131
},
132+
{
133+
"name": "servicebus",
134+
"path": "../sdk/servicebus/.dict.txt",
135+
"noSuggest": true
136+
},
128137
{
129138
"name": "storage",
130139
"path": "../sdk/storage/.dict.txt",
@@ -142,6 +151,7 @@
142151
{
143152
"filename": "**/*.md",
144153
"dictionaries": [
154+
"crates",
145155
"rust",
146156
"rust-custom"
147157
],
@@ -203,6 +213,14 @@
203213
"cosmos"
204214
]
205215
},
216+
{
217+
"filename": "sdk/servicebus/**",
218+
"dictionaries": [
219+
"crates",
220+
"rust-custom",
221+
"servicebus"
222+
]
223+
},
206224
{
207225
"filename": "sdk/storage/**",
208226
"dictionaries": [

CONTRIBUTING.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ Similarly, if running on the command line pass `PROXY_MANUAL_START=true`.
207207
To log tracing information to the terminal, you can add the `RUST_LOG` environment variable as shown above using the [same format supported by `env_logger`](https://docs.rs/env_logger/latest/env_logger/#enabling-logging).
208208
The targets are the crate names if you want to trace more or less for specific targets e.g., `RUST_LOG=info,azure_core=trace` to trace information messages by default but detailed traces for the `azure_core` crate.
209209

210+
To log traces from the [Test Proxy] itself, pass `test-proxy=trace` to `RUST_LOG` e.g.,
211+
212+
```sh
213+
RUST_LOG=info,azure_core=debug,test-proxy=trace cargo test -p azure_security_keyvault_secrets --test secret_client
214+
```
215+
210216
#### Debugging in Windows
211217

212218
Using the recommended [CodeLLDB] Visual Studio Code extension on Windows will stop at breakpoints but may not pretty print variables e.g.,
@@ -359,6 +365,33 @@ Samples may take the following categories of dependencies:
359365

360366
In general, we prefer taking dependencies on licensed components in the order of the listed categories. In cases where the category may not be well known, we'll document the category so that readers understand the choice that they're making by using that dependency.
361367

368+
## Troubleshooting
369+
370+
### Proc-macro map is missing error entry
371+
372+
If Visual Studio Code with the rust-analyzer extension active is showing an error for all code in the editor with an error similar to:
373+
374+
> tracing::function: internal error: proc-macro map is missing error entry for crate Crate(Id(6560))
375+
376+
This could be a discrepancy between your active Rust toolchain and the internal `rust-analyzer` the rust-analyzer extension distributes and uses by default.
377+
Because we do not currently mandate a specific version of the Rust toolchain in our `rust-toolchain.toml` (as long as it supports the MSRV in `Cargo.toml`),
378+
the version of `rust-analyzer` you have installed should match the active toolchain.
379+
380+
In your Visual Studio Code settings, add:
381+
382+
```json
383+
{
384+
"rust-analyzer.server.path": "${userHome}/.cargo/bin/rust-analyzer"
385+
}
386+
```
387+
388+
Set this to an appropriate path for local development. If you're running Visual Studio Code with a remote session e.g., WSL or SSH,
389+
you'll need to [open remote settings](https://code.visualstudio.com/docs/remote/troubleshooting#_local-absolute-path-settings-fail-when-applied-remotely) and add the configuration above.
390+
391+
1. Press `F1`.
392+
2. Type "open remote settings (json)" and press `Enter`.
393+
3. Add the above setting to your remote settings. If you use multiple remote sessions you'll need to do this for each one.
394+
362395
[C/C++]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools
363396
[CodeLLDB]: https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb
364397
[Rust Guidelines]: https://azure.github.io/azure-sdk/rust_introduction.html

0 commit comments

Comments
 (0)