Skip to content

Commit

Permalink
Users/rok/msi node based task (#6981)
Browse files Browse the repository at this point in the history
* MSI node changes

* msi changes argument pass

* review incoporated

* aftet review incorprated

* After camelcase for enum name

* proper identation

* L0 modifieed

* build failure

* error messgae changed

* Url changed

* test case changes

* after copying in mysql

* removing quotes

* azure app service manage task resource copy

* key vault conflict

* azure RG task

* resolving conflit with azurerm

* javatool installer

* jenkins download artifact

* packerbuild

* status code changed

* till updated task version

* review incorporated

* review incorporated

* revwerting package json changes
  • Loading branch information
RoshanKumarMicrosoft authored Apr 15, 2018
1 parent 4f134b9 commit c46a7f6
Show file tree
Hide file tree
Showing 41 changed files with 240 additions and 94 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"loc.messages.RestartAppServiceAccepted": "Restart request accepted by App Service : %s",
"loc.messages.InvalidAction": "Invalid Action selected !",
"loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING: Cannot update deployment status. SCM endpoint is not enabled for this website.",
"loc.messages.CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch acccess token for Azure App Service. StatusCode %s (%s)",
"loc.messages.WebAppDoesntExist": "Web app '%s' doesn't exist.",
"loc.messages.UnabletoretrieveWebAppID": "Unable to retrieve connection details for Azure App Service:'%s'. Status Code: %s",
"loc.messages.StartingSwapSlot": "Requesting swap slot for Web App : %s",
Expand All @@ -78,7 +77,6 @@
"loc.messages.UnableToFetchContinuousWebJobs": "Unable to fetch continuous web jobs",
"loc.messages.UnableToStartContinuousWebJob": "Unable to start continuous web job",
"loc.messages.UnableToStopContinuousWebJob": "Unable to stop continuous web job",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"loc.messages.AppNameCannotBeNull": "App name cannot be null or undefined and it must be of type string.",
"loc.messages.SlotNameCannotBeNull": "Slot name cannot be null or undefined and it must be of type string.",
"loc.messages.SourceSlotNameCannotBeNull": "Source slot name cannot be null or undefined and it must be of type string.",
Expand Down Expand Up @@ -164,5 +162,8 @@
"loc.messages.WebJobAlreadyInStoppedState": "WebJob '%s' is already in stopped state.",
"loc.messages.RestartingKuduService": "Restarting Kudu Service.",
"loc.messages.RestartedKuduService": "Kudu Service restarted.",
"loc.messages.FailedToRestartKuduService": "Failed to restart kudu Service. %s."
"loc.messages.FailedToRestartKuduService": "Failed to restart kudu Service. %s.",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
7 changes: 4 additions & 3 deletions Tasks/AzureAppServiceManage/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
"RestartAppServiceAccepted": "Restart request accepted by App Service : %s",
"InvalidAction": "Invalid Action selected !",
"WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "WARNING: Cannot update deployment status. SCM endpoint is not enabled for this website.",
"CouldnotfetchaccesstokenforAzureStatusCode": "Could not fetch acccess token for Azure App Service. StatusCode %s (%s)",
"WebAppDoesntExist": "Web app '%s' doesn't exist.",
"UnabletoretrieveWebAppID": "Unable to retrieve connection details for Azure App Service:'%s'. Status Code: %s",
"StartingSwapSlot": "Requesting swap slot for Web App : %s",
Expand All @@ -313,7 +312,6 @@
"UnableToFetchContinuousWebJobs": "Unable to fetch continuous web jobs",
"UnableToStartContinuousWebJob": "Unable to start continuous web job",
"UnableToStopContinuousWebJob": "Unable to stop continuous web job",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"AppNameCannotBeNull": "App name cannot be null or undefined and it must be of type string.",
"SlotNameCannotBeNull": "Slot name cannot be null or undefined and it must be of type string.",
"SourceSlotNameCannotBeNull": "Source slot name cannot be null or undefined and it must be of type string.",
Expand Down Expand Up @@ -399,6 +397,9 @@
"WebJobAlreadyInStoppedState": "WebJob '%s' is already in stopped state.",
"RestartingKuduService": "Restarting Kudu Service.",
"RestartedKuduService": "Kudu Service restarted.",
"FailedToRestartKuduService": "Failed to restart kudu Service. %s."
"FailedToRestartKuduService": "Failed to restart kudu Service. %s.",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
}
7 changes: 4 additions & 3 deletions Tasks/AzureAppServiceManage/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@
"RestartAppServiceAccepted": "ms-resource:loc.messages.RestartAppServiceAccepted",
"InvalidAction": "ms-resource:loc.messages.InvalidAction",
"WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite": "ms-resource:loc.messages.WARNINGCannotupdatedeploymentstatusSCMendpointisnotenabledforthiswebsite",
"CouldnotfetchaccesstokenforAzureStatusCode": "ms-resource:loc.messages.CouldnotfetchaccesstokenforAzureStatusCode",
"WebAppDoesntExist": "ms-resource:loc.messages.WebAppDoesntExist",
"UnabletoretrieveWebAppID": "ms-resource:loc.messages.UnabletoretrieveWebAppID",
"StartingSwapSlot": "ms-resource:loc.messages.StartingSwapSlot",
Expand All @@ -317,7 +316,6 @@
"UnableToFetchContinuousWebJobs": "ms-resource:loc.messages.UnableToFetchContinuousWebJobs",
"UnableToStartContinuousWebJob": "ms-resource:loc.messages.UnableToStartContinuousWebJob",
"UnableToStopContinuousWebJob": "ms-resource:loc.messages.UnableToStopContinuousWebJob",
"CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
"AppNameCannotBeNull": "ms-resource:loc.messages.AppNameCannotBeNull",
"SlotNameCannotBeNull": "ms-resource:loc.messages.SlotNameCannotBeNull",
"SourceSlotNameCannotBeNull": "ms-resource:loc.messages.SourceSlotNameCannotBeNull",
Expand Down Expand Up @@ -403,6 +401,9 @@
"WebJobAlreadyInStoppedState": "ms-resource:loc.messages.WebJobAlreadyInStoppedState",
"RestartingKuduService": "ms-resource:loc.messages.RestartingKuduService",
"RestartedKuduService": "ms-resource:loc.messages.RestartedKuduService",
"FailedToRestartKuduService": "ms-resource:loc.messages.FailedToRestartKuduService"
"FailedToRestartKuduService": "ms-resource:loc.messages.FailedToRestartKuduService",
"CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode",
"CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.",
"loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.",
"loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"loc.messages.CallbackCannotBeNull": "callback cannot be null.",
"loc.messages.CredentialsCannotBeNull": "'credentials' cannot be null.",
"loc.messages.SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.",
Expand All @@ -40,5 +39,8 @@
"loc.messages.GetSecretFailedBecauseOfInvalidCharacters": "Cannot find the secret with name: %s. Secret name must be a string 1-127 characters in length containing only 0-9, a-z, A-Z, and -",
"loc.messages.UploadingAttachment": "Uploading %s as attachment",
"loc.messages.CouldNotWriteToFile": "Could not save content to file. Failed with an error %s",
"loc.messages.CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely"
"loc.messages.CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
2 changes: 1 addition & 1 deletion Tasks/AzureKeyVault/npm-shrinkwrap.json

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

