Merge branch 'feature/5.x-watcher-apis' into 5.x

Author: russcam

src/CodeGeneration/ApiGenerator/ApiGenerator.cs

@@ -82,9 +82,9 @@ private static KeyValuePair<string, ApiEndpoint> CreateApiEndpoint(string jsonFi
 			return endpoint;
 		}
 
-		private static string CreateMethodName(string apiEnpointKey)
+		private static string CreateMethodName(string apiEndpointKey)
 		{
-			return PascalCase(apiEnpointKey);
+			return PascalCase(apiEndpointKey);
 		}
 
 		private static void GenerateClientInterface(RestApiSpec model)

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

@@ -77,6 +77,7 @@
     <Compile Include="Overrides\Descriptors\SearchDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ReindexOnServerDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\UpdateDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\WatcherStatsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Global\GlobalQueryParameters.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs

@@ -19,7 +19,7 @@ public IEnumerable<string> MethodArguments
 			get
 			{
 				var methodArgs = CsharpMethod.Parts
-					.Select(p => p.Name != "body" ? "p.RouteValues." + p.Name.ToPascalCase() : "body")
+					.Select(p => p.Name != "body" ? "p.RouteValues." + p.Name.ToPascalCase() + (p.Type == "enum" ? ".Value" : "") : "body")
 					.Concat(new[] {"u => p.RequestParameters"});
 				return methodArgs;
 			}
@@ -44,6 +44,8 @@ public string IfCheck
 
 	public class ApiEndpoint
 	{
+		private List<CsharpMethod> _csharpMethods;
+
 		public string CsharpMethodName { get; set; }
 		public string Documentation { get; set; }
 		public IEnumerable<string> Methods { get; set; }
@@ -100,9 +102,20 @@ public IEnumerable<CsharpMethod> CsharpMethods
 		{
 			get
 			{
-				foreach (var method in this.Methods)
+				if (_csharpMethods != null)
 				{
+					foreach (var csharpMethod in _csharpMethods)
+						yield return csharpMethod;
+					yield break;
+				}
 
+				// enumerate once and cache
+				_csharpMethods = new List<CsharpMethod>();
+
+				this.PatchEndpoint();
+
+				foreach (var method in this.Methods)
+				{
 					var methodName = this.CsharpMethodName + this.OptionallyAppendHttpMethod(this.Methods, method);
 					//the distinctby here catches aliases routes i.e
 					//  /_cluster/nodes/{node_id}/hotthreads vs  /_cluster/nodes/{node_id}/hot_threads
@@ -117,25 +130,8 @@ public IEnumerable<CsharpMethod> CsharpMethods
 								return p.Value;
 							})
 							.ToList();
-						var args = parts.Select(p =>
-						{
-							switch (p.Type)
-							{
-								case "int":
-								case "string":
-									return p.Type + " " + p.Name;
-								case "list":
-									return "string " + p.Name;
-								case "enum":
-									return this.PascalCase(p.Name) + p.Name;
-								case "number":
-									return "string " + p.Name;
-								default:
-									return p.Type + " " + p.Name;
-									//return "string " + p.Name;
 
-							}
-						});
+						var args = parts.Select(p => p.Argument);
 
 						//.NET does not allow get requests to have a body payload.
 						if (method != "GET" && this.Body != null)
@@ -184,6 +180,7 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							"Func<"+apiMethod.QueryStringParamName+", " + apiMethod.QueryStringParamName + "> requestParameters = null"
 						}).ToList();
 						apiMethod.Arguments = string.Join(", ", args);
+						_csharpMethods.Add(apiMethod);
 						yield return apiMethod;
 
 						args = args.Concat(new[]
@@ -208,6 +205,7 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							Url = this.Url
 						};
 						PatchMethod(apiMethod);
+						_csharpMethods.Add(apiMethod);
 						yield return apiMethod;
 
 						//No need for deserialization state when returning dynamicdictionary
@@ -241,7 +239,9 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							Url = this.Url
 						};
 						PatchMethod(apiMethod);
+						_csharpMethods.Add(apiMethod);
 						yield return apiMethod;
+
 						args = args.Concat(new[]
 						{
 							"CancellationToken cancellationToken = default(CancellationToken)"
@@ -265,12 +265,38 @@ public IEnumerable<CsharpMethod> CsharpMethods
 							Url = this.Url
 						};
 						PatchMethod(apiMethod);
+						_csharpMethods.Add(apiMethod);
 						yield return apiMethod;
 					}
 				}
 			}
 		}
 
