Fix api url lookups (#4714)

* Exclude lookups for ignored high level APIs

This commit fixes a bug in the ApiUrlsLookup generator
to use the endpoint filename when comparing against the list
of high level APIs to ignore.

* Do not remove Index from SimulateIndexTemplate method name

This commit fixes a bug in the CSharp method name generation
where Index is removed from the name of the SimulateIndexTemplate
method in the Indices namespace. Removing this causes a collision
with SimulateTemplate

(cherry picked from commit d36aabb)

Author: russcam

src/ApiGenerator/Domain/Code/CsharpNames.cs

@@ -18,28 +18,29 @@ public CsharpNames(string name, string endpointMethodName, string endpointNamesp
 			else ApiName = endpointMethodName.ToPascalCase();
 
 			//if the api name starts with the namespace do not repeat it in the method name
-			string Replace(string original, string ns, string find, string replace)
+			string Replace(string original, string ns, string find, string replace, string[] exceptions)
 			{
 				if (ns != null && Namespace != ns) return original;
+				if (exceptions.Contains(original)) return original;
 
 				var replaced = original.Replace(find, replace);
 				if (string.IsNullOrEmpty(replaced)) return original;
 
 				return replaced;
 			}
 
-			MethodName = Replace(ApiName, null, Namespace, "");
+			MethodName = Replace(ApiName, null, Namespace, "", new string[0]);
 
-			var namespaceRenames = new Dictionary<string, (string find, string replace)>
+			var namespaceRenames = new Dictionary<string, (string find, string replace, string[] exceptions)>
 			{
-				{ "Watcher", (find: "Watch", replace: "") },
-				{ "Indices", (find: "Index", replace: "") },
-				{ "CrossClusterReplication", (find: "Ccr", replace: "") },
-				{ "IndexLifecycleManagement", (find: "Ilm", replace: "") },
-				{ "SnapshotLifecycleManagement", (find: "Slm", replace: "") },
+				{ "Watcher", (find: "Watch", replace: "", exceptions: new string[0]) },
+				{ "Indices", (find: "Index", replace: "", exceptions: new string[] { "SimulateIndexTemplate" }) },
+				{ "CrossClusterReplication", (find: "Ccr", replace: "", exceptions: new string[0]) },
+				{ "IndexLifecycleManagement", (find: "Ilm", replace: "", exceptions: new string[0]) },
+				{ "SnapshotLifecycleManagement", (find: "Slm", replace: "", exceptions: new string[0]) },
 			};
-			foreach (var (ns, (find, replace)) in namespaceRenames)
-				MethodName = Replace(MethodName, ns, find, replace);
+			foreach (var (ns, (find, replace, exceptions)) in namespaceRenames)
+				MethodName = Replace(MethodName, ns, find, replace, exceptions);
 		}
 
 		/// <summary> Pascal cased version of the namespace from the specification </summary>

src/ApiGenerator/Views/HighLevel/Requests/ApiUrlsLookup.cshtml

@@ -19,7 +19,7 @@ namespace Nest
 	{
 @foreach (var endpoint in m.Endpoints.Values)
 {
-	if (CodeConfiguration.IgnoredApisHighLevel.Contains(endpoint.Name))
+	if (CodeConfiguration.IgnoredApisHighLevel.Contains(endpoint.FileName))
 	{
 		continue;
 	}

src/Nest/_Generated/ApiUrlsLookup.generated.cs

@@ -21,7 +21,6 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls AsyncSearchDelete = new ApiUrls(new[]{"_async_search/{id}"});
 		internal static ApiUrls AsyncSearchGet = new ApiUrls(new[]{"_async_search/{id}"});
 		internal static ApiUrls AsyncSearchSubmit = new ApiUrls(new[]{"_async_search", "{index}/_async_search"});
-		internal static ApiUrls AutoscalingGetDecision = new ApiUrls(new[]{"_autoscaling/decision"});
 		internal static ApiUrls NoNamespaceBulk = new ApiUrls(new[]{"_bulk", "{index}/_bulk"});
 		internal static ApiUrls CatAliases = new ApiUrls(new[]{"_cat/aliases", "_cat/aliases/{name}"});
 		internal static ApiUrls CatAllocation = new ApiUrls(new[]{"_cat/allocation", "_cat/allocation/{node_id}"});
@@ -63,12 +62,9 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls CrossClusterReplicationUnfollowIndex = new ApiUrls(new[]{"{index}/_ccr/unfollow"});
 		internal static ApiUrls NoNamespaceClearScroll = new ApiUrls(new[]{"_search/scroll"});
 		internal static ApiUrls ClusterAllocationExplain = new ApiUrls(new[]{"_cluster/allocation/explain"});
-		internal static ApiUrls ClusterDeleteComponentTemplate = new ApiUrls(new[]{"_component_template/{name}"});
-		internal static ApiUrls ClusterGetComponentTemplate = new ApiUrls(new[]{"_component_template", "_component_template/{name}"});
 		internal static ApiUrls ClusterGetSettings = new ApiUrls(new[]{"_cluster/settings"});
 		internal static ApiUrls ClusterHealth = new ApiUrls(new[]{"_cluster/health", "_cluster/health/{index}"});
 		internal static ApiUrls ClusterPendingTasks = new ApiUrls(new[]{"_cluster/pending_tasks"});
-		internal static ApiUrls ClusterPutComponentTemplate = new ApiUrls(new[]{"_component_template/{name}"});
 		internal static ApiUrls ClusterPutSettings = new ApiUrls(new[]{"_cluster/settings"});
 		internal static ApiUrls ClusterRemoteInfo = new ApiUrls(new[]{"_remote/info"});
 		internal static ApiUrls ClusterReroute = new ApiUrls(new[]{"_cluster/reroute"});
@@ -85,15 +81,12 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls EnrichGetPolicy = new ApiUrls(new[]{"_enrich/policy/{name}", "_enrich/policy/"});
 		internal static ApiUrls EnrichPutPolicy = new ApiUrls(new[]{"_enrich/policy/{name}"});
 		internal static ApiUrls EnrichStats = new ApiUrls(new[]{"_enrich/_stats"});
-		internal static ApiUrls EqlSearch = new ApiUrls(new[]{"{index}/_eql/search"});
 		internal static ApiUrls NoNamespaceDocumentExists = new ApiUrls(new[]{"{index}/_doc/{id}"});
 		internal static ApiUrls NoNamespaceSourceExists = new ApiUrls(new[]{"{index}/_source/{id}"});
 		internal static ApiUrls NoNamespaceExplain = new ApiUrls(new[]{"{index}/_explain/{id}"});
 		internal static ApiUrls NoNamespaceFieldCapabilities = new ApiUrls(new[]{"_field_caps", "{index}/_field_caps"});
 		internal static ApiUrls NoNamespaceGet = new ApiUrls(new[]{"{index}/_doc/{id}"});
 		internal static ApiUrls NoNamespaceGetScript = new ApiUrls(new[]{"_scripts/{id}"});
-		internal static ApiUrls NoNamespaceGetScriptContext = new ApiUrls(new[]{"_script_context"});
-		internal static ApiUrls NoNamespaceGetScriptLanguages = new ApiUrls(new[]{"_script_language"});
 		internal static ApiUrls NoNamespaceSource = new ApiUrls(new[]{"{index}/_source/{id}"});
 		internal static ApiUrls GraphExplore = new ApiUrls(new[]{"{index}/_graph/explore"});
 		internal static ApiUrls IndexLifecycleManagementDeleteLifecycle = new ApiUrls(new[]{"_ilm/policy/{policy_id}"});
@@ -112,10 +105,8 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls IndicesClone = new ApiUrls(new[]{"{index}/_clone/{target}"});
 		internal static ApiUrls IndicesClose = new ApiUrls(new[]{"{index}/_close"});
 		internal static ApiUrls IndicesCreate = new ApiUrls(new[]{"{index}"});
-		internal static ApiUrls IndicesCreateDataStream = new ApiUrls(new[]{"_data_stream/{name}"});
 		internal static ApiUrls IndicesDelete = new ApiUrls(new[]{"{index}"});
 		internal static ApiUrls IndicesDeleteAlias = new ApiUrls(new[]{"{index}/_alias/{name}"});
-		internal static ApiUrls IndicesDeleteDataStream = new ApiUrls(new[]{"_data_stream/{name}"});
 		internal static ApiUrls IndicesDeleteTemplate = new ApiUrls(new[]{"_template/{name}"});
 		internal static ApiUrls IndicesExists = new ApiUrls(new[]{"{index}"});
 		internal static ApiUrls IndicesAliasExists = new ApiUrls(new[]{"_alias/{name}", "{index}/_alias/{name}"});
@@ -127,7 +118,6 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls IndicesFreeze = new ApiUrls(new[]{"{index}/_freeze"});
 		internal static ApiUrls IndicesGet = new ApiUrls(new[]{"{index}"});
 		internal static ApiUrls IndicesGetAlias = new ApiUrls(new[]{"_alias", "_alias/{name}", "{index}/_alias/{name}", "{index}/_alias"});
-		internal static ApiUrls IndicesGetDataStreams = new ApiUrls(new[]{"_data_streams", "_data_streams/{name}"});
 		internal static ApiUrls IndicesGetFieldMapping = new ApiUrls(new[]{"_mapping/field/{fields}", "{index}/_mapping/field/{fields}"});
 		internal static ApiUrls IndicesGetMapping = new ApiUrls(new[]{"_mapping", "{index}/_mapping"});
 		internal static ApiUrls IndicesGetSettings = new ApiUrls(new[]{"_settings", "{index}/_settings", "{index}/_settings/{name}", "_settings/{name}"});
@@ -168,26 +158,19 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls MachineLearningDeleteCalendar = new ApiUrls(new[]{"_ml/calendars/{calendar_id}"});
 		internal static ApiUrls MachineLearningDeleteCalendarEvent = new ApiUrls(new[]{"_ml/calendars/{calendar_id}/events/{event_id}"});
 		internal static ApiUrls MachineLearningDeleteCalendarJob = new ApiUrls(new[]{"_ml/calendars/{calendar_id}/jobs/{job_id}"});
-		internal static ApiUrls MachineLearningDeleteDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/{id}"});
 		internal static ApiUrls MachineLearningDeleteDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}"});
 		internal static ApiUrls MachineLearningDeleteExpiredData = new ApiUrls(new[]{"_ml/_delete_expired_data"});
 		internal static ApiUrls MachineLearningDeleteFilter = new ApiUrls(new[]{"_ml/filters/{filter_id}"});
 		internal static ApiUrls MachineLearningDeleteForecast = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/_forecast/{forecast_id}"});
 		internal static ApiUrls MachineLearningDeleteJob = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}"});
 		internal static ApiUrls MachineLearningDeleteModelSnapshot = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}"});
