Skip to content

Commit c8e3242

Browse files
ronenqualironenquali
authored
Merge pull request #37 from QualiNext/15610_cli_errors
15610 cli errors
2 parents 9af16e1 + 7d028f0 commit c8e3242

3 files changed

Lines changed: 256 additions & 6 deletions

File tree

‎Quali.Torque.Cli/Api/TorqueApiClient.cs‎

Lines changed: 147 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5771,12 +5771,27 @@ public partial class OutputKind
57715771

57725772
}
57735773

5774-
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "13.18.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))")]
5774+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
57755775
public partial class BlueprintDetails
57765776
{
57775777
[Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
57785778
public string Name { get; set; }
57795779

5780+
[Newtonsoft.Json.JsonProperty("display_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5781+
public string Display_name { get; set; }
5782+
5783+
[Newtonsoft.Json.JsonProperty("repository_branch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5784+
public string Repository_branch { get; set; }
5785+
5786+
[Newtonsoft.Json.JsonProperty("commit", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5787+
public string Commit { get; set; }
5788+
5789+
[Newtonsoft.Json.JsonProperty("url", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5790+
public string Url { get; set; }
5791+
5792+
[Newtonsoft.Json.JsonProperty("repository_url", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5793+
public string Repository_url { get; set; }
5794+
57805795
[Newtonsoft.Json.JsonProperty("repository_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
57815796
public string Repository_name { get; set; }
57825797

@@ -5786,11 +5801,14 @@ public partial class BlueprintDetails
57865801
[Newtonsoft.Json.JsonProperty("description", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
57875802
public string Description { get; set; }
57885803

5804+
[Newtonsoft.Json.JsonProperty("instructions", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5805+
public BlueprintInstructions Instructions { get; set; }
5806+
57895807
[Newtonsoft.Json.JsonProperty("spec", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
57905808
public string Spec { get; set; }
57915809

57925810
[Newtonsoft.Json.JsonProperty("last_modified", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5793-
public System.DateTimeOffset Last_modified { get; set; }
5811+
public System.DateTime Last_modified { get; set; }
57945812

57955813
[Newtonsoft.Json.JsonProperty("modified_by", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
57965814
public string Modified_by { get; set; }
@@ -5801,6 +5819,21 @@ public partial class BlueprintDetails
58015819
[Newtonsoft.Json.JsonProperty("outputs", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
58025820
public System.Collections.Generic.ICollection<BlueprintOutputParameterResponse> Outputs { get; set; }
58035821

5822+
[Newtonsoft.Json.JsonProperty("icon", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5823+
public string Icon { get; set; }
5824+
5825+
[Newtonsoft.Json.JsonProperty("color", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5826+
public string Color { get; set; }
5827+
5828+
[Newtonsoft.Json.JsonProperty("favorite", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5829+
public bool Favorite { get; set; }
5830+
5831+
[Newtonsoft.Json.JsonProperty("custom_icon", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5832+
public BlueprintCustomIcon Custom_icon { get; set; }
5833+
5834+
[Newtonsoft.Json.JsonProperty("labels", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5835+
public System.Collections.Generic.ICollection<BlueprintLabel> Labels { get; set; }
5836+
58045837
[Newtonsoft.Json.JsonProperty("enabled", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
58055838
public bool Enabled { get; set; }
58065839

@@ -5810,6 +5843,39 @@ public partial class BlueprintDetails
58105843
[Newtonsoft.Json.JsonProperty("cost", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
58115844
public BlueprintCostResponse Cost { get; set; }
58125845

5846+
[Newtonsoft.Json.JsonProperty("num_of_active_environments", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5847+
public int Num_of_active_environments { get; set; }
5848+
5849+
}
5850+
5851+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
5852+
public partial class BlueprintInstructions
5853+
{
5854+
[Newtonsoft.Json.JsonProperty("text", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5855+
public string Text { get; set; }
5856+
5857+
[Newtonsoft.Json.JsonProperty("source", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5858+
public ElementSource Source { get; set; }
5859+
5860+
}
5861+
5862+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
5863+
public partial class ElementSource
5864+
{
5865+
[Newtonsoft.Json.JsonProperty("store", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5866+
public string Store { get; set; }
5867+
5868+
[Newtonsoft.Json.JsonProperty("path", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5869+
public string Path { get; set; }
5870+
5871+
[Newtonsoft.Json.JsonProperty("branch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5872+
public string Branch { get; set; }
5873+
5874+
[Newtonsoft.Json.JsonProperty("commit", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5875+
public string Commit { get; set; }
5876+
5877+
[Newtonsoft.Json.JsonProperty("tag", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
5878+
public string Tag { get; set; }
58135879
}
58145880

58155881
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "13.18.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))")]
@@ -6604,7 +6670,7 @@ public partial class BlueprintContentResponse
66046670
/// <summary>
66056671
/// Blueprint information
66066672
/// </summary>
6607-
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "13.18.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))")]
6673+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
66086674
public partial class BlueprintForGetAllBaseResponse : BaseResponse
66096675
{
66106676
/// <summary>
@@ -6619,12 +6685,42 @@ public partial class BlueprintForGetAllBaseResponse : BaseResponse
66196685
[Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
66206686
public string Name { get; set; }
66216687

6688+
/// <summary>
6689+
/// Blueprint name
6690+
/// </summary>
6691+
[Newtonsoft.Json.JsonProperty("display_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6692+
public string Display_name { get; set; }
6693+
66226694
/// <summary>
66236695
/// Blueprint's repository name
66246696
/// </summary>
66256697
[Newtonsoft.Json.JsonProperty("repository_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
66266698
public string Repository_name { get; set; }
66276699

6700+
/// <summary>
6701+
/// Blueprint's repository branch
6702+
/// </summary>
6703+
[Newtonsoft.Json.JsonProperty("repository_branch", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6704+
public string Repository_branch { get; set; }
6705+
6706+
/// <summary>
6707+
/// Blueprint's repository branch
6708+
/// </summary>
6709+
[Newtonsoft.Json.JsonProperty("commit", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6710+
public string Commit { get; set; }
6711+
6712+
/// <summary>
6713+
/// Blueprint's repository branch
6714+
/// </summary>
6715+
[Newtonsoft.Json.JsonProperty("last_synced", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6716+
public System.DateTime Last_synced { get; set; }
6717+
6718+
/// <summary>
6719+
/// Blueprint's repository url
6720+
/// </summary>
6721+
[Newtonsoft.Json.JsonProperty("repository_url", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6722+
public string Repository_url { get; set; }
6723+
66286724
/// <summary>
66296725
/// Is the blueprint editable
66306726
/// </summary>
@@ -6644,7 +6740,7 @@ public partial class BlueprintForGetAllBaseResponse : BaseResponse
66446740
public string Spec_version { get; set; }
66456741

66466742
/// <summary>
6647-
/// Blueprint repository URL
6743+
/// URL to blueprint yaml file in source repository
66486744
/// </summary>
66496745
[Newtonsoft.Json.JsonProperty("url", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
66506746
public string Url { get; set; }
@@ -6656,7 +6752,7 @@ public partial class BlueprintForGetAllBaseResponse : BaseResponse
66566752
/// Last modification date and time of the blueprint
66576753
/// </summary>
66586754
[Newtonsoft.Json.JsonProperty("last_modified", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6659-
public System.DateTimeOffset Last_modified { get; set; }
6755+
public System.DateTime Last_modified { get; set; }
66606756

66616757
/// <summary>
66626758
/// Name of the last user who modified the blueprint
@@ -6701,6 +6797,52 @@ public partial class BlueprintForGetAllBaseResponse : BaseResponse
67016797
[Newtonsoft.Json.JsonProperty("cost", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
67026798
public BlueprintCostResponse Cost { get; set; }
67036799

6800+
[Newtonsoft.Json.JsonProperty("icon", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6801+
public string Icon { get; set; }
6802+
6803+
[Newtonsoft.Json.JsonProperty("color", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6804+
public string Color { get; set; }
6805+
6806+
[Newtonsoft.Json.JsonProperty("favorite", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6807+
public bool Favorite { get; set; }
6808+
6809+
[Newtonsoft.Json.JsonProperty("custom_icon", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6810+
public BlueprintCustomIcon Custom_icon { get; set; }
6811+
6812+
[Newtonsoft.Json.JsonProperty("labels", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6813+
public System.Collections.Generic.ICollection<BlueprintLabel> Labels { get; set; }
6814+
6815+
[Newtonsoft.Json.JsonProperty("num_of_active_environments", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6816+
public int Num_of_active_environments { get; set; }
6817+
6818+
}
6819+
6820+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
6821+
public partial class BlueprintCustomIcon
6822+
{
6823+
[Newtonsoft.Json.JsonProperty("file_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6824+
public string File_name { get; set; }
6825+
6826+
[Newtonsoft.Json.JsonProperty("file_byte_size", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6827+
public long File_byte_size { get; set; }
6828+
6829+
[Newtonsoft.Json.JsonProperty("url", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6830+
public string Url { get; set; }
6831+
6832+
[Newtonsoft.Json.JsonProperty("key", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6833+
public string Key { get; set; }
6834+
6835+
}
6836+
6837+
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.0.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
6838+
public partial class BlueprintLabel
6839+
{
6840+
[Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6841+
public string Name { get; set; }
6842+
6843+
[Newtonsoft.Json.JsonProperty("color", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
6844+
public string Color { get; set; }
6845+
67046846
}
67056847

67066848
/// <summary>

‎Quali.Torque.Cli/Commands/TorqueBaseCommand.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,17 @@ public override async Task<int> ExecuteAsync(CommandContext context, T settings)
3333
catch (ApiException e)
3434
{
3535
ConsoleManager.WriteError("Error: unable to execute a command. Details:");
36-
ConsoleManager.WriteError($"Error message: {e.Message}");
36+
if(!e.Message.StartsWith("Operation failed")) // Generic error when our swagger metadata doesn't specify the problem.
37+
ConsoleManager.WriteError($"Error message: {e.Message}");
3738
ConsoleManager.WriteError($"Status code: {e.StatusCode}");
39+
40+
if (e is ApiException<ErrorResponse> apiError)
41+
{
42+
ConsoleManager.WriteError($"Result:");
43+
foreach (var resultError in apiError.Result.Errors)
44+
ConsoleManager.WriteError($" {resultError.Message}");
45+
}
46+
3847
ConsoleManager.WriteError($"Base Url: {Client.BaseUrl}");
3948
ConsoleManager.WriteError($"Space: {User.Space}");
4049

‎cli.nswag‎

Lines changed: 99 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)