+		private void PatchEndpoint()
+		{
+			//rename the {metric} route param to something more specific on XpackWatcherStats
+			// TODO: find a better place to do this
+			if (this.CsharpMethodName == "XpackWatcherStats")
+			{
+				var metric = this.Url.Parts.First(p => p.Key == "metric");
+
+				var apiUrlPart = metric.Value;
+				apiUrlPart.Name = "watcher_stats_metric";
+
+				if (this.Url.Parts.Remove("metric"))
+				{
+					this.Url.Parts.Add("watcher_stats_metric", apiUrlPart);
+				}
+
+				this.Url.Path = RenameMetricUrlPathParam(this.Url.Path);
+				this.Url.Paths = this.Url.Paths.Select(RenameMetricUrlPathParam);
+			}
+		}
+
+		private static string RenameMetricUrlPathParam(string path)
+		{
+			return path.Replace("{metric}", "{watcher_stats_metric}");
+		}
 
 		//Patches a method name for the exceptions (IndicesStats needs better unique names for all the url endpoints)
 		//or to get rid of double verbs in an method name i,e ClusterGetSettingsGet > ClusterGetSettings
@@ -318,7 +344,7 @@ public static void PatchMethod(CsharpMethod method)
 			try
 			{
 				IEnumerable<string> skipList = new List<string>();
-				IDictionary<string, string> renameList = new Dictionary<string, string>();
+				IDictionary<string, string> queryStringParamsRenameList = new Dictionary<string, string>();
 
 				var typeName = "ApiGenerator.Overrides.Descriptors." + method.DescriptorType + "Overrides";
 				var type = CodeConfiguration.Assembly.GetType(typeName);
@@ -328,9 +354,8 @@ public static void PatchMethod(CsharpMethod method)
 					if (overrides != null)
 					{
 						skipList = overrides.SkipQueryStringParams ?? skipList;
-						renameList = overrides.RenameQueryStringParams ?? renameList;
-
-						overrides.PatchMethod(method);
+						queryStringParamsRenameList = overrides.RenameQueryStringParams ?? queryStringParamsRenameList;
+						method = overrides.PatchMethod(method);
 					}
 				}
 
@@ -343,8 +368,8 @@ public static void PatchMethod(CsharpMethod method)
 				};
 
 				foreach (var kv in globalQueryStringRenames)
-					if (!renameList.ContainsKey(kv.Key))
-						renameList[kv.Key] = kv.Value;
+					if (!queryStringParamsRenameList.ContainsKey(kv.Key))
+						queryStringParamsRenameList[kv.Key] = kv.Value;
 
 				var patchedParams = new Dictionary<string, ApiQueryParameters>();
 				foreach (var kv in method.Url.Params)
@@ -355,7 +380,7 @@ public static void PatchMethod(CsharpMethod method)
 						continue;
 
 					string newName;
-					if (!renameList.TryGetValue(kv.Key, out newName))
+					if (!queryStringParamsRenameList.TryGetValue(kv.Key, out newName))
 					{
 						patchedParams.Add(kv.Key, kv.Value);
 						continue;

src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs

@@ -35,14 +35,18 @@ public string ClrTypeName
 					case "target":
 						return "IndexName";
 					case "type": return this.Type == "string" ? "TypeName" : "Types";
+					case "watch_id":
 					case "id": return this.Type == "string" ? "Id" : "Ids";
 					case "node_id": return this.Type == "string" ? "NodeId" : "NodeIds";
 					case "scroll_id": return this.Type == "string" ? "ScrollId" : "ScrollIds";
 					case "field":
 					case "fields": return this.Type == "string" ? "Field" : "Fields";
 					case "index_metric": return "IndexMetrics";
-					case "metric": return "Metrics";
+					case "metric":
+					case "watcher_stats_metric":
+						return "Metrics";
 					case "feature": return "Features";
+					case "action_id": return "ActionIds";
 					case "repository":
 					case "snapshot":
 					case "lang":
@@ -72,5 +76,26 @@ public string InterfaceName
 				}
 			}
 		}
+
+		public string Argument
+		{
+			get
+			{
+				switch (this.Type)
+				{
+					case "int":
+					case "string":
+						return this.Type + " " + this.Name;
+					case "list":
+						return "string " + this.Name;
+					case "enum":
+						return ApiGenerator.PascalCase(this.Name) + " " + this.Name;
+					case "number":
+						return "string " + this.Name;
+					default:
+						return this.Type + " " + this.Name;
+				}
+			}
+		}
 	}
 }

src/CodeGeneration/ApiGenerator/Domain/CsharpMethod.cs