-		internal static ApiUrls MachineLearningDeleteTrainedModel = new ApiUrls(new[]{"_ml/inference/{model_id}"});
 		internal static ApiUrls MachineLearningEstimateModelMemory = new ApiUrls(new[]{"_ml/anomaly_detectors/_estimate_model_memory"});
-		internal static ApiUrls MachineLearningEvaluateDataFrame = new ApiUrls(new[]{"_ml/data_frame/_evaluate"});
-		internal static ApiUrls MachineLearningExplainDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/_explain", "_ml/data_frame/analytics/{id}/_explain"});
-		internal static ApiUrls MachineLearningFindFileStructure = new ApiUrls(new[]{"_ml/find_file_structure"});
 		internal static ApiUrls MachineLearningFlushJob = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/_flush"});
 		internal static ApiUrls MachineLearningForecastJob = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/_forecast"});
 		internal static ApiUrls MachineLearningGetBuckets = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/results/buckets/{timestamp}", "_ml/anomaly_detectors/{job_id}/results/buckets"});
 		internal static ApiUrls MachineLearningGetCalendarEvents = new ApiUrls(new[]{"_ml/calendars/{calendar_id}/events"});
 		internal static ApiUrls MachineLearningGetCalendars = new ApiUrls(new[]{"_ml/calendars", "_ml/calendars/{calendar_id}"});
 		internal static ApiUrls MachineLearningGetCategories = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/results/categories/{category_id}", "_ml/anomaly_detectors/{job_id}/results/categories/"});
