Skip to content

Commit

Permalink
Merge branch 'main' into user/priyjain/publicpreview-2024-09-01
Browse files Browse the repository at this point in the history
  • Loading branch information
@agrbhuvnesh
agrbhuvnesh authored Oct 11, 2024
2 parents 20b9a9c + 59a7e32 commit 56128aa
Show file tree
Hide file tree
Showing 3,305 changed files with 476,248 additions and 9,463 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 10 additions & 7 deletions .github/workflows/protected-files.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@ name: Protected Files

on: pull_request

env:
# Users allowed to edit protected files without failing check
user-allowed: ${{ github.event.pull_request.user.login == 'azure-sdk' || github.event.pull_request.user.login == 'dependabot[bot]' }}

jobs:
protected-files:
name: Protected Files

runs-on: ubuntu-latest

steps:
# Allow bot account 'azure-sdk' to update protected files.
# Since check is required, the job itself cannot be skipped.
- name: Allow bot account 'azure-sdk'
if: github.event.pull_request.user.login == 'azure-sdk'
run: echo "Bot account 'azure-sdk' is allowed to update protected files"
# Since check is required, the job must pass instead of being skipped
- name: User allowed
if: ${{ env.user-allowed == 'true' }}
run: echo "Account '${{ github.event.pull_request.user.login }}' is allowed to update protected files"

- uses: actions/checkout@v4
if: github.event.pull_request.user.login != 'azure-sdk'
if: ${{ env.user-allowed != 'true' }}
with:
# Required since "HEAD^" is passed to Get-ChangedFiles
fetch-depth: 2

