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

Added check for Linux App Type #6310

Merged
merged 1 commit into from
Jan 31, 2018
Merged

Added check for Linux App Type #6310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Tasks/AzureRmWebAppDeployment/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"version": {
"Major": 3,
"Minor": 3,
"Patch": 37
"Patch": 38
},
"releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
"minimumAgentVersion": "2.104.1",
Expand All @@ -25,13 +25,13 @@
"name": "FileTransformsAndVariableSubstitution",
"displayName": "File Transforms & Variable Substitution Options",
"isExpanded": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\""
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\""
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "Additional Deployment Options",
"isExpanded": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\""
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\""
},
{
"name": "PostDeploymentAction",
Expand Down Expand Up @@ -76,7 +76,7 @@
"mobileapp": "Mobile App"
},
"properties": {
"EditableOptions": "false"
"EditableOptions": "true"
},
"helpMarkDown": "Select type of web app to deploy. <br/> Note: Select Linux Web App for built-in platform images or custom container image deployments."
},
Expand Down Expand Up @@ -139,7 +139,7 @@
"PopulateDefaultValue": "true"
},
"helpMarkDown": "App Service on Linux offers two different options to publish your application <br/> Custom image deployment or App deployment with a built-in platform image. [Learn More](https://go.microsoft.com/fwlink/?linkid=862490)",
"visibleRule": "WebAppKind = applinux"
"visibleRule": "WebAppKind = applinux || WebAppKind = linux"
},
{
"name": "AzureContainerRegistry",
Expand Down Expand Up @@ -243,7 +243,7 @@
"label": "Registry or Namespace",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "A globally unique top-level domain name for your specific registry or namespace.<br/> Note: Fully qualified image name will be of the format: '<b>`<registry or namespace`></b>/`<repository`>:`<tag`>'. For example, '<b>myregistry.azurecr.io</b>/nginx:latest'."
},
{
Expand All @@ -252,7 +252,7 @@
"label": "Image",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "Name of the repository where the container images are stored.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/<b>`<repository`></b>:`<tag`>'. For example, 'myregistry.azurecr.io/<b>nginx</b>:latest'."
},
{
Expand All @@ -261,7 +261,7 @@
"label": "Tag",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "Tags are optional, it is the mechanism that registries use to give Docker images a version.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/`<repository`>:<b>`<tag`></b>'. For example, 'myregistry.azurecr.io/nginx:<b>latest</b>'."
},
{
Expand All @@ -270,7 +270,7 @@
"label": "Virtual application",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"",
"helpMarkDown": "Specify the name of the Virtual application that has been configured in the Azure portal. The option is not required for deployments to the App Service root."
},
{
Expand All @@ -279,7 +279,7 @@
"label": "Package or folder",
"defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip",
"required": true,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"",
"helpMarkDown": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war."
},
{
Expand All @@ -289,7 +289,7 @@
"label": "Package or folder",
"defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Builtin",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The visible rule will be true for some unknown app type. Consider it would not break existing users.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed. unless user changes the App Type to some invalid name, this will hold.
Also, we would be moving to new task major version soon and this will be taken care.
Will add a story on the backlog. 👍

"helpMarkDown": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.<br />Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported. <br/> For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war."
},
{
Expand All @@ -315,15 +315,15 @@
"ruby|2.3": "Ruby 2.3"
},
"helpMarkDown": "Select the framework and version.",
"visibleRule": "WebAppKind = applinux && ImageSource = Builtin"
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin"
},
{
"name": "StartupCommand",
"type": "string",
"label": "Startup command ",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = applinux",
"visibleRule": "WebAppKind = applinux || WebAppKind = linux",
"helpMarkDown": "Enter the start up command."
},
{
Expand Down
26 changes: 13 additions & 13 deletions Tasks/AzureRmWebAppDeployment/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"version": {
"Major": 3,
"Minor": 3,
"Patch": 37
"Patch": 38
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"minimumAgentVersion": "2.104.1",
Expand All @@ -25,13 +25,13 @@
"name": "FileTransformsAndVariableSubstitution",
"displayName": "ms-resource:loc.group.displayName.FileTransformsAndVariableSubstitution",
"isExpanded": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\""
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\""
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "ms-resource:loc.group.displayName.AdditionalDeploymentOptions",
"isExpanded": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\""
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\""
},
{
"name": "PostDeploymentAction",
Expand Down Expand Up @@ -80,7 +80,7 @@
"mobileapp": "Mobile App"
},
"properties": {
"EditableOptions": "false"
"EditableOptions": "true"
},
"helpMarkDown": "ms-resource:loc.input.help.WebAppKind"
},
Expand Down Expand Up @@ -143,7 +143,7 @@
"PopulateDefaultValue": "true"
},
"helpMarkDown": "ms-resource:loc.input.help.ImageSource",
"visibleRule": "WebAppKind = applinux"
"visibleRule": "WebAppKind = applinux || WebAppKind = linux"
},
{
"name": "AzureContainerRegistry",
Expand Down Expand Up @@ -249,7 +249,7 @@
"label": "ms-resource:loc.input.label.DockerNamespace",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "ms-resource:loc.input.help.DockerNamespace"
},
{
Expand All @@ -258,7 +258,7 @@
"label": "ms-resource:loc.input.label.DockerRepository",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "ms-resource:loc.input.help.DockerRepository"
},
{
Expand All @@ -267,7 +267,7 @@
"label": "ms-resource:loc.input.label.DockerImageTag",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = applinux && ImageSource = Registry",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry",
"helpMarkDown": "ms-resource:loc.input.help.DockerImageTag"
},
{
Expand All @@ -276,7 +276,7 @@
"label": "ms-resource:loc.input.label.VirtualApplication",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"",
"helpMarkDown": "ms-resource:loc.input.help.VirtualApplication"
},
{
Expand All @@ -285,7 +285,7 @@
"label": "ms-resource:loc.input.label.Package",
"defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip",
"required": true,
"visibleRule": "WebAppKind != applinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"",
"helpMarkDown": "ms-resource:loc.input.help.Package"
},
{
Expand All @@ -297,7 +297,7 @@
"label": "ms-resource:loc.input.label.BuiltinLinuxPackage",
"defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip",
"required": true,
"visibleRule": "WebAppKind = applinux && ImageSource = Builtin",
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin",
"helpMarkDown": "ms-resource:loc.input.help.BuiltinLinuxPackage"
},
{
Expand All @@ -323,15 +323,15 @@
"ruby|2.3": "Ruby 2.3"
},
"helpMarkDown": "ms-resource:loc.input.help.RuntimeStack",
"visibleRule": "WebAppKind = applinux && ImageSource = Builtin"
"visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin"
},
{
"name": "StartupCommand",
"type": "string",
"label": "ms-resource:loc.input.label.StartupCommand",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = applinux",
"visibleRule": "WebAppKind = applinux || WebAppKind = linux",
"helpMarkDown": "ms-resource:loc.input.help.StartupCommand"
},
{
Expand Down