Api implementation

DotNetNomads · Dec 21, 2019 · 70f94b7 · 70f94b7
1 parent d05edc5
commit 70f94b7
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 71 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+**/*/
+!PortainerClient/bin/Release/netcoreapp3.1/publish/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM mcr.microsoft.com/dotnet/core/runtime:2.2.5-bionic
+
+WORKDIR /app
+
+COPY Rustamov.PortainerClient/bin/Release/netcoreapp2.2/publish/ .
+
+RUN echo '#!/bin/bash\n  dotnet /app/Rustamov.PortainerClient.dll "$@"' > /usr/bin/portainerctl && \
+    chmod +x /usr/bin/portainerctl
diff --git a/PortainerClient/Api/Base/BaseApiHelpers.cs b/PortainerClient/Api/Base/BaseApiHelpers.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using RestSharp;
+
+namespace PortainerClient.Api
+{
+    public static class BaseApiHelpers
+    {
+        public static void AddParameters(this RestRequest request,
+            IEnumerable<(string paramName, object paramValue)> parameters)
+        {
+            foreach (var (paramName, paramValue) in parameters) request.AddParameter(paramName, paramValue);
+        }
+    }
+}
diff --git a/PortainerClient/Api/Base/BaseApiService.cs b/PortainerClient/Api/Base/BaseApiService.cs
@@ -1,4 +1,5 @@
 using System;
+using PortainerClient.Api.Model;
 using PortainerClient.Helpers;
 using RestSharp;
 using RestSharp.Authenticators;
@@ -22,14 +23,31 @@ private RestClient ResolveClient()
         protected T Get<T>(string resource, params (string paramName, object paramValue)[] parameters) where T : new()
         {
             var request = new RestRequest(resource, Method.GET);
-            foreach (var (paramName, paramValue) in parameters) request.AddParameter(paramName, paramValue);
+            request.AddParameters(parameters);
             var response = ResolveClient().Execute<T>(request);
-            if (!response.IsSuccessful)
+            if (response.IsSuccessful) return response.Data;
+            throw ParseError(resource, response.Content);
+        }
+
+        protected void Delete(string resource, params (string paramName, object paramValue)[] parameters)
+        {
+            var request = new RestRequest(resource, Method.DELETE);
+            request.AddParameters(parameters);
+            var response = ResolveClient().Execute(request);
+            if (response.IsSuccessful) return;
+            throw ParseError(resource, response.Content);
+        }
+
+        private static InvalidOperationException ParseError(string resource, string responseData)
+        {
+            ApiError errorInfo = null;
+            if (responseData != null)
             {
-                throw new InvalidOperationException($"Request {resource} error: {response.Content}");
+                errorInfo = SimpleJson.DeserializeObject<ApiError>(responseData);
             }
 
-            return response.Data;
+            return new InvalidOperationException(
+                $"Request {resource}: {(errorInfo != null ? $"{errorInfo.message}, details: {errorInfo.details}" : "no information")}");
         }
     }
-}
+}
diff --git a/PortainerClient/Api/Model/ApiError.cs b/PortainerClient/Api/Model/ApiError.cs
@@ -0,0 +1,8 @@
+namespace PortainerClient.Api.Model
+{
+    public class ApiError
+    {
+        public string message { get; set; }
+        public string details { get; set; }
+    }
+}
diff --git a/PortainerClient/Api/Model/StackFileInspect.cs b/PortainerClient/Api/Model/StackFileInspect.cs
@@ -0,0 +1,7 @@
+namespace PortainerClient.Api.Model
+{
+    public class StackFileInspect
+    {
+        public string StackFileContent { get; set; }
+    }
+}
diff --git a/PortainerClient/Api/StacksApi.cs b/PortainerClient/Api/StacksApi.cs
diff --git a/PortainerClient/Api/StacksApiService.cs b/PortainerClient/Api/StacksApiService.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.IO;
+using PortainerClient.Api;
+using PortainerClient.Api.Model;
+
+namespace PortainerClient.Command.Stack
+{
+    public class StacksApiService : BaseApiService
+    {
+        public IEnumerable<StackInfo> GetStacks() => Get<List<StackInfo>>("stacks");
+
+        public string GetStackFile(int stackId) => Get<StackFileInspect>($"stacks/{stackId}/file").StackFileContent;
+
+        public StackInfo GetStackInfo(in int stackId) => Get<StackInfo>($"stacks/{stackId}");
+
+        public void RemoveStack(int stackId) => Delete($"stacks/{stackId}");
+
+        public object DeployStack(in int endpointId, string name, string swarmID, string stackFilePath, string env)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/PortainerClient/Command/Stack/StackCmd.cs b/PortainerClient/Command/Stack/StackCmd.cs
@@ -5,18 +5,16 @@
 namespace PortainerClient.Command
 {
     [Command(Name = "stack", Description = "Docker Stack management commands")]
-    [Subcommand(
-        typeof(StackLsCmd)
-//        , 
-//        typeof(StackGetFileCmd),
+    [Subcommand(typeof(StackLsCmd),
+        typeof(StackGetFileCmd),
 //        typeof(StackDeployCmd),
 //        typeof(StackUpdateCmd),
-//        typeof(StackRmCmd),
-//        typeof(StackInspectCmd)
+        typeof(StackRmCmd),
+        typeof(StackInspectCmd)
     )]
     public class StackCmd : ICommand
     {
         public int OnExecute(CommandLineApplication app, IConsole console) =>
             CmdHelpers.SpecifyCommandResult(app, console);
     }
-}
+}
diff --git a/PortainerClient/Command/Stack/StackDeployCmd.cs b/PortainerClient/Command/Stack/StackDeployCmd.cs
@@ -1,15 +1,14 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
-using IO.Swagger.Api;
 using McMaster.Extensions.CommandLineUtils;
-using Newtonsoft.Json;
 using PortainerClient.Helpers;
+using RestSharp;
 
 namespace PortainerClient.Command.Stack
 {
     [Command("deploy", "Deploy new Swarm stack from file")]
-    public class StackDeployCmd : BaseApiCommand<StacksApi>
+    public class StackDeployCmd : BaseApiCommand<StacksApiService>
     {
         [Option("--file", "Docker Swarm stack definition file path", CommandOptionType.SingleValue, ShortName = "f")]
         [Required]
@@ -42,15 +41,14 @@ public override void Do(CommandLineApplication app, IConsole console)
             }
 
             var stackEnvs = CmdHelpers.ParseEnvs(Envs);
-
-            var fileStream = File.OpenRead(FilePath);
             // 1 - swarm stack
             console.WriteLine("Sending deploy request to Portainer...");
-            var result = ApiClient.StackCreate(type: 1, method: "file", endpointId: EndpointId, body: null,
+            var result = ApiClient.DeployStack(endpointId: EndpointId,
                 name: StackName,
-                endpointID: EndpointId.ToString(), swarmID: SwarmId, file: fileStream,
-                env: JsonConvert.SerializeObject(stackEnvs));
+                swarmID: SwarmId,
+                stackFilePath: FilePath,
+                env: SimpleJson.SerializeObject(stackEnvs));
             console.WriteLine("Stack deployed.");
         }
     }
-}
+}
diff --git a/PortainerClient/Command/Stack/StackGetFileCmd.cs b/PortainerClient/Command/Stack/StackGetFileCmd.cs
@@ -1,22 +1,19 @@
-using System;
 using System.ComponentModel.DataAnnotations;
-using IO.Swagger.Api;
 using McMaster.Extensions.CommandLineUtils;
-using PortainerClient.Helpers;
 
 namespace PortainerClient.Command.Stack
 {
     [Command(Name = "getfile", Description = "Get compose file of stack")]
-    public class StackGetFileCmd : BaseApiCommand<StacksApi>
+    public class StackGetFileCmd : BaseApiCommand<StacksApiService>
     {
         [Argument(0, "stackId", "Stack instance identifier")]
         [Required]
         public int StackId { get; set; }
 
         public override void Do(CommandLineApplication app, IConsole console)
         {
-            var data = ApiClient.StackFileInspect(StackId);
-            console.Write(data.StackFileContent);
+            var data = ApiClient.GetStackFile(StackId);
+            console.Write(data);
         }
     }
-}
+}
diff --git a/PortainerClient/Command/Stack/StackInspectCmd.cs b/PortainerClient/Command/Stack/StackInspectCmd.cs
@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
-using IO.Swagger.Api;
 using McMaster.Extensions.CommandLineUtils;
 using YamlDotNet.Serialization;
 
 namespace PortainerClient.Command.Stack
 {
     [Command("inspect", Description = "Show information about stack")]
-    public class StackInspectCmd : BaseApiCommand<StacksApi>
+    public class StackInspectCmd : BaseApiCommand<StacksApiService>
     {
         [Argument(0, "stackId", "Stack identifier")]
         [Required]
         public int StackId { get; set; }
 
         public override void Do(CommandLineApplication app, IConsole console)
         {
-            var stackInfo = ApiClient.StackInspect(StackId);
+            var stackInfo = ApiClient.GetStackInfo(StackId);
             console.WriteLine(new Serializer().Serialize(stackInfo));
         }
     }
-}
+}
diff --git a/PortainerClient/Command/Stack/StackRmCmd.cs b/PortainerClient/Command/Stack/StackRmCmd.cs
@@ -1,11 +1,10 @@
 using System.ComponentModel.DataAnnotations;
-using IO.Swagger.Api;
 using McMaster.Extensions.CommandLineUtils;
 
 namespace PortainerClient.Command.Stack
 {
     [Command("rm", Description = "Remove stack from portainer and Docker Swarm")]
-    public class StackRmCmd : BaseApiCommand<StacksApi>
+    public class StackRmCmd : BaseApiCommand<StacksApiService>
     {
         [Argument(0, "stackId", "Stack identifier")]
         [Required]
@@ -21,8 +20,8 @@ public override void Do(CommandLineApplication app, IConsole console)
             }
 
             console.Write("Sending remove request to Portainer...");
-            ApiClient.StackDelete(StackId, null, null);
+            ApiClient.RemoveStack(StackId);
             console.WriteLine("Removed!");
         }
     }
-}
+}
diff --git a/PortainerClient/Helpers/CmdHelpers.cs b/PortainerClient/Helpers/CmdHelpers.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using McMaster.Extensions.CommandLineUtils;
+using PortainerClient.Api.Model;
 
 namespace PortainerClient.Helpers
 {
@@ -20,24 +21,22 @@ public static int WriteError(this IConsole console, Exception exception)
             return 1;
         }
 
-//        public static List<StackEnv> ParseEnvs(string[] envs)
-//        {
-//            var stackEnvs = new List<StackEnv>();
-//            if (envs != null)
-//            {
-//                foreach (var env in envs)
-//                {
-//                    if (!env.Contains("="))
-//                    {
-//                        throw new Exception($"Incorrect env var format: {env}");
-//                    }
-//
-//                    var splited = env.Split("=", 2);
-//                    stackEnvs.Add(new StackEnv {Name = splited[0], Value = splited[1]});
-//                }
-//            }
-//
-//            return stackEnvs;
-//        }
+        public static List<StackEnv> ParseEnvs(string[] envs)
+        {
+            var stackEnvs = new List<StackEnv>();
+            if (envs == null) return stackEnvs;
+            foreach (var env in envs)
+            {
+                if (!env.Contains("="))
+                {
+                    throw new Exception($"Incorrect env var format: {env}");
+                }
+
+                var splited = env.Split("=", 2);
+                stackEnvs.Add(new StackEnv {Name = splited[0], Value = splited[1]});
+            }
+
+            return stackEnvs;
+        }
     }
-}
+}
diff --git a/PortainerClient/PortainerClient.csproj b/PortainerClient/PortainerClient.csproj
@@ -13,10 +13,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Remove="Command\Stack\StackDeployCmd.cs" />
-      <Compile Remove="Command\Stack\StackGetFileCmd.cs" />
-      <Compile Remove="Command\Stack\StackInspectCmd.cs" />
-      <Compile Remove="Command\Stack\StackRmCmd.cs" />
       <Compile Remove="Command\Stack\StackUpdateCmd.cs" />
     </ItemGroup>