Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JackTn authored Oct 30, 2024
2 parents 152d422 + 680c1e3 commit 35a65fe
Show file tree
Hide file tree
Showing 2,262 changed files with 370,849 additions and 11,846 deletions.
4 changes: 1 addition & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
# PRLabel: %Cognitive Services
/dev/cognitiveservices/data-plane/Language/ @assafi @rokulka @ChongTang @annatisch @heaths @deyaaeldeen @kristapratico @mssfang @joseharriaga @minhanh-phan @Azure/api-stewardship-board

/specification/adp/ @Azure/adp

# PRLabel: %FarmBeats
/specification/agrifood/data-plane @Azure/api-stewardship-board

Expand All @@ -37,7 +35,7 @@
/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen @Azure/api-stewardship-board

# PRLabel: %Container Apps
/specification/app/ @Juliehzl
/specification/app/ @jijohn14 @Juliehzl

# PRLabel: %Code Signing
/specification/codesigning/data-plane @Azure/api-stewardship-board
Expand Down
22 changes: 22 additions & 0 deletions .github/actions/setup-node-npm-ci/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Setup Node 20 and run `npm ci`
description: Uses specified Node version and runs npm commands to set up the environment for REST API CI

inputs:
node-version:
description: 'Node version to use'
default: 20.x

runs:
using: "composite"

steps:
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}

- run: npm ci
shell: bash

- run: npm ls -a
shell: bash
continue-on-error: true
78 changes: 78 additions & 0 deletions .github/workflows/typespec-validation-all.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: TypeSpec Validation - All

on:
push:
branches:
- main
- RPSaaSMaster
- typespec-next

pull_request:
branches:
- main
- RPSaaSMaster
- typespec-next
paths:
- .gitattributes
- .prettierrc.json
- package-lock.json
- package.json
- tsconfig.json
- eng/**
- specification/suppressions.yaml
- specification/common-types/**

# Workflow and workflow dependencies
- .github/workflows/typespec-validation-all.yaml
- .github/actions/setup-node-npm-ci/**

schedule:
# Run 4x/day
- cron: '0 0,6,12,18 * * *'

workflow_dispatch:

jobs:
typespec-validation-all:
name: TypeSpec Validation All
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
# shards must start at 0 and increment by 1
shard: [0, 1, 2]
# total-shards must be an accurate count of the number of shards
total-shards: [3]
# When triggered by schedule, validate both the default branch and typespec-next
# Use the placeholder string "default" instead of passing "" directly, since the latter gets ignored by
# the GitHub Jobs UI.
ref: ${{ fromJSON(github.event_name == 'schedule' && '["default", "typespec-next"]' || '["default"]') }}

runs-on: ${{ matrix.os }}

steps:
- name: Enable git long paths
if: runner.os == 'Windows'
run: git config --global core.longpaths true

- uses: actions/checkout@v4
with:
# Convert placeholder string 'default' to '', which tells the action to checkout the default ref.
ref: ${{ matrix.ref != 'default' && matrix.ref || '' }}

- name: Setup Node 20 and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci

- name: Validate All Specs
run: |
# Keep processing when errors are written. Nonzero exit will mark the
# step as failed.
$ErrorActionPreference = 'Continue'
./eng/scripts/TypeSpec-Validation.ps1 `
-Shard ${{ matrix.shard }} `
-TotalShards ${{ matrix.total-shards }} `
-CheckAll `
-GitClean `
-Verbose
shell: pwsh
25 changes: 25 additions & 0 deletions .github/workflows/typespec-validation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: TypeSpec Validation

on: pull_request

jobs:
typespec-validation:
name: TypeSpec Validation
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Setup Node 20 and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci

- name: Validate Impacted Specs
run: |
# Keep processing when errors are written. Nonzero exit will mark the
# step as failed.
$ErrorActionPreference = 'Continue'
./eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose
shell: pwsh
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ eng/tools/**/dist
!eng/tools/**/cmd/*.js
!eng/tools/**/eslint.config.js

# TypeScript cache
*.tsbuildinfo

