Skip to content

Commit 1899267

Browse files
committed
Merge branch 'feature/track2'
Active development on crates will continue in the main branch.
2 parents 25ebe5a + f065bda commit 1899267

File tree

4,504 files changed

+53318
-9690106
lines changed

Some content is hidden

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

4,504 files changed

+53318
-9690106
lines changed
File renamed without changes.

.devcontainer/Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM mcr.microsoft.com/devcontainers/rust:1-1-bullseye
2+
3+
USER vscode
4+
5+
# Install nightly toolchain to give access to nightly features for docs-site build.
6+
RUN rustup toolchain install nightly
7+
8+
# Install pre-requisite tools
9+
RUN cargo install \
10+
cargo-watch \
11+
http-server

.devcontainer/devcontainer.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/rust
3+
{
4+
"name": "Azure SDK for Rust",
5+
"build": {
6+
"dockerfile": "Dockerfile"
7+
},
8+
"onCreateCommand": ".devcontainer/oncreate",
9+
"features": {
10+
"ghcr.io/devcontainers/features/azure-cli:1": {},
11+
"ghcr.io/devcontainers/features/github-cli:1": {},
12+
"ghcr.io/devcontainers/features/sshd:1": {}
13+
},
14+
"customizations": {
15+
"vscode": {
16+
"extensions": [
17+
"tamasfe.even-better-toml",
18+
"editorconfig.editorconfig",
19+
"rust-lang.rust-analyzer",
20+
"streetsidesoftware.code-spell-checker",
21+
"vadimcn.vscode-lldb"
22+
]
23+
}
24+
}
25+
}

.devcontainer/oncreate

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
echo "Running Azure SDK for Rust devcontainer post create script..."
6+
7+
echo "Updating toolchains..."
8+
rustup show

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ indent_size = 4
77
indent_style = space
88
trim_trailing_whitespace = true
99

10+
[*.json]
11+
indent_size = 2
12+
13+
[*.ps1]
14+
indent_size = 2
15+
16+
[*.rs]
17+
end_of_line = lf
18+
1019
[*.toml]
1120
indent_size = 2
1221

.gitattributes

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ Cargo.lock merge=binary
44

55
# Use unix line endings everywhere, even on Windows
66
* text=auto eol=lf
7-
services/mgmt/**/src/**/*.rs linguist-generated=true
8-
services/mgmt/**/Cargo.toml linguist-generated=true
9-
.github/workflows/check-all-services.yml linguist-generated=true
10-
.github/workflows/publish-services.yml linguist-generated=true
7+
sdk/**/src/generated/**/*.rs linguist-generated=true

.github/CODEOWNERS

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,54 @@
11
# Instructions for CODEOWNERS file format and automatic build failure notifications:
22
# https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners
33

