Skip to content

Fix 2022-06-01-preview branch merge conflicts #20773

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

Merged
leniatgh merged 6 commits into from
Sep 20, 2022
Merged

Fix 2022-06-01-preview branch merge conflicts #20773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
757cea0
Reset
ruslany Sep 19, 2022
9ef2f9e
more fixes
ruslany Sep 19, 2022
a9377ef
More fixes
ruslany Sep 19, 2022
44b0206
another conflict fix
ruslany Sep 19, 2022
533b081
Fix old preview version
ruslany Sep 19, 2022
dc3f07f
fix 2022-03-01
ruslany Sep 19, 2022
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
223 changes: 220 additions & 3 deletions custom-words.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/AuthConfigs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"ContainerAppsAuthConfigs"
],
"summary": "Create or update the AuthConfig for a Container App.",
"description": "Description for Create or update the AuthConfig for a Container App.",
"description": "Create or update the AuthConfig for a Container App.",
"operationId": "ContainerAppsAuthConfigs_CreateOrUpdate",
"parameters": [
{
Expand Down Expand Up @@ -182,7 +182,7 @@
"ContainerAppsAuthConfigs"
],
"summary": "Delete a Container App AuthConfig.",
"description": "Description for Delete a Container App AuthConfig.",
"description": "Delete a Container App AuthConfig.",
"operationId": "ContainerAppsAuthConfigs_Delete",
"parameters": [
{
Expand Down
184 changes: 111 additions & 73 deletions ...fication/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"ContainerApps"
],
"summary": "Create or update a Container App.",
"description": "Description for Create or update a Container App.",
"description": "Create or update a Container App.",
"operationId": "ContainerApps_CreateOrUpdate",
"parameters": [
{
Expand Down Expand Up @@ -211,7 +211,7 @@
"ContainerApps"
],
"summary": "Delete a Container App.",
"description": "Description for Delete a Container App.",
"description": "Delete a Container App.",
"operationId": "ContainerApps_Delete",
"parameters": [
{
Expand Down Expand Up @@ -358,6 +358,9 @@
"x-ms-examples": {
"Analyze Custom Hostname": {
"$ref": "./examples/ContainerApps_ListCustomHostNameAnalysis.json"
},
"Analyse Custom Hostname Error Response": {
"$ref": "./examples/ContainerApps_ListCustomHostNameAnalysisErrorResponse.json"
}
}
}
Expand Down Expand Up @@ -763,94 +766,129 @@
"CustomHostnameAnalysisResult": {
"description": "Custom domain analysis.",
"type": "object",
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
}
],
"properties": {
"properties": {
"description": "CustomHostnameAnalysisResult resource specific properties",
"hostName": {
"description": "Host name that was analyzed",
"type": "string",
"readOnly": true
},
"isHostnameAlreadyVerified": {
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
"type": "boolean",
"readOnly": true
},
"customDomainVerificationTest": {
"description": "DNS verification test result.",
"enum": [
"Passed",
"Failed",
"Skipped"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "DnsVerificationTestResult",
"modelAsString": false
}
},
"customDomainVerificationFailureInfo": {
"description": "Raw failure information if DNS verification fails.",
"type": "object",
"properties": {
"hostName": {
"description": "Host name that was analyzed",
"code": {
"description": "Standardized string to programmatically identify the error.",
"type": "string",
"readOnly": true
},
"isHostnameAlreadyVerified": {
"description": "<code>true</code> if hostname is already verified; otherwise, <code>false</code>.",
"type": "boolean",
"readOnly": true
},
"customDomainVerificationTest": {
"description": "DNS verification test result.",
"enum": [
"Passed",
"Failed",
"Skipped"
],
"message": {
"description": "Detailed error description and debugging information.",
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "DnsVerificationTestResult",
"modelAsString": false
}
},
"customDomainVerificationFailureInfo": {
"$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse",
"description": "Raw failure information if DNS verification fails.",
"readOnly": true
},
"hasConflictOnManagedEnvironment": {
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
"type": "boolean",
"readOnly": true
},
"conflictingContainerAppResourceId": {
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
"target": {
"description": "Detailed error description and debugging information.",
"type": "string",
"readOnly": true
},
"cNameRecords": {
"description": "CName records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"txtRecords": {
"description": "TXT records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"aRecords": {
"description": "A records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"alternateCNameRecords": {
"description": "Alternate CName records visible for this hostname.",
"details": {
"type": "array",
"description": "Details or the error",
"items": {
"type": "string"
}
},
"alternateTxtRecords": {
"description": "Alternate TXT records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
"description": "Detailed errors.",
"type": "object",
"properties": {
"code": {
"description": "Standardized string to programmatically identify the error.",
"type": "string",
"readOnly": true
},
"message": {
"description": "Detailed error description and debugging information.",
"type": "string",
"readOnly": true
},
"target": {
"description": "Detailed error description and debugging information.",
"type": "string",
"readOnly": true
}
},
"readOnly": true
},
"x-ms-identifiers": [
"code"
]
}
},
"x-ms-client-flatten": true
"readOnly": true
},
"hasConflictOnManagedEnvironment": {
"description": "<code>true</code> if there is a conflict on the Container App's managed environment; otherwise, <code>false</code>.",
"type": "boolean",
"readOnly": true
},
"conflictingContainerAppResourceId": {
"description": "Name of the conflicting Container App on the Managed Environment if it's within the same subscription.",
"type": "string",
"readOnly": true
},
"cNameRecords": {
"description": "CName records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"txtRecords": {
"description": "TXT records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"aRecords": {
"description": "A records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"alternateCNameRecords": {
"description": "Alternate CName records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
},
"alternateTxtRecords": {
"description": "Alternate TXT records visible for this hostname.",
"type": "array",
"items": {
"type": "string"
}
}
}
},
"x-ms-client-flatten": true
}
},
"securityDefinitions": {
Expand Down
4 changes: 2 additions & 2 deletions ...ication/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/SourceControls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"ContainerAppsSourceControls"
],
"summary": "Create or update the SourceControl for a Container App.",
"description": "Description for Create or update the SourceControl for a Container App.",
"description": "Create or update the SourceControl for a Container App.",
"operationId": "ContainerAppsSourceControls_CreateOrUpdate",
"parameters": [
{
Expand Down Expand Up @@ -207,7 +207,7 @@
"ContainerAppsSourceControls"
],
"summary": "Delete a Container App SourceControl.",
"description": "Description for Delete a Container App SourceControl.",
"description": "Delete a Container App SourceControl.",
"operationId": "ContainerAppsSourceControls_Delete",
"parameters": [
{
Expand Down
4 changes: 2 additions & 2 deletions ...manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"200": {
"headers": {},
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
"type": "Microsoft.App/ManagedEnvironments/Certificates",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"subjectName": "my-subject-name.company.country.net",
"subjectName": "my-subject-name.contoso.com",
"issuer": "Issuer Name",
"issueDate": "2021-11-06T04:00:00Z",
"expirationDate": "2022-11-06T04:00:00Z",
Expand Down
4 changes: 2 additions & 2 deletions ...p/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificate_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"200": {
"headers": {},
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
"name": "certificate-firendly-name",
"type": "Microsoft.App/ManagedEnvironments/Certificates",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"subjectName": "my-subject-name.company.country.net",
"subjectName": "my-subject-name.contoso.com",
"issuer": "Issuer Name",
"issueDate": "2021-11-06T04:00:00Z",
"expirationDate": "2022-11-06T04:00:00Z",
Expand Down
8 changes: 4 additions & 4 deletions ...rosoft.App/preview/2022-01-01-preview/examples/Certificates_ListByManagedEnvironment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"body": {
"value": [
{
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
"name": "certificate-firendly-name",
"type": "Microsoft.App/ManagedEnvironments/Certificates",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"subjectName": "my-subject-name.company.country.net",
"subjectName": "my-subject-name.contoso.com",
"issuer": "Issuer Name",
"issueDate": "2021-11-06T04:00:00Z",
"expirationDate": "2022-11-06T04:00:00Z",
Expand All @@ -26,13 +26,13 @@
}
},
{
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
"name": "certificate-firendly-name",
"type": "Microsoft.App/ManagedEnvironments/Certificates",
"location": "East US",
"properties": {
"provisioningState": "Succeeded",
"subjectName": "my-subject-name.company.country.net",
"subjectName": "my-subject-name.contoso.com",
"issuer": "Issuer Name",
"issueDate": "2021-11-06T04:00:00Z",
"expirationDate": "2022-11-06T04:00:00Z",
Expand Down
4 changes: 2 additions & 2 deletions ...esource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Certificates_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"200": {
"headers": {},
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificate-firendly-name",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv/certificates/certificate-firendly-name",
"type": "Microsoft.App/ManagedEnvironments/Certificates",
"location": "East US",
"tags": {
Expand All @@ -25,7 +25,7 @@
},
"properties": {
"provisioningState": "Succeeded",
"subjectName": "my-subject-name.company.country.net",
"subjectName": "my-subject-name.contoso.com",
"issuer": "Issuer Name",
"issueDate": "2021-11-06T04:00:00Z",
"expirationDate": "2022-11-06T04:00:00Z",
Expand Down
Loading