From d80e4351a1839a5a21c8c3d94ba1d7db0874f660 Mon Sep 17 00:00:00 2001 From: Alexander Morogov Date: Thu, 24 Aug 2023 12:17:28 +0200 Subject: [PATCH 1/2] VCI-151: Update docs; fix default saas portal url --- CHANGELOG.md | 23 +++++++++++++++++++++ docs/CLI-tools/package-management.md | 4 ++++ src/VirtoCommerce.Build/Cloud/Build.SaaS.cs | 4 ++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd36769..7e9dc1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.16.0] - 2023-08-24 +### Added +- Organization parameter for SetEnvParameter target +### Fixed +- Ignoring of PackageManifestPath +- Trigger of Rollback target +- Directory names for modules downloaded from Azure blobs +- failure of backup target when directory is empty + +## [3.15.0] - 2023-08-08 +### Added +- Support of bundles in the Update target +- Log message for modules from github private repos +### Fixed +- Ignoring of failures in modules installation +- Failure if modules directory doesn't exists for AzureBlob source +### Changed +- Update targe updates to the latest stable bundle by default + +## [3.14.0] - 2023-04-17 +### Changed +- Updated dependecies + ## [3.13.0] - 2023-04-03 ### Added - PlatformAssetUrl to the package manifest diff --git a/docs/CLI-tools/package-management.md b/docs/CLI-tools/package-management.md index b8ce819..acc1211 100644 --- a/docs/CLI-tools/package-management.md +++ b/docs/CLI-tools/package-management.md @@ -145,6 +145,8 @@ vc-build install -stable -bundlesUrl https://somedomain.com/bundles.json # will ```console vc-build update (with no args) +vc-build update -edge +vc-build update -v 5 vc-build update -platform -version vc-build update -module -version ``` @@ -153,6 +155,8 @@ If `` is not specified, the component will be updated to the latest ver If no args are specified, the platform and all modules in the specified location will be updated. This command also updates the installed dependency versions in the `vc-package.json` file. +Since the version 3.15.0 this target updates to stable bundles by default. If you want to update to the latest available versions you can add -Edge parameter. +You can specify the bundle to update your environment to specific versions using -v parameter. ### Examples: ```console diff --git a/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs b/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs index 1a56255..228482e 100644 --- a/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs +++ b/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs @@ -49,7 +49,7 @@ internal partial class Build [Parameter("Number of attempts before fail")] public int AttemptsNumber { get; set; } = 100; - [Parameter("SaaS Portal")] public string CloudUrl { get; set; } = "https://cloud.govirto.com"; + [Parameter("SaaS Portal")] public string CloudUrl { get; set; } = "https://portal.virtocommerce.cloud"; [Parameter("SaaS Token")] public string CloudToken { get; set; } [Parameter("App Project Name")] public string AppProject { get; set; } [Parameter("Cloud Environment Name")] public string EnvironmentName { get; set; } @@ -128,7 +128,7 @@ internal partial class Build { var cloudClient = new VirtoCloudClient(CloudUrl, CloudToken); var env = await cloudClient.GetEnvironment(EnvironmentName, SaaSOrganizationName); - + var envHelmParameters = env.Helm.Parameters; foreach (var parameter in HelmParameters) { From 7419d473ead89097beda4b33cabab2d645d1b4b2 Mon Sep 17 00:00:00 2001 From: Alexander Morogov Date: Tue, 26 Dec 2023 12:40:28 +0100 Subject: [PATCH 2/2] VCI-769: Add a check if modules url does not contain the right version --- .../PlatformTools/Build.PackageManager.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs b/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs index a02c8db..52078b4 100644 --- a/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs +++ b/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs @@ -414,6 +414,11 @@ private static bool IsPlatformInstallationNeeded(string version) private static ManifestModuleInfo LoadModuleInfo(ModuleItem module, ManifestModuleInfo externalModule) { + if (!externalModule.Ref.Contains(externalModule.Version.ToString())) + { + Log.Error("Error in file modules_v3.json for module {0}: Version {1} not found in Reference {2}", externalModule.Id, externalModule.Version.ToString(), externalModule.Ref); + } + var currentModule = new ModuleManifest { Id = module.Id,