release 0.0.7-beta source code for net

g42cloud-sdk · Jun 16, 2023 · f9e2a63 · f9e2a63
1 parent d32e11b
commit f9e2a63
Show file tree

Hide file tree

Showing 54 changed files with 1,829 additions and 266 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,73 @@
+# 0.0.7-beta 2023-06-16
+
+### G42Cloud SDK CCE
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - **ShowNode**
+    - changes of response param
+      - `+ status.lastProbeTime`
+  - **UpdateNode**
+    - changes of response param
+      - `+ status.lastProbeTime`
+  - **DeleteNode**
+    - changes of response param
+      - `+ status.lastProbeTime`
+  - **CreateNode**
+    - changes of response param
+      - `+ status.lastProbeTime`
+  - **ListNodes**
+    - changes of response param
+      - `+ items.status.lastProbeTime`
+
+### G42Cloud SDK ECS
+
+- _Features_
+  - None
+- _Bug Fix_
+  - None
+- _Change_
+  - **CreateServers**
+    - changes of request param
+      - `+ server.data_volumes.delete_on_termination`
+  - **CreatePostPaidServers**
+    - changes of request param
+      - `+ server.data_volumes.delete_on_termination`
+
+### G42Cloud SDK SMN
+
+- _Features_
+  - Support the following interfaces：
+    - `UpdateSubscription`
+    - `ListLogtank`
+    - `CreateLogtank`
+    - `UpdateLogtank`
+    - `DeleteLogtank`
+- _Bug Fix_
+  - None
+- _Change_
+  - **ListTopicDetails**
+    - changes of response param
+      - `+ topic_id`
+  - **ListTopics**
+    - changes of request param
+      - `+ topic_id`
+    - changes of response param
+      - `+ topics.topic_id`
+  - **ListTopicAttributes**
+    - changes of response param
+      - `+ attributes.access_policy`
+      - `+ attributes.introduction`
+      - `- attributes.Version`
+      - `- attributes.Id`
+      - `- attributes.Statement`
+  - **AddSubscription**
+    - changes of request param
+      - `+ extension`
+
 # 0.0.6-beta 2023-05-12
 
 ### G42Cloud SDK CBR

diff --git a/Core/Http/HttpConfig.cs b/Core/Http/HttpConfig.cs
@@ -25,9 +25,15 @@ public class HttpConfig
     {
         public int? Timeout = 120;
 
-        public bool IgnoreSslVerification = false;
+        public bool IgnoreSslVerification;
 
-        public bool IgnoreBodyForGetRequest = false;
+        public bool IgnoreBodyForGetRequest;
+
+        /// <summary>
+        /// Experimental configuration, the default value is false.
+        /// Automatic redirection is allowed when turns on, which may cause some request exceptions.
+        /// </summary>
+        public bool AllowRedirects;
 
         public string ProxyUsername { get; set; }
 
@@ -62,6 +68,16 @@ public HttpConfig WithIgnoreBodyForGetRequest(bool ignore)
             return this;
         }
 
+        /// <summary>
+        /// Experimental configuration, the default value is false.
+        /// Automatic redirection is allowed when turns on, which may cause some request exceptions.
+        /// </summary>
+        public HttpConfig WithAllowRedirects(bool allowRedirects)
+        {
+            this.AllowRedirects = allowRedirects;
+            return this;
+        }
+
         public HttpConfig WithIgnoreProxyUsername(string username)
         {
             this.ProxyUsername = username;
@@ -92,4 +108,4 @@ public HttpConfig WithProxyPort(int port)
             return this;
         }
     }