- name: Detect changes to protected files
if: github.event.pull_request.user.login != 'azure-sdk'
if: ${{ env.user-allowed != 'true' }}
run: |
. eng/scripts/ChangedFiles-Functions.ps1
Expand Down
205 changes: 202 additions & 3 deletions cSpell.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
]
},
{
"filename": "**/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/ContainerApps.json",
"filename": "**/specification/app/resource-manager/Microsoft.App/**/*.json",
"words": [
"workflowapp"
]
Expand Down Expand Up @@ -407,6 +407,12 @@
"Regenerte"
]
},
{
"filename": "**/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json",
"words": [
"whatsapp"
]
},
{
"filename": "**/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json",
"words": [
Expand Down Expand Up @@ -1042,6 +1048,12 @@
"xcool"
]
},
{
"filename": "**/specification/recoveryservicesbackup/resource-manager/Microsoft.RecoveryServices/**/bms.json",
"words": [
"HanaScaleoutContainer"
]
},
{
"filename": "**/specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2021-10-15/iotdps.json",
"words": [
Expand Down Expand Up @@ -1239,7 +1251,12 @@
"vectorizing",
"onelake",
"tiktoken",
"Matryoshka"
"Matryoshka",
"rescore",
"rescoring",
"rescored",
"maxcharlength",
"submode"
]
},
{
Expand Down Expand Up @@ -1289,24 +1306,200 @@
{
"filename": "**/specification/awsconnector/resource-manager/Microsoft.AwsConnector/**/*.json",
"words": [
"ABAC",
"ACFP",
"ACMPCA",
"ACUs",
"assemblyline",
"autoprovision",
"Aviv",
"AWSACM",
"AWSACMPCA",
"AWSAPS",
"AWSDMS",
"AWSEC",
"AWSECR",
"AWSECS",
"AWSEFS",
"AWSEKS",
"AWSELB",
"AWSEMR",
"awsfirelens",
"AWSFIS",
"AWSIAM",
"AWSIAMSAML",
"AWSIVS",
"AWSKMS",
"awslogs",
"AWSM",
"AWSMSK",
"AWSQLDB",
"AWSRDS",
"AWSRDSDB",
"AWSRUM",
"AWSS",
"AWSSES",
"AWSSNS",
"AWSSQS",
"AWSSSM",
"awsvpc",
"AWSWAF",
"AWSX",
"binpack",
"buildspec",
"CFNS",
"CMAP",
"CMK's",
"CODECONNECTIONS",
"cooldowns",
"credentialspec",
"credentialspecdomainless",
"credspec",
"daxs",
"DCERPC",
"dd'T'HH",
"desync",
"diratime",
"dirsync",
"domainless",
"Dsse",
"dsse",
"Dtest",
"Dtestsecret",
"dualstack",
"EEZNYKUA",
"efgyghrtguk",
"Elong",
"emaccess",
"ENCHIPHERMENT",
"ENIs",
"FARGAT",
"Fargate",
"FDTNDATAQYW",
"Firelens",
"firelens",
"fluentbit",
"FOWNER",
"FPGAs",
"fpgas",
"FSETID",
"Fuota",
"Gelf",
"gelf",
"GENEVE",
"Geoproximity",
"healthcheck",
"hostedzone",
"hypens",
"IJCEXJP",
"Ilong",
"Inferentia",
"instancegroup",
"Intlong",
"IPAM's",
"Ipams",
"JDBC",
"kadmin",
"keytabs",
"logentries",
"lowercased",
"mand",
"maxage",
"MKNOD",
"mknod",
"Mlong",
"mpol",
"mqueue",
"mrap",
"MSAs",
"msgmax",
"msgmnb",
"msgmni",
"multicloud",
"multimaster",
"multivalue",
"Multivalue",
"myawslogbucket",
"mycluster",
"mydomain",
"mykeyspace",
"mymanaged",
"myprefix",
"myrepinstance",
"myselfmanaged",
"mytable",
"nfsvers",
"Ningxia",
"Nlong",
"noatime",
"nodegroup",
"Nodegroups",
"nodev",
"nodiratime",
"NOERROR",
"noexec",
"nohup",
"nomand",
"nondefault",
"norelatime",
"nostrictatime",
"nosuid",
"Nshort",
"oemagent",
"ONEZONE",
"PACCT",
"parallelquery",
"Paulo",
"Plong",
"preconfigures",
"PRERELEASED",
"PTRACE",
"Radeon",
"radeon",
"RAWIO",
"rbind",
"RDSCDB",
"redrive",
"relatime",
"resouce",
"retrans",
"rmid",
"Robo",
"rprivate",
"rshared",
"rsize",
"rslave",
"runbindable",
"SETFCAP",
"SETPCAP",
"shmall",
"shmmax",
"shmmni",
"SIEXAMPLE",
"slowquery",
"Sqli",
"sqli",
"sqlserver",
"ss'Z",
"strictatime",
"subdivisioncode",
"tierings",
"timeo",
"ulimits",
"Ultrawarm",
"ultrawarm",
"unbindable",
"untagging",
"Useds",
"VPC's",
"wihtin"
"webacl",
"whitespaces",
"wihtin",
"workdir",
"wsize",
"xxdriver",
"xxlabel",
"xxopt"
]
},
{
Expand Down Expand Up @@ -1460,6 +1653,12 @@
"words": [
"billables"
]
},
{
"filename": "**/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/StackHCIVM/**/*.json",
"words": [
"SEVSNP"
]
}
],
"enableFiletypes": [
Expand Down
46 changes: 29 additions & 17 deletions eng/scripts/Copy-ApiVersion-Functions.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
function Get-NewTagSection($apiVersion, $resourceProvider, $apiVersionStatus, $specFiles) {

$tagVersion = $apiVersion -match '(?<date>\d{4}-\d{2})-\d{2}'
$tagVersion = $Matches['date']
$tagVersion = $apiVersion -match '(?<version>(\d{4}-\d{2}-\d{2}|\d+\.\d+)(-preview(\.\d+)?)?)'
$tagVersion = $Matches['version']
$baseDir = "$resourceProvider/$apiVersionStatus/$apiVersion"
if ($apiVersionStatus -eq "preview") {
$tagVersion = "preview-" + $tagVersion
}

if ($apiVersionStatus -eq "preview") {
$tagVersion = "preview-" + $tagVersion
}

$content = @"
### Tag: package-$tagVersion
Expand All @@ -31,23 +31,35 @@ function Get-ReadmeWithNewTag($readmeContent, $tagContent) {

function Get-ReadmeWithLatestTag($readmeContent, $newApiVersion, $newApiVersionStatus ) {
# Get the current tag date
$currentTag = $readmeContent -match '(?m)^(tag:\s*)(package-)(.*)(?<version>\d{4}-\d{2})(.*)'
$currentTag = $Matches['version']
$latestVersionDate = [datetime]($currentTag -replace '-preview', '')
$currentTag = $readmeContent -match '(?m)^(tag:\s*)(package-)(.*)(?<apiVersion>(?<date>\d{4}-\d{2}-\d{2})|(?<version>\d+\.\d+))'
if ($currentTag = $Matches['date']) {
$latestVersionDate = [datetime]($currentTag -replace '-preview', '')

# Convert the new OpenAPI version to a date
$newVersionDate = [datetime]($newApiVersion -replace '-preview', '')
# Convert the new OpenAPI version to a date
$newVersionDate = [datetime]($newApiVersion -replace '-preview', '')

# Compare two dates
if ($latestVersionDate -gt $newVersionDate) {
Write-Warning "The new version is not newer than the current default version in the readme file."
# Compare two dates
if ($latestVersionDate -gt $newVersionDate) {
Write-Warning "The new version is not newer than the current default version in the readme file."
}
} elseif ($currentTag = $Matches['version']) {
$latestVersion = [version]($currentTag -replace '-preview', '')

# Convert the new OpenAPI version to a date
$newVersion = [Version]($newApiVersion -replace '-preview', '')

# Compare two semvers
if ($latestVersion -gt $newVersion) {
Write-Warning "The new version is not newer than the current default version in the readme file."
}
}
$tagVersion = $newApiVersion -match '\d{4}-\d{2}'
$tagVersion = $Matches[0]

$tagVersion = $newApiVersion -match '(?<apiVersion>(?<date>\d{4}-\d{2}-\d{2})|(?<version>\d+\.\d+)(-preview(\.\d+)?)?)'
$tagVersion = $Matches['apiVersion']
if ($newApiVersionStatus -eq "preview") {
$tagVersion = "preview-" + $tagVersion
}
return $readmeContent -replace '(?m)^(tag:\s*)(package-.*)', "tag: package-$tagVersion"
return $readmeContent -replace '(?m)^(tag:\s*)(package-.*)', "tag: package-$tagVersion"
}

function New-GitAddAndCommit {
Expand Down
Loading

0 comments on commit 56128aa

Please sign in to comment.