8 changes: 5 additions & 3 deletions Tasks/AzureKeyVault/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 16
"Patch": 17
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down Expand Up @@ -70,7 +70,6 @@
"SecretCannotBeEmpty": "secret must be a non empty string.",
"armUrlCannotBeEmpty": "arm Url must be a non empty string.",
"authorityUrlCannotBeEmpty": "authority must be a non empty string.",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"CallbackCannotBeNull": "callback cannot be null.",
"CredentialsCannotBeNull": "'credentials' cannot be null.",
"SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.",
Expand All @@ -95,6 +94,9 @@
"GetSecretFailedBecauseOfInvalidCharacters": "Cannot find the secret with name: %s. Secret name must be a string 1-127 characters in length containing only 0-9, a-z, A-Z, and -",
"UploadingAttachment": "Uploading %s as attachment",
"CouldNotWriteToFile": "Could not save content to file. Failed with an error %s",
"CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely"
"CouldNotMaskSecret": "%s value has regular expressions hence could not mask completely",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
}
8 changes: 5 additions & 3 deletions Tasks/AzureKeyVault/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 16
"Patch": 17
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down Expand Up @@ -72,7 +72,6 @@
"SecretCannotBeEmpty": "ms-resource:loc.messages.SecretCannotBeEmpty",
"armUrlCannotBeEmpty": "ms-resource:loc.messages.armUrlCannotBeEmpty",
"authorityUrlCannotBeEmpty": "ms-resource:loc.messages.authorityUrlCannotBeEmpty",
"CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
"CallbackCannotBeNull": "ms-resource:loc.messages.CallbackCannotBeNull",
"CredentialsCannotBeNull": "ms-resource:loc.messages.CredentialsCannotBeNull",
"SubscriptionIdCannotBeNull": "ms-resource:loc.messages.SubscriptionIdCannotBeNull",
Expand All @@ -97,6 +96,9 @@
"GetSecretFailedBecauseOfInvalidCharacters": "ms-resource:loc.messages.GetSecretFailedBecauseOfInvalidCharacters",
"UploadingAttachment": "ms-resource:loc.messages.UploadingAttachment",
"CouldNotWriteToFile": "ms-resource:loc.messages.CouldNotWriteToFile",
"CouldNotMaskSecret": "ms-resource:loc.messages.CouldNotMaskSecret"
"CouldNotMaskSecret": "ms-resource:loc.messages.CouldNotMaskSecret",
"CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode",
"CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,8 @@
"loc.messages.CallbackCannotBeNull": "callback cannot be null.",
"loc.messages.UnableToCreateDatabaseException": "Unable to create database.",
"loc.messages.WindowMysqlClientMissingError": "Mysql Client is missing in window agent box. Please install it by running mysql client installer 'https://aka.ms/window-mysqlcli-installer' script file in your agent box.",
"loc.messages.LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'."
"loc.messages.LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'.",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
5 changes: 4 additions & 1 deletion Tasks/AzureMysqlDeployment/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@
"CallbackCannotBeNull": "callback cannot be null.",
"UnableToCreateDatabaseException": "Unable to create database.",
"WindowMysqlClientMissingError": "Mysql Client is missing in window agent box. Please install it by running mysql client installer 'https://aka.ms/window-mysqlcli-installer' script file in your agent box.",
"LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'."
"LinuxMysqlClientMissingError": "Mysql Client is missing in linux agent box. Please install it by running 'apt-get install mysql-client'.",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
}
5 changes: 4 additions & 1 deletion Tasks/AzureMysqlDeployment/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@
"CallbackCannotBeNull": "ms-resource:loc.messages.CallbackCannotBeNull",
"UnableToCreateDatabaseException": "ms-resource:loc.messages.UnableToCreateDatabaseException",
"WindowMysqlClientMissingError": "ms-resource:loc.messages.WindowMysqlClientMissingError",
"LinuxMysqlClientMissingError": "ms-resource:loc.messages.LinuxMysqlClientMissingError"
"LinuxMysqlClientMissingError": "ms-resource:loc.messages.LinuxMysqlClientMissingError",
"CouldNotFetchAccessTokenforAzureStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforAzureStatusCode",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode",
"CouldNotFetchAccessTokenforMSIStatusCode": "ms-resource:loc.messages.CouldNotFetchAccessTokenforMSIStatusCode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
"loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.",
"loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.",
"loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"loc.messages.LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'",
"loc.messages.NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.",
"loc.messages.NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.",
Expand Down Expand Up @@ -169,5 +168,8 @@
"loc.messages.UnableToFetchActiveDirectory": "Unable to fetch active directory resource id.",
"loc.messages.SpecifiedAzureRmEndpointIsInvalid": "Specified AzureRm endpoint url : '{0}' is invalid.",
"loc.messages.FailedToFetchAzureStackDependencyData": "Failed to fetch azure stack dependency data, error message : {0}",
"loc.messages.UnableToReadResponseBody": "Unable to read response body. Error: %s"
"loc.messages.UnableToReadResponseBody": "Unable to read response body. Error: %s",
"loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"loc.messages.CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
6 changes: 4 additions & 2 deletions Tasks/AzureResourceGroupDeployment/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@
"SecretCannotBeEmpty": "secret must be a non empty string.",
"armUrlCannotBeEmpty": "arm Url must be a non empty string.",
"authorityUrlCannotBeEmpty": "authority must be a non empty string.",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
"LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'",
"NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.",
"NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.",
Expand Down Expand Up @@ -420,6 +419,9 @@
"UnableToFetchActiveDirectory": "Unable to fetch active directory resource id.",
"SpecifiedAzureRmEndpointIsInvalid": "Specified AzureRm endpoint url : '{0}' is invalid.",
"FailedToFetchAzureStackDependencyData": "Failed to fetch azure stack dependency data, error message : {0}",
"UnableToReadResponseBody": "Unable to read response body. Error: %s"
"UnableToReadResponseBody": "Unable to read response body. Error: %s",
"CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for Azure. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIDueToMSINotConfiguredProperlyStatusCode": "Could not fetch access token for Managed Service Principal. Please configure Managed Service Identity (MSI) for virtual machine 'https://aka.ms/azure-msi-docs'. Status code: %s, status message: %s",
"CouldNotFetchAccessTokenforMSIStatusCode": "Could not fetch access token for Managed Service Principal. Status code: %s, status message: %s"
}
}
Loading

0 comments on commit c46a7f6

Please sign in to comment.