4-
###########
5-
# SDK
6-
###########
4+
# -----------------------------------------------------------------
5+
# IMPORTANT NOTE:
6+
# The ordering of "ServiceLabel" blocks is important!
7+
#
8+
# Matching takes place from bottom-to-top and will stop after the
9+
# first match. Place less specific matches earlier in the file
10+
# and more specific matches later.
11+
#
12+
# Be sure to add new entries in the area they belong, denoted by the
13+
# header wrapped in "#" characters. (e.g. SDK, EngSys, Management)
14+
# -----------------------------------------------------------------
15+
16+
##################
17+
# Repository root
18+
##################
19+
20+
# Catch all for loose files in the root, which are mostly global configuration and
21+
# should not be changed without team discussion.
22+
/* @heaths @RickWinter @ronniegeraghty
723

824
# Catch all for non-code project files and unowned files | folders
925
/** @heaths @RickWinter @ronniegeraghty
10-
/sdk/ @heaths @RickWinter @ronniegeraghty
26+
27+
##################
28+
# Automation
29+
##################
1130

1231
# GitHub integration and bot rules
13-
/.github/ @heaths @RickWinter @ronniegeraghty
32+
/.github/ @heaths @RickWinter @ronniegeraghty @LarryOsterman
33+
34+
# PRLabel: %EngSys
35+
/sdk/template/ @weshaggard @heaths @RickWinter
36+
37+
###########
38+
# SDK
39+
###########
40+
# Catch all
41+
/sdk/ @heaths @RickWinter @ronniegeraghty @LarryOsterman
1442

1543
# AzureSDKOwners: @heaths
1644
# ServiceLabel: %Azure.Core
1745
# PRLabel: %Azure.Core
18-
/sdk/core/ @heaths @RickWinter @JeffreyRichter
46+
/sdk/core/ @heaths @RickWinter @JeffreyRichter @LarryOsterman
1947

2048
# AzureSDKOwners: @heaths
2149
# ServiceLabel: %Azure.Identity
2250
# PRLabel: %Azure.Identity
23-
/sdk/identity/ @heaths @RickWinter @JeffreyRichter
51+
/sdk/identity/ @heaths @RickWinter @JeffreyRichter @LarryOsterman
2452

2553
###########
2654
# Client SDKs
@@ -29,9 +57,23 @@
2957
# AzureSDKOwners: @heaths
3058
# ServiceLabel: %Storage
3159
# PRLabel: %Storage
32-
/sdk/storage/ @heaths @RickWinter @JeffreyRichter
60+
/sdk/storage/ @heaths @RickWinter @JeffreyRichter @LarryOsterman
61+
62+
# AzureSDKOwners: @heaths
63+
# ServiceOwner: @Pilchie
64+
# ServiceLabel: %Cosmos
65+
# PRLabel: %Cosmos
66+
/sdk/cosmos/ @analogrelay @Pilchie @kirankumarkolli @tvaron3 @FabianMeiswinkel @kundadebdatta
3367

3468
###########
3569
# Eng Sys
3670
###########
3771
/eng/ @weshaggard @heaths @RickWinter
72+
/eng/common/ @Azure/azure-sdk-eng
73+
/.config/1espt/ @benbp @weshaggard
74+
/.github/workflows/ @Azure/azure-sdk-eng
75+
/.github/CODEOWNERS @RickWinter @ronniegeraghty @Azure/azure-sdk-eng
76+
77+
# Add owners for notifications for specific pipelines
78+
/eng/common/pipelines/codeowners-linter.yml @rickwinter
79+
/eng/pipelines/aggregate-reports.yml @rickwinter

.github/workflows/build.yml

Lines changed: 31 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,6 @@ jobs:
6262
- uses: dtolnay/rust-toolchain@nightly
6363
- uses: dtolnay/install@cargo-docs-rs
6464
- run: eng/scripts/verify-docs.sh sdk
65-
test-docs-svc:
66-
name: SDK docs - svc
67-
runs-on: ubuntu-latest
68-
steps:
69-
- uses: actions/checkout@v4
70-
- uses: dtolnay/rust-toolchain@nightly
71-
- uses: dtolnay/install@cargo-docs-rs
72-
- run: eng/scripts/verify-docs.sh svc
73-
test-docs-mgmt:
74-
name: SDK docs - mgmt
75-
runs-on: ubuntu-latest
76-
steps:
77-
- uses: actions/checkout@v4
78-
- uses: dtolnay/rust-toolchain@nightly
79-
- uses: dtolnay/install@cargo-docs-rs
80-
- run: eng/scripts/verify-docs.sh mgmt
8165

8266
test-wasm:
8367
name: WASM Tests
@@ -100,59 +84,29 @@ jobs:
10084
- uses: Swatinem/rust-cache@v2
10185
- run: eng/scripts/check_wasm.sh ${{ matrix.build }}
10286

103-
test-services:
104-
name: Services Tests
105-
runs-on: ubuntu-20.04
106-
needs:
107-
- msrv
108-
continue-on-error: ${{ matrix.experimental }}
109-
strategy:
110-
matrix:
111-
build:
112-
- stable
113-
- ${{ needs.msrv.outputs.msrv }}
114-
experimental:
115-
- false
116-
include:
117-
- no_clippy: false
118-
- build: nightly
119-
no_clippy: ${{ github.event_name != 'scheduled' }}
120-
experimental: true
121-
steps:
122-
- uses: actions/checkout@v4
123-
- uses: Swatinem/rust-cache@v2
124-
with:
125-
workspaces: services
126-
- run: eng/scripts/services_tests.sh ${{ matrix.build }}
127-
env:
128-
NO_CLIPPY: ${{ matrix.no_clippy }}
129-
- name: display free disk space
130-
run: df -h /
131-
if: ${{ always() }}
132-
133-
test-integration:
134-
name: Emulator Tests
135-
runs-on: ubuntu-20.04
136-
needs:
137-
- msrv
138-
continue-on-error: ${{ matrix.experimental }}
139-
strategy:
140-
matrix:
141-
build:
142-
- stable
143-
- ${{ needs.msrv.outputs.msrv }}
144-
experimental:
145-
- false
146-
include:
147-
- build: nightly
148-
experimental: true
149-
steps:
150-
- uses: actions/checkout@v4
151-
- uses: Swatinem/rust-cache@v2
152-
- run: eng/scripts/emulator_tests.sh ${{ matrix.build }}
153-
- name: display free disk space
154-
run: df -h /
155-
if: ${{ always() }}
87+
# test-integration:
88+
# name: Emulator Tests
89+
# runs-on: ubuntu-20.04
90+
# needs:
91+
# - msrv
92+
# continue-on-error: ${{ matrix.experimental }}
93+
# strategy:
94+
# matrix:
95+
# build:
96+
# - stable
97+
# - ${{ needs.msrv.outputs.msrv }}
98+
# experimental:
99+
# - false
100+
# include:
101+
# - build: nightly
102+
# experimental: true
103+
# steps:
104+
# - uses: actions/checkout@v4
105+
# - uses: Swatinem/rust-cache@v2
106+
# - run: eng/scripts/emulator_tests.sh ${{ matrix.build }}
107+
# - name: display free disk space
108+
# run: df -h /
109+
# if: ${{ always() }}
156110

157111
test-e2e:
158112
name: E2E Tests
@@ -178,23 +132,12 @@ jobs:
178132
run: df -h /
179133
if: ${{ always() }}
180134

181-
test-autorust:
182-
name: test AutoRust
183-
runs-on: ubuntu-20.04
135+
lint:
136+
name: Lint
137+
runs-on: ubuntu-latest
184138
steps:
185-
- name: git clone
186-
uses: actions/checkout@v4
187-
with:
188-
path: azure-sdk-for-rust
189-
- name: git clone Azure/azure-rest-api-specs
190-
uses: actions/checkout@v4
191-
with:
192-
repository: Azure/azure-rest-api-specs
193-
path: azure-rest-api-specs
194-
- name: git clone OAI/OpenAPI-Specification
195-
uses: actions/checkout@v4
196-
with:
197-
repository: OAI/OpenAPI-Specification
198-
path: OpenAPI-Specification
199-
# for code style, we only care about `stable`
200-
- run: azure-sdk-for-rust/eng/scripts/autorust_tests.sh
139+
- uses: actions/checkout@v4
140+
- uses: dtolnay/rust-toolchain@nightly
141+
- name: Verify dependencies
142+
run: |
143+
find sdk/ -maxdepth 3 -type f -name Cargo.toml -exec bash -c 'eng/scripts/verify-dependencies.rs {}' \;

0 commit comments

Comments
 (0)