-		internal static ApiUrls MachineLearningGetDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/{id}", "_ml/data_frame/analytics"});
-		internal static ApiUrls MachineLearningGetDataFrameAnalyticsStats = new ApiUrls(new[]{"_ml/data_frame/analytics/_stats", "_ml/data_frame/analytics/{id}/_stats"});
 		internal static ApiUrls MachineLearningGetDatafeedStats = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}/_stats", "_ml/datafeeds/_stats"});
 		internal static ApiUrls MachineLearningGetDatafeeds = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}", "_ml/datafeeds"});
 		internal static ApiUrls MachineLearningGetFilters = new ApiUrls(new[]{"_ml/filters", "_ml/filters/{filter_id}"});
@@ -197,25 +180,19 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls MachineLearningGetModelSnapshots = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}", "_ml/anomaly_detectors/{job_id}/model_snapshots"});
 		internal static ApiUrls MachineLearningGetOverallBuckets = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/results/overall_buckets"});
 		internal static ApiUrls MachineLearningGetAnomalyRecords = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/results/records"});
-		internal static ApiUrls MachineLearningGetTrainedModels = new ApiUrls(new[]{"_ml/inference/{model_id}", "_ml/inference"});
-		internal static ApiUrls MachineLearningGetTrainedModelsStats = new ApiUrls(new[]{"_ml/inference/{model_id}/_stats", "_ml/inference/_stats"});
 		internal static ApiUrls MachineLearningInfo = new ApiUrls(new[]{"_ml/info"});
 		internal static ApiUrls MachineLearningOpenJob = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/_open"});
 		internal static ApiUrls MachineLearningPostCalendarEvents = new ApiUrls(new[]{"_ml/calendars/{calendar_id}/events"});
 		internal static ApiUrls MachineLearningPostJobData = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/_data"});
 		internal static ApiUrls MachineLearningPreviewDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}/_preview"});
 		internal static ApiUrls MachineLearningPutCalendar = new ApiUrls(new[]{"_ml/calendars/{calendar_id}"});
 		internal static ApiUrls MachineLearningPutCalendarJob = new ApiUrls(new[]{"_ml/calendars/{calendar_id}/jobs/{job_id}"});
