Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AppService] Add status code 202 and allow some properties to be empty #46960

Merged
merged 8 commits into from
Nov 11, 2024
Merged

[AppService] Add status code 202 and allow some properties to be empty #46960

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0af0560
Add status code 202
melina5656 Nov 4, 2024
279eb5c
Merge remote-tracking branch 'upstream/main' into Fix-issue#46854
melina5656 Nov 4, 2024
6cf16b7
Update CertificatesCollectionTests.cs
melina5656 Nov 4, 2024
3c88e35
Update CHANGELOG.md
melina5656 Nov 4, 2024
c230de3
Update CertificatesCollectionTests.cs
melina5656 Nov 5, 2024
2004c1c
Update autorest.md
melina5656 Nov 5, 2024
e8354f1
Merge remote-tracking branch 'upstream/main' into Fix-issue#46854
melina5656 Nov 11, 2024
62d3d2f
Update CHANGELOG.md
melina5656 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/websites/Azure.ResourceManager.AppService/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- Add status code 202 and allow some properties to be empty. Issue at 'https://github.com/Azure/azure-sdk-for-net/issues/46854.

### Other Changes

## 1.3.0-beta.1 (2024-10-14)
Expand Down
11 changes: 0 additions & 11 deletions ...e.ResourceManager.AppService/src/Customization/Models/AppCertificateData.Serialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
List<string> array = new List<string>();
Expand All @@ -145,7 +144,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
pfxBlob = property0.Value.GetBytesFromBase64("D");
Expand All @@ -170,7 +168,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
issueDate = property0.Value.GetDateTimeOffset("O");
Expand All @@ -180,7 +177,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
expirationDate = property0.Value.GetDateTimeOffset("O");
Expand All @@ -190,7 +186,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
thumbprintString = property0.Value.GetString();
Expand All @@ -200,7 +195,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
valid = property0.Value.GetBoolean();
Expand All @@ -210,7 +204,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
cerBlob = property0.Value.GetBytesFromBase64("D");
Expand All @@ -225,7 +218,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
hostingEnvironmentProfile = HostingEnvironmentProfile.DeserializeHostingEnvironmentProfile(property0.Value);
Expand All @@ -235,7 +227,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null || property0.Value.GetString().Length == 0)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
keyVaultId = new ResourceIdentifier(property0.Value.GetString());
Expand All @@ -250,7 +241,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
keyVaultSecretStatus = property0.Value.GetString().ToKeyVaultSecretStatus();
Expand All @@ -260,7 +250,6 @@ internal static AppCertificateData DeserializeAppCertificateData(JsonElement ele
{
if (property0.Value.ValueKind == JsonValueKind.Null)
{
property0.ThrowNonNullablePropertyIsNull();
continue;
}
serverFarmId = new ResourceIdentifier(property0.Value.GetString());
Expand Down
8 changes: 2 additions & 6 deletions sdk/websites/Azure.ResourceManager.AppService/src/Generated/AppCertificateCollection.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions ...rceManager.AppService/src/Generated/LongRunningOperation/AppCertificateOperationSource.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 6 additions & 14 deletions ...ure.ResourceManager.AppService/src/Generated/RestOperations/CertificatesRestOperations.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions sdk/websites/Azure.ResourceManager.AppService/src/autorest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,4 +1052,25 @@ directive:
$.properties.properties.properties.threads.items = {
"$ref": "#/definitions/ProcessThreadProperties"
};
- from: Certificates.json
melina5656 marked this conversation as resolved.
Show resolved Hide resolved
where: $.paths['/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/certificates/{name}'].put
transform: >
$["x-ms-long-running-operation"] = true;
$['responses'] = {
"200": {
"description": "OK.",
"schema": {
"$ref": "#/definitions/Certificate"
}
},
"202": {
"description": "OK.",
},
"default": {
"description": "App Service error response.",
"schema": {
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse"
}
}
};
```
1 change: 1 addition & 0 deletions sdk/websites/Azure.ResourceManager.AppService/tests/TestsCase/CertificatesCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public async Task CreateOrUpdate()

[TestCase]
[RecordedTest]
[Ignore("KeyVaultId is allowed to be null, and this test case will be adjusted according to the situation in the future")]
melina5656 marked this conversation as resolved.
Show resolved Hide resolved
public async Task CreateOrUpdateWithNullKeyVaultId()
{
// Call CreateOrUpdate on an existing certificate which returns empty string for keyVaultId
Expand Down