# No package-lock.json files should be commited except the top-level.
**/package-lock.json
!/package-lock.json
Expand Down
80 changes: 47 additions & 33 deletions arm-compute/quickstart-templates/aliases.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,66 @@
"value": {
"Linux": {
"CentOS85Gen2": {
"publisher": "OpenLogic",
"offer": "CentOS",
"sku": "8_5-gen2",
"version": "latest",
"architecture": "x64"
},
"Debian11": {
"publisher": "Debian",
"offer": "debian-11",
"sku": "11-backports-gen2",
"version": "latest",
"publisher": "OpenLogic",
"offer": "CentOS",
"sku": "8_5-gen2",
"version": "latest",
"architecture": "x64"
},
"FlatcarLinuxFreeGen2": {
"publisher": "kinvolk",
"offer": "flatcar-container-linux-free",
"sku": "stable-gen2",
"version": "latest",
"Debian11": {
"publisher": "Debian",
"offer": "debian-11",
"sku": "11-backports-gen2",
"version": "latest",
"architecture": "x64"
},
"OpenSuseLeap154Gen2": {
"publisher": "SUSE",
"offer": "openSUSE-leap-15-4",
"sku": "gen2",
"version": "latest",
"OpenSuseLeap154Gen2": {
"publisher": "SUSE",
"offer": "openSUSE-leap-15-4",
"sku": "gen2",
"version": "latest",
"architecture": "x64"
},
"RHELRaw8LVMGen2": {
"publisher": "RedHat",
"offer": "RHEL",
"sku": "8-lvm-gen2",
"version": "latest",
"RHELRaw8LVMGen2": {
"publisher": "RedHat",
"offer": "RHEL",
"sku": "8-lvm-gen2",
"version": "latest",
"architecture": "x64"
},
"SuseSles15SP3": {
"SuseSles15SP5": {
"publisher": "SUSE",
"offer": "sles-15-sp3",
"offer": "sles-15-sp5",
"sku": "gen2",
"version": "latest",
"architecture": "x64"
},
"Ubuntu2204": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "22_04-lts-gen2",
"version": "latest",
"Ubuntu2204": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-jammy",
"sku": "22_04-lts-gen2",
"version": "latest",
"architecture": "x64"
},
"Ubuntu2404": {
"publisher": "Canonical",
"offer": "ubuntu-24_04-lts",
"sku": "server",
"version": "latest",
"architecture": "x64"
},
"Ubuntu2404Pro": {
"publisher": "Canonical",
"offer": "ubuntu-24_04-lts",
"sku": "ubuntu-pro",
"version": "latest",
"architecture": "x64"
},
"FlatcarLinuxFreeGen2": {
"publisher": "kinvolk",
"offer": "flatcar-container-linux-free",
"sku": "stable-gen2",
"version": "latest",
"architecture": "x64"
}
},
Expand Down
35 changes: 32 additions & 3 deletions cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,12 @@
"Managment"
]
},
{
"filename": "**/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2024-08-01/costmanagement.pricesheets.json",
"words": [
"unitofmeasure"
]
},
{
"filename": "**/specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/preview/2017-08-21-preview/iotdps.json",
"words": [
Expand Down Expand Up @@ -1065,7 +1071,9 @@
{
"filename": "**/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/**/*json",
"words": [
"automigration"
"automigration",
"apsaradb",
"supabase"
]
},
{
Expand Down Expand Up @@ -1531,6 +1539,15 @@
"ungroundedness"
]
},
{
"filename": "**/specification/cognitiveservices/data-plane/Language/**/**/*.json",
"words": [
"Meitei",
"Mtei",
"Olck",
"Shrd"
]
},
{
"filename": "**/specification/sqlvirtualmachine/resource-manager/Microsoft.SqlVirtualMachine/**/*.json",
"words": [
Expand All @@ -1539,7 +1556,7 @@
]
},
{
"filename": "**/specification/riskiq/data-plane/Microsoft.Easm/preview/2024-03-01-preview/easm.json",
"filename": "**/specification/riskiq/data-plane/Microsoft.Easm/preview/**/*.json",
"words": [
"Cisa",
"cisa",
Expand Down Expand Up @@ -1657,7 +1674,19 @@
]
},
{
"filename": "**/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/StackHCIVM/**/*.json",
"filename": "**/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-09-01/costmanagement.pricesheets.json",
"words": [
"Unitof"
]
},
{
"filename": "**/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-11-01/costmanagement.pricesheets.json",
"words": [
"Unitof"
]
},
{
"filename": "**/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/StackHCIVM/**/*.json",
"words": [
"SEVSNP"
]
Expand Down
2 changes: 2 additions & 0 deletions documentation/sdkautomation/sdk-suppressions.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Absent SDK breaking changes suppressions
### Next Steps

1. The pull request authors create a file called `sdk-suppressions.yaml` if it doesn't already exist in your service folder in the `azure-rest-api-specs` repository.
- For TypeSpec scenarios, `sdk-suppressions.yaml` should be placed in the root folder of the TypeSpec project, which also contains the `tspconfig.yaml` file. For example, refers to the location for [Contoso.Management](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/contosowidgetmanager/Contoso.Management).
- For OpenAPI scenarios, `sdk-suppressions.yaml` should be placed in the `{service}\resource-manager` folder. For example, see the location for the [contosowidgetmanager resource provider](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/contosowidgetmanager/resource-manager).
2. The pull request authors copy every line under the `Absent SDK breaking changes suppressions` section to the suppression file in the following format:
```
suppressions:
Expand Down
3 changes: 3 additions & 0 deletions eng/common/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Common Engineering System

Updates under this directory should only be made in the `azure-sdk-tools` repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md)
17 changes: 17 additions & 0 deletions eng/common/TestResources/New-TestResources.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@echo off

REM Copyright (c) Microsoft Corporation. All rights reserved.
REM Licensed under the MIT License.

setlocal

for /f "usebackq delims=" %%i in (`where pwsh 2^>nul`) do (
set _cmd=%%i
)

if "%_cmd%"=="" (
echo Error: PowerShell not found. Please visit https://github.com/powershell/powershell for install instructions.
exit /b 2
)

call "%_cmd%" -NoLogo -NoProfile -File "%~dpn0.ps1" %*
Loading

0 comments on commit 35a65fe

Please sign in to comment.