-		internal static ApiUrls MachineLearningPutDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/{id}"});
 		internal static ApiUrls MachineLearningPutDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}"});
 		internal static ApiUrls MachineLearningPutFilter = new ApiUrls(new[]{"_ml/filters/{filter_id}"});
 		internal static ApiUrls MachineLearningPutJob = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}"});
-		internal static ApiUrls MachineLearningPutTrainedModel = new ApiUrls(new[]{"_ml/inference/{model_id}"});
 		internal static ApiUrls MachineLearningRevertModelSnapshot = new ApiUrls(new[]{"_ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_revert"});
 		internal static ApiUrls MachineLearningSetUpgradeMode = new ApiUrls(new[]{"_ml/set_upgrade_mode"});
-		internal static ApiUrls MachineLearningStartDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/{id}/_start"});
 		internal static ApiUrls MachineLearningStartDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}/_start"});
-		internal static ApiUrls MachineLearningStopDataFrameAnalytics = new ApiUrls(new[]{"_ml/data_frame/analytics/{id}/_stop"});
 		internal static ApiUrls MachineLearningStopDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}/_stop"});
 		internal static ApiUrls MachineLearningUpdateDatafeed = new ApiUrls(new[]{"_ml/datafeeds/{datafeed_id}/_update"});
 		internal static ApiUrls MachineLearningUpdateFilter = new ApiUrls(new[]{"_ml/filters/{filter_id}/_update"});
@@ -233,7 +210,6 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls NodesUsage = new ApiUrls(new[]{"_nodes/usage", "_nodes/{node_id}/usage", "_nodes/usage/{metric}", "_nodes/{node_id}/usage/{metric}"});
 		internal static ApiUrls NoNamespacePing = new ApiUrls(new[]{""});
 		internal static ApiUrls NoNamespacePutScript = new ApiUrls(new[]{"_scripts/{id}", "_scripts/{id}/{context}"});
-		internal static ApiUrls NoNamespaceRankEval = new ApiUrls(new[]{"_rank_eval", "{index}/_rank_eval"});
 		internal static ApiUrls NoNamespaceReindexOnServer = new ApiUrls(new[]{"_reindex"});
 		internal static ApiUrls NoNamespaceReindexRethrottle = new ApiUrls(new[]{"_reindex/{task_id}/_rethrottle"});
 		internal static ApiUrls NoNamespaceRenderSearchTemplate = new ApiUrls(new[]{"_render/template", "_render/template/{id}"});