diff --git a/clio/Command/InstallerCommand.cs b/clio/Command/InstallerCommand.cs index 199257ea..734b0d81 100644 --- a/clio/Command/InstallerCommand.cs +++ b/clio/Command/InstallerCommand.cs @@ -18,7 +18,7 @@ namespace Clio.Command; -[Verb("deploy-creatio", HelpText = "Deploy Creatio from zip file")] +[Verb("deploy-creatio", Aliases = new string[]{""}, HelpText = "Deploy Creatio from zip file")] public class PfInstallerOptions : EnvironmentNameOptions { diff --git a/clio/Command/ShowAppListCommand.cs b/clio/Command/ShowAppListCommand.cs index 4338e995..eeb43672 100644 --- a/clio/Command/ShowAppListCommand.cs +++ b/clio/Command/ShowAppListCommand.cs @@ -4,7 +4,7 @@ namespace Clio.Command { - [Verb("show-web-app-list", Aliases = new string[] { "show-web-app", "envs"}, HelpText = "Show the list of web applications and their settings")] + [Verb("show-web-app-list", Aliases = new string[] { "envs" ,"show-web-app" }, HelpText = "Show the list of web applications and their settings")] public class AppListOptions { [Value(0, MetaName = "App name", Required = false, HelpText = "Name of application")] diff --git a/clio/Package/ApplicationPackageListProvider.cs b/clio/Package/ApplicationPackageListProvider.cs index e3713e76..2dd6d602 100644 --- a/clio/Package/ApplicationPackageListProvider.cs +++ b/clio/Package/ApplicationPackageListProvider.cs @@ -58,10 +58,15 @@ private PackageInfo CreatePackageInfo(Dictionary package) { public IEnumerable GetPackages(string scriptData) { - string responseFormServer = _applicationClient.ExecutePostRequest(PackagesListServiceUrl, scriptData); - var json = _jsonConverter.CorrectJson(responseFormServer); - var packages = _jsonConverter.DeserializeObject>>(json); - return packages.Select(CreatePackageInfo); + try { + string responseFormServer = _applicationClient.ExecutePostRequest(PackagesListServiceUrl, scriptData); + var json = _jsonConverter.CorrectJson(responseFormServer); + var packages = _jsonConverter.DeserializeObject>>(json); + return packages.Select(CreatePackageInfo); + + } catch (Exception e) { + return Array.Empty(); + } } #endregion diff --git a/clio/Workspace/ApplicationDownloader.cs b/clio/Workspace/ApplicationDownloader.cs index d2cdd05f..6331d532 100644 --- a/clio/Workspace/ApplicationDownloader.cs +++ b/clio/Workspace/ApplicationDownloader.cs @@ -151,26 +151,31 @@ private void CreateMarkerPackagesFolder() => public void Download(IEnumerable packagesNames = null) { packagesNames ??= Enumerable.Empty(); - IEnumerable enumerablePackagesNames = packagesNames as string[] ?? packagesNames.ToArray(); - IEnumerable autogeneratedPackagesDownloadInfos = - GetAutogeneratedPackagesDownloadInfos(enumerablePackagesNames); - IEnumerable allDownloadInfos = DownloadInfos.Union(autogeneratedPackagesDownloadInfos); - _downloader.Download(allDownloadInfos); - - - const string minClioGateVersion = "2.0.0.29"; - if(_clioGateway.IsCompatibleWith(minClioGateVersion)) { - IEnumerable files = GetDownloadInfoFromCsProj(enumerablePackagesNames) ; - IEnumerable downloadInfos = files as DownloadInfo[] ?? files.ToArray(); - if(downloadInfos.Any()) { - _downloader.DownloadPackageDll(downloadInfos); + const string minClioGateVersionForDownload = "2.0.0.0"; + if(_clioGateway.IsCompatibleWith(minClioGateVersionForDownload)) { + IEnumerable enumerablePackagesNames = packagesNames as string[] ?? packagesNames.ToArray(); + IEnumerable autogeneratedPackagesDownloadInfos = + GetAutogeneratedPackagesDownloadInfos(enumerablePackagesNames); + IEnumerable allDownloadInfos = DownloadInfos.Union(autogeneratedPackagesDownloadInfos); + _downloader.Download(allDownloadInfos); + + const string minClioGateVersion = "2.0.0.29"; + if(_clioGateway.IsCompatibleWith(minClioGateVersion)) { + IEnumerable files = GetDownloadInfoFromCsProj(enumerablePackagesNames) ; + IEnumerable downloadInfos = files as DownloadInfo[] ?? files.ToArray(); + if(downloadInfos.Any()) { + _downloader.DownloadPackageDll(downloadInfos); + } + }else { + _logger.WriteWarning($"Downloading of referenced package dlls requires cliogate version {minClioGateVersion} or higher."); } - }else { - _logger.WriteWarning($"Downloading of referenced package dlls requires cliogate version {minClioGateVersion} or higher."); + + CreateMarkerPackagesFolder(); + DeleteSourceSchemasFromAutogenerated(enumerablePackagesNames); + } + else { + _logger.WriteWarning($"Downloading of cor libraries requires cliogate version {minClioGateVersionForDownload} or higher."); } - - CreateMarkerPackagesFolder(); - DeleteSourceSchemasFromAutogenerated(enumerablePackagesNames); } public IEnumerable GetDownloadInfoFromCsProj(IEnumerable packagesNames){ diff --git a/clio/clio.csproj b/clio/clio.csproj index aac4caf3..7e0806ea 100644 --- a/clio/clio.csproj +++ b/clio/clio.csproj @@ -991,9 +991,20 @@ - + + + + + + + + + + + + - + diff --git a/http_requests/CreatioApiGateway.http b/http_requests/CreatioApiGateway.http new file mode 100644 index 00000000..723b3e71 --- /dev/null +++ b/http_requests/CreatioApiGateway.http @@ -0,0 +1,10 @@ +### Protected Access +< set-request-base_url.js + +POST {{base_url}}/0/rest/CreatioApiGateway/GetPackages HTTP/2 +Content-Type: application/json +BPMCSRF: {{BPMCSRF}} + +{ + +} \ No newline at end of file diff --git a/http_requests/http-client.env.json b/http_requests/http-client.env.json index 1ebc6dcc..ddfc4657 100644 --- a/http_requests/http-client.env.json +++ b/http_requests/http-client.env.json @@ -4,5 +4,11 @@ "UserName": "Supervisor", "UserPassword": "Supervisor", "isNetCore": false + }, + "d_472": { + "base_url": "http://kkrylovn.tscrm.com:40030", + "UserName": "Supervisor", + "UserPassword": "Supervisor", + "isNetCore": false } } \ No newline at end of file