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

Remove Dapr components from ContainerApp spec. Not breaking because the version hasn't been released yet. #17479

Merged
merged 5 commits into from
Jan 27, 2022
Merged

Remove Dapr components from ContainerApp spec. Not breaking because the version hasn't been released yet. #17479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aac3a43
Remove dapr components from the ContainerApp object
ruslany Jan 24, 2022
d5ecfe5
Fix example
ruslany Jan 24, 2022
bc6d7bf
add descriptions
ruslany Jan 24, 2022
9581ca2
fix
ruslany Jan 25, 2022
14930f4
change the auto-rest parameters
ruslany Jan 26, 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
70 changes: 13 additions & 57 deletions ...tion/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,66 +130,22 @@
"description": "Dapr application identifier",
"type": "string"
},
"appProtocol": {
"description": "Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http",
"enum": [
"http",
"grpc"
],
"type": "string",
"x-ms-enum": {
"name": "appProtocol",
"modelAsString": true
}
},
"appPort": {
"format": "int32",
"description": "Port on which the Dapr side car",
"description": "Tells Dapr which port your application is listening on",
"type": "integer"
},
"components": {
"description": "Collection of Dapr components",
"type": "array",
"items": {
"$ref": "#/definitions/DaprComponent"
},
"x-ms-identifiers": [
"name"
]
}
}
},
"DaprComponent": {
"description": "Dapr component configuration",
"type": "object",
"properties": {
"name": {
"description": "Component name",
"type": "string"
},
"type": {
"description": "Component type",
"type": "string"
},
"version": {
"description": "Component version",
"type": "string"
},
"metadata": {
"description": "Component metadata",
"type": "array",
"items": {
"$ref": "#/definitions/DaprMetadata"
},
"x-ms-identifiers": [
"name"
]
}
}
},
"DaprMetadata": {
"description": "Container App Dapr component metadata.",
"type": "object",
"properties": {
"name": {
"description": "Metadata property name.",
"type": "string"
},
"value": {
"description": "Metadata property value.",
"type": "string"
},
"secretRef": {
"description": "Name of the Container App secret from which to pull the metadata property value.",
"type": "string"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -73,7 +73,7 @@
}
},
"x-ms-examples": {
"List Container Apps by resource group": {
"List App's Source Controls": {
"$ref": "./examples/SourceControls_ListByContainer.json"
}
},
Expand Down
9 changes: 6 additions & 3 deletions ...nager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down Expand Up @@ -91,7 +92,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down Expand Up @@ -143,7 +145,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion .../Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...r/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...source-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
},
"dapr": {
"enabled": true,
"appPort": 3000
"appPort": 3000,
"appProtocol": "grpc"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions specification/app/resource-manager/readme.csharp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ csharp:
payload-flattening-threshold: 1
clear-output-folder: true
client-side-validation: false
namespace: Microsoft.App
output-folder: $(csharp-sdks-folder)/app/management/Microsoft.App/GeneratedProtocol
namespace: Microsoft.Azure.Management.ContainerApps
output-folder: $(csharp-sdks-folder)/app/Microsoft.Azure.Management.ContainerApps/src/Generated
```