Skip to content

Commit

Permalink
Merge branch 'main' into abhis/usagev1_011701
Browse files Browse the repository at this point in the history
  • Loading branch information
Lauragra authored Feb 1, 2024
2 parents 12acdd5 + 9fa274e commit b4301bd
Show file tree
Hide file tree
Showing 9,580 changed files with 16,653 additions and 10,957 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
57 changes: 57 additions & 0 deletions .azure-pipelines/.config/CredScanSuppressions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"hash": "4HFMaPyHf2Oq0UHssXYQ+IzVZIRgG18pB/v4dtou7sw=",
"_justification": "authenticationmethod-resetpassword.md line 184 Sample password in JSON example"
},
{
"hash": "Dl8lVS64t7J9YPKUCrs6IvmGgwA9lkG/9TTJvKLyIfw=",
"_justification": "externallyaccessibleawsstoragebucketfinding-list.md line 118 Sample Azure storage account access key in JSON example"
},
{
"hash": "6uNofS5cYXMBA0lB/CvV80FLhrnf5Pgi8z1A4ouVNzE=",
"_justification": "security-passivednsrecord-get.md line 66 Sample general symmetric key in HTTP request example"
},
{
"hash": "DqnzqSuPoql8CRa0NwVQjvMWVEdB/1JVZhMLf5a7caw=",
"_justification": "serviceprincipal-createpasswordsinglesignoncredentials.md line 90 Sample common default password in JSON example"
},
{
"hash": "YGEAcd2dkpni4zKf2vds0XCBd4ETjyy6VSqP6wF8K4Y=",
"_justification": "security-whoishistoryrecord-get.md line 64 Sample symmetric key in HTTP request example"
},
{
"hash": "yuNZ6vrD0RfK/gi2biOeRwncQ7QBOUsptruQ9gF4fGE=",
"_justification": "user-changepassword.md line 67 Sample password in JSON example"
},
{
"hash": "XQQz4syNsXVwCQBB+ROKXms/PeYf1xxMiu93rtFGQzE=",
"_justification": "user-validatepassword.md line 69 Sample password in JSON example"
},
{
"hash": "449XS9qz2RDCs4hRlMopVw7CCRxp01qRBUh152CBj1w=",
"_justification": "send-sharing-invite-go-snippets.md line 40 Sample password in JSON example"
},
{
"hash": "ezuuJrz3tJVuhDI3QayaAQnoJmJ7OdePNofJCf9yRos=",
"_justification": "update-planneruser-go-snippets.md line 22 Sample general symmetric key in code snippets"
},
{
"hash": "4HFMaPyHf2Oq0UHssXYQ+IzVZIRgG18pB/v4dtou7sw=",
"_justification": "passwordauthenticationmethod-resetpassword-adminprovided-java-snippets.md line 9 Sample password in code snippets"
},
{
"hash": "pFG5S9mElRlcOZ+ByQRi1yN4nzkV+sW0DBJStZwB13I=",
"_justification": "application-saml-sso-configure-api.md line 1004 Sample general symmetric key in JSON example"
},
{
"hash": "lrucAcVPXoYUsoNE7NH+dQDxA5dKVl04BhLUkL2i+k8=",
"_justification": "auth-v2-service.md line 166 Sample Azure AD client secret in cURL example"
},
{
"hash": "Yq6kyr67P2hd5i71eNVIOL8EHosrVwv9Mg0R6PdiF6c=",
"_justification": "authenticationmethods-get-started.md line 451 Sample general password in JSON example"
}
]
}
57 changes: 2 additions & 55 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -972,61 +972,8 @@ configuration:
- isOpen
- isAction:
action: Opened
- activitySenderHasAssociation:
association: COLLABORATOR
- not:
or:
- hasLabel:
label: do not merge
- hasLabel:
label: ready to merge
- hasLabel:
label: ready for content review
- hasLabel:
label: blocked
- hasLabel:
label: changelog required
- hasLabel:
label: changes requested
- hasLabel:
label: awaiting internal response
- hasLabel:
label: content review in progress
- hasLabel:
label: content review complete
then:
- addLabel:
label: do not merge
- addReply:
reply: >-
> [!NOTE]
> The following guidance is for Microsoft employees only. Community contributors can ignore this message; our content team will manage the status.
Thanks for your pull request, ${issueAuthor}! I've added the **do not merge** label as a default status.
Please add the **ready for content review** label to start a review. Your PR won't be reviewed until you add this label.
After the content review is complete and the updates in this PR are ready for external customers to use, please replace the **do not merge** label with **ready to merge**.
> [!NOTE]
> Pull requests will not be merged until the **ready to merge** label is set.
For details, see the [Content review process summary](https://dev.azure.com/msazure/One/_wiki/wikis/Microsoft%20Graph%20Partners/614263/Content-workflow).
- description: Add do not merge label to new pull requests opened by members
if:
- payloadType: Pull_Request
- isOpen
- isAction:
action: Opened
- activitySenderHasAssociation:
association: MEMBER
- activitySenderHasPermission:
permission: write
- not:
or:
- hasLabel:
Expand Down
24 changes: 17 additions & 7 deletions Test-Docs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,35 @@ $apiDoctorNuGetVersion = $env:API_DOCTOR_NUGET_VERSION
$apiDoctorGitRepoUrl = $env:API_DOCTOR_GIT_REPO_URL
$apiDoctorGitBranch = $env:API_DOCTOR_GIT_BRANCH
$docsRepoPath = (Get-Location).Path
$docsSubPath = $env:APIDOCTOR_DOCSUBPATH
$docsSubPath = $env:DOCS_SUB_PATH
$downloadedApiDoctor = $false
$downloadedNuGet = $false

Write-Host "Repository location: ", $docsRepoPath
if ($useNuGetPackage -eq $true) {
Write-Host "API Doctor NuGet Version: ", $apiDoctorNuGetVersion
}
else {
Write-Host "API Doctor Git Repo:"
Write-Host "- URL: $apiDoctorGitRepoUrl"
Write-Host "- Branch: $apiDoctorGitBranch"
}

Write-Host "Repository Location: ", $docsRepoPath
Write-Host "Docs Subpath: ", $docsSubPath

# Check if API Doctor source has been set
if ($useNuGetPackage -and [string]::IsNullOrWhiteSpace($apiDoctorNuGetVersion)) {
if ($useNuGetPackage -eq $true -and [string]::IsNullOrWhiteSpace($apiDoctorNuGetVersion)) {
Write-Host "API Doctor NuGet package version has not been set. Aborting..."
exit 1
}
elseif (!$useNuGetPackage -and [string]::IsNullOrWhiteSpace($apiDoctorGitRepoUrl)) {
elseif ($useNuGetPackage -eq $false -and [string]::IsNullOrWhiteSpace($apiDoctorGitRepoUrl)) {
Write-Host "API Doctor Git Repo URL has not been set. Aborting..."
exit 1
}

# Check if docs subpath has been set
if ([string]::IsNullOrWhiteSpace($docsSubPath)) {
Write-Host "API Doctor subpath has not been set. Aborting..."
Write-Host "Docs subpath has not been set. Aborting..."
exit 1
}

Expand Down Expand Up @@ -56,15 +66,15 @@ else {
$apidocPath = Join-Path $docsRepoPath -ChildPath "apidoctor"
New-Item -ItemType Directory -Force -Path $apidocPath

if ($useNuGetPackage) {
if ($useNuGetPackage -eq $true) {
# Install API Doctor from NuGet
Write-Host "Running nuget.exe from ", $nugetPath
$nugetParams = "install", "ApiDoctor", "-Version", $apiDoctorNuGetVersion, "-OutputDirectory", $apidocPath, "-NonInteractive", "-DisableParallelProcessing"
& $nugetPath $nugetParams

if ($LastExitCode -ne 0) {
# NuGet error, so we can't proceed
Write-Host "Error installing API Doctor from NuGet. Aborting."
Write-Host "Error installing API Doctor from NuGet. Aborting..."
Remove-Item $nugetPath
exit $LastExitCode
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DELETE /identityGovernance/entitlementManagement/accessPackages/{id}/accessPacka

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DELETE /identityGovernance/entitlementManagement/accessPackages/{id}/incompatibl

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer {token}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
| Content-Type | application/json. Required. |

## Request body
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DELETE /identityGovernance/entitlementManagement/accessPackages/{id}/incompatibl

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer {token}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
| Content-Type | application/json. Required. |

## Request body
Expand Down
2 changes: 1 addition & 1 deletion api-reference/beta/api/accesspackage-delete.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ DELETE /identityGovernance/entitlementManagement/accessPackages/{id}

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following table shows the parameters that can be used with this function.
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body
Don't supply a request body for this method.
Expand Down
2 changes: 1 addition & 1 deletion api-reference/beta/api/accesspackage-get.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This method supports the `$select` and `$expand` OData query parameters to help

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ None.
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body
Do not supply a request body for this method if you wish to retrieve a list of access package requirements as in example 1. If you want to get policy requirements for user scope as in example 2, you must supply a request body.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This method supports the `$select`, `$filter`, and `$expand` OData query paramet

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This method supports the OData query parameters for server-side paging through a

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This method supports the OData query parameters for server-side paging through a

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This method supports the OData query parameters for server-side paging through a

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
2 changes: 1 addition & 1 deletion api-reference/beta/api/accesspackage-movetocatalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ POST /identityGovernance/entitlementManagement/accessPackages/{accessPackageId}/
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
|Content-Type|application/json. Required.|

## Request body
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ POST /identityGovernance/entitlementManagement/accessPackages/{id}/accessPackage

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer {token}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
| Content-Type | application/json. Required. |

## Request body
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ POST /identityGovernance/entitlementManagement/accessPackages/{id}/incompatibleA

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer {token}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
| Content-Type | application/json. Required. |

## Request body
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ POST /identityGovernance/entitlementManagement/accessPackages/{id}/incompatibleG

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer {token}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
| Content-Type | application/json. Required. |

## Request body
Expand Down
2 changes: 1 addition & 1 deletion api-reference/beta/api/accesspackage-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PATCH /identityGovernance/entitlementManagement/accessPackages/{accessPackageId}
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
|Content-Type|application/json. Required.|

## Request body
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ This method supports the `$select`, `$filter`, and `$expand` OData query paramet
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body
Don't supply a request body for this method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following table shows the parameters that can be used with this function.
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body
Don't supply a request body for this method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ POST /identityGovernance/entitlementManagement/accessPackageAssignments/{id}/rep

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DELETE /identityGovernance/entitlementManagement/accessPackageAssignmentPolicies

| Name | Description |
|:--------------|:--------------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ This method supports the `$select` OData query parameter to help customize the r

| Name |Description|
|:----------|:----------|
| Authorization | Bearer \{token\}. Required. |
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PUT /identityGovernance/entitlementManagement/accessPackageAssignmentPolicies/{a
## Request headers
|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required.|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
|Content-Type|application/json. Required.|

## Request body
Expand Down
Loading

0 comments on commit b4301bd

Please sign in to comment.