-}
+}
diff --git a/Core/Http/SdkHttpClient.cs b/Core/Http/SdkHttpClient.cs
@@ -29,7 +29,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Polly;
 
 namespace G42Cloud.SDK.Core
 {

diff --git a/Core/Http/SdkHttpMessageHandler.cs b/Core/Http/SdkHttpMessageHandler.cs
@@ -40,6 +40,7 @@ public DelegatingHandler GetHandler()
         {
             var handler = new HttpClientHandler
             {
+                AllowAutoRedirect = _httpConfig.AllowRedirects,
                 ClientCertificateOptions = ClientCertificateOption.Manual,
                 ServerCertificateCustomValidationCallback =
                     (httpRequestMessage, cert, cetChain, policyErrors) =>

diff --git a/Core/Utils/HttpUtils.cs b/Core/Utils/HttpUtils.cs
@@ -31,14 +31,30 @@ namespace G42Cloud.SDK.Core
 {
     public static class HttpUtils
     {
+
+        private static readonly List<string> HttpContentHeadersList = new List<string>
+        {
+            "Allow",
+            "Content-Disposition",
+            "Content-Encoding",
+            "Content-Language",
+            "Content-Location",
+            "Content-MD5",
+            "Content-Range",
+            "Content-Type",
+            "Content-Length",
+            "Expires",
+            "Last-Modified"
+        };
+
         public static string AddUrlPath(string path, Dictionary<string, string> pathParams)
         {
             return pathParams.Aggregate(path,
                 (current, keyValuePair) => current.Replace("{" + keyValuePair.Key + "}",
                     keyValuePair.Value));
         }
 
-        private static string GetQueryParameters(Object obj)
+        private static string GetQueryParameters(object obj)
         {
             var sb = new StringBuilder();
             var t = obj.GetType();
@@ -270,13 +286,18 @@ private static string GetRequestBody(object obj, string contentType)
             {
                 foreach (var elem in sdkPropertyList)
                 {
+                    if (elem is string eleString)
+                    {
+                        return eleString;
+                    }
+
                     return contentType == "application/xml" ? XmlUtils.Serialize(elem) : JsonUtils.Serialize(elem);
                 }
             }
 
             return "";
         }
-        
+
         private static Dictionary<string, object> GetFormData(object obj)
         {
             var t = obj.GetType();
@@ -328,14 +349,14 @@ private static Dictionary<string, object> GetFormData(object obj)
             }
 
             return null;
-        } 
+        }
 
         public static SdkRequest InitSdkRequest(string path, object data = null)
         {
             return InitSdkRequest(path, null, data);
         }
 
-        public static SdkRequest InitSdkRequest(string path, String contentType, object data = null)
+        public static SdkRequest InitSdkRequest(string path, string contentType, object data = null)
         {
             if (path != null && string.IsNullOrEmpty(path))
             {
@@ -352,7 +373,7 @@ public static SdkRequest InitSdkRequest(string path, String contentType, object
             }
 
             var cname = GetCname(data);
-            if (!String.IsNullOrEmpty(cname))
+            if (!string.IsNullOrEmpty(cname))
             {
                 request.Cname = cname;
             }
@@ -385,7 +406,7 @@ public static SdkRequest InitSdkRequest(string path, String contentType, object
                     request.Body = bodyData;
                 }
             }
-            
+
             if (!string.IsNullOrEmpty(contentType))
             {
                 request.ContentType = contentType;
@@ -405,7 +426,7 @@ public static T DeSerializeStream<T>(HttpResponseMessage message)
             var t = Activator.CreateInstance<T>();
             t.GetType().GetProperty("HttpStatusCode")?.SetValue(t, (int)message.StatusCode, null);
             t.GetType().GetProperty("HttpHeaders")?.SetValue(t, message.Headers.ToString(), null);
-            BindingFlags flag = BindingFlags.Public | BindingFlags.Instance;
+            var flag = BindingFlags.Public | BindingFlags.Instance;
             t.GetType().GetMethod("SetStream")
                 ?.Invoke(t, flag, Type.DefaultBinder,
                     new object[]
@@ -422,21 +443,6 @@ public static void SetAdditionalAttrs<T>(HttpResponseMessage message, T obj, str
             obj.GetType().GetProperty("HttpBody")?.SetValue(obj, body, null);
         }
 
-        private static readonly List<string> HttpContentHeadersList = new List<string>
-        {
-            "Allow",
-            "Content-Disposition",
-            "Content-Encoding",
-            "Content-Language",
-            "Content-Location",
-            "Content-MD5",
-            "Content-Range",
-            "Content-Type",
-            "Content-Length",
-            "Expires",
-            "Last-Modified"
-        };
-
         public static void SetResponseHeaders<T>(HttpResponseMessage message, T obj)
         {
             const BindingFlags instanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;

diff --git a/Core/Utils/JsonUtils.cs b/Core/Utils/JsonUtils.cs
@@ -87,7 +87,7 @@ public static List<T> DeSerializeList<T>(HttpResponseMessage message)
         public static Dictionary<TK, TV> DeSerializeMap<TK, TV>(HttpResponseMessage message)
         {
             var body = Encoding.UTF8.GetString(message.Content.ReadAsByteArrayAsync().Result);
-            return JArray.Parse(body).ToObject<Dictionary<TK, TV>>(JsonSerializer.CreateDefault(GetJsonSettings()));
+            return JObject.Parse(body).ToObject<Dictionary<TK, TV>>(JsonSerializer.CreateDefault(GetJsonSettings()));
         }
 
         public static string Serialize(object item)

diff --git a/Core/obj/Core.csproj.nuget.cache b/Core/obj/Core.csproj.nuget.cache
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "/uxPzudilK7z2cmcr8LmLAMNuQ3d4mkPcnRYFwycy3PGe6bg0rL/aXKhMoaCKTAGOwJqw+661uZhyMwQHaDr9w==",
+  "dgSpecHash": "S5xIaIcGMIsBBCvQrx7vip2flFB4b0F9mOEKJ2ghOj/Uyi8yJyb0CBjWxVH/oIOL7gvCo7AP+srJgUB1oMr2lg==",
   "success": true
 }
diff --git a/Core/obj/Core.csproj.nuget.dgspec.json b/Core/obj/Core.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj": {}
+    "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj": {}
   },
   "projects": {
-    "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj": {
+    "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj",
+        "projectUniqueName": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj",
         "projectName": "G42Cloud.SDK.Core",
-        "projectPath": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj",
+        "projectPath": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj",
         "packagesPath": "/root/.nuget/packages/",
-        "outputPath": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/obj/",
+        "outputPath": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/obj/",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
           "/usr/dotnet2/sdk/NuGetFallbackFolder"
@@ -23,7 +23,7 @@
           "netstandard2.0"
         ],
         "sources": {
-          "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/package": {}
+          "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/package": {}
         },
         "frameworks": {
           "netstandard2.0": {

diff --git a/Core/obj/Core.csproj.nuget.g.props b/Core/obj/Core.csproj.nuget.g.props
@@ -3,7 +3,7 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/obj/project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/;/usr/dotnet2/sdk/NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>

diff --git a/Core/obj/project.assets.json b/Core/obj/project.assets.json
@@ -1051,11 +1051,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj",
+      "projectUniqueName": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj",
       "projectName": "G42Cloud.SDK.Core",
-      "projectPath": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/Core.csproj",
+      "projectPath": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/Core.csproj",
       "packagesPath": "/root/.nuget/packages/",
-      "outputPath": "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/Core/obj/",
+      "outputPath": "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/Core/obj/",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
         "/usr/dotnet2/sdk/NuGetFallbackFolder"
@@ -1067,7 +1067,7 @@
         "netstandard2.0"
       ],
       "sources": {
-        "/data/fuxi_ci_workspace/645dd8e482590b0998f24562/package": {}
+        "/data/fuxi_ci_workspace/648bc163b7c5fa32ae3a3eb8/package": {}
       },
       "frameworks": {
         "netstandard2.0": {