@@ -99,7 +99,7 @@ public IEnumerable<Constructor> RequestConstructors()
 						{
 							route = p.Key,
 							call = p.Value.Required ? "Required" : "Optional",
-							v = p.Key == "metric"
+							v = p.Key == "metric" || p.Key == "watcher_stats_metric"
 								? $"(Metrics){p.Key}"
 								: p.Key == "index_metric"
 									? $"(IndexMetrics){p.Key}"
@@ -269,7 +269,7 @@ public IEnumerable<FluentRouteSetter> GetFluentRouteSetters()
 				var routeValue = paramName;
 				var routeSetter = p.Required ? "Required" : "Optional";
 
-				if (paramName == "metric") routeValue = "(Metrics)metric";
+				if (paramName == "metric" || paramName == "watcherStatsMetric") routeValue = "(Metrics)" + paramName;
 				else if (paramName == "indexMetric") routeValue = "(IndexMetrics)indexMetric";
 
 				var code = $"public {returnType} {p.InterfaceName}({ClrParamType(p.ClrTypeName)} {paramName}) => Assign(a=>a.RouteValues.{routeSetter}(\"{p.Name}\", {routeValue}));";

src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace ApiGenerator.Domain
@@ -11,6 +12,8 @@ public class EnumDescription
 
 	public class RestApiSpec
 	{
+		private IEnumerable<EnumDescription> _enumDescriptions;
+
 		public string Commit { get; set; }
 		public IDictionary<string, ApiEndpoint> Endpoints { get; set; }
 
@@ -21,30 +24,35 @@ public IEnumerable<EnumDescription> EnumsInTheSpec
 		{
 			get
 			{
-				var queryParamEnums = from m in this.CsharpMethodsWithQueryStringInfo.SelectMany(m => m.Url.Params)
-									  where m.Value.Type == "enum"
-									  select new EnumDescription
-									  {
-										  Name = m.Value.CsharpType(m.Key),
-										  Options = m.Value.Options
-
-									  };
+				if (_enumDescriptions == null)
+				{
+					var queryParamEnums = from m in this.CsharpMethodsWithQueryStringInfo.SelectMany(m => m.Url.Params)
+						where m.Value.Type == "enum"
+						select new EnumDescription
+						{
+							Name = m.Value.CsharpType(m.Key),
+							Options = m.Value.Options
+						};
 
-				var urlParamEnums = from data in this.Endpoints.Values
-					.SelectMany(v => v.CsharpMethods.Select(m => new { m, n = v.CsharpMethodName }))
-					.SelectMany(m => m.m.Parts.Select(part => new { m = m.n, p = part }))
-									let p = data.p
-									let m = data.m
-									where p.Options != null && p.Options.Any()
-									let name = p.Name.Contains("metric") ? m + p.Name.ToPascalCase() : p.Name.ToPascalCase()
-									select new EnumDescription
-									{
-										Name = name,
-										Options = p.Options
-									};
+					var urlParamEnums = from data in this.Endpoints.Values
+							.SelectMany(v => v.CsharpMethods.Select(m => new { m, n = v.CsharpMethodName }))
+							.SelectMany(m => m.m.Parts.Select(part => new { m = m.n, p = part }))
+						let p = data.p
+						let m = data.m
+						where p.Options != null && p.Options.Any()
+						let name = p.Name.Contains("metric") && p.Name != "watcher_stats_metric"
+							? m + p.Name.ToPascalCase()
+							: p.Name.ToPascalCase()
+						select new EnumDescription
+						{
+							Name = name,
+							Options = p.Options
+						};
 
-				return queryParamEnums.Concat(urlParamEnums).DistinctBy(e => e.Name);
+					_enumDescriptions = queryParamEnums.Concat(urlParamEnums).DistinctBy(e => e.Name);
+				}
 
+				return _enumDescriptions;
 			}
 
 		}

src/CodeGeneration/ApiGenerator/Overrides/Allow404/ApiEndpointsThatAllow404.cs

@@ -17,6 +17,8 @@ public static class ApiEndpointsThatAllow404
 			"Exists",
 			"Get",
 			"Delete",
+			"GetWatch",
+			"DeleteWatch",
 		};
 	}
 }

src/CodeGeneration/ApiGenerator/Overrides/Descriptors/WatcherStatsDescriptorOverrides.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Linq;
+using ApiGenerator.Domain;
+
+namespace ApiGenerator.Overrides.Descriptors
+{
+	public class WatcherStatsDescriptorOverrides : DescriptorOverridesBase
+	{
+		public override IEnumerable<string> SkipQueryStringParams => new[]
+		{
+			// this is already included in the url route
+			"metric"
+		};
+	}
+}

src/CodeGeneration/ApiGenerator/Program.cs

@@ -37,9 +37,8 @@ static void Main(string[] args)
 			if (redownloadCoreSpecification)
 				RestSpecDownloader.Download(downloadBranch);
 
-			ApiGenerator.Generate(downloadBranch, "Core", "Graph", "License", "Security");
-			//ApiGenerator.Generate("Core", "DeleteByQuery", "Graph", "License", "Shield");
-			//ApiGenerator.Generate("Core", "Graph", "License");
+			ApiGenerator.Generate(downloadBranch, "Core", "Graph", "License", "Security", "Watcher");
+
 			//ApiGenerator.Generate(); //generates everything under ApiSpecification
 		}