Merge pull request #584 from jhernand/update_to_model_0_0_179

Update to model 0.0.179
openshift-online · Mar 9, 2022 · 5196edb · 5196edb
2 parents 823e32d + e5a83f8
commit 5196edb
Show file tree

Hide file tree

Showing 6 changed files with 454 additions and 454 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 export CGO_ENABLED=0
 
 # Details of the model to use:
-model_version:=v0.0.178
+model_version:=v0.0.179
 model_url:=https://github.com/openshift-online/ocm-api-model.git
 
 # Details of the metamodel to use:

diff --git a/metrics/path_tree_data.go b/metrics/path_tree_data.go
@@ -270,7 +270,7 @@ var pathTreeData = `{
         },
         "clusters": {
           "-": {
-            "cluster_logs_uuid": null
+            "cluster_logs": null
           }
         }
       }

diff --git a/openapi/service_logs/v1/openapi.json b/openapi/service_logs/v1/openapi.json
@@ -234,7 +234,7 @@
         }
       }
     },
-    "/api/service_logs/v1/clusters/{cluster_id}/cluster_logs_uuid": {
+    "/api/service_logs/v1/clusters/{cluster_id}/cluster_logs": {
       "get": {
         "description": "Retrieves the list of cluster logs by cluster uuid.",
         "parameters": [

diff --git a/servicelogs/v1/cluster_client.go b/servicelogs/v1/cluster_client.go
@@ -42,12 +42,12 @@ func NewClusterClient(transport http.RoundTripper, path string) *ClusterClient {
 	}
 }
 
-// ClusterLogsUUID returns the target 'cluster_logs_UUID' resource.
+// ClusterLogs returns the target 'cluster_logs_UUID' resource.
 //
 // Reference to the list of cluster logs for a specific cluster uuid.
-func (c *ClusterClient) ClusterLogsUUID() *ClusterLogsUUIDClient {
+func (c *ClusterClient) ClusterLogs() *ClusterLogsUUIDClient {
 	return NewClusterLogsUUIDClient(
 		c.transport,
-		path.Join(c.path, "cluster_logs_uuid"),
+		path.Join(c.path, "cluster_logs"),
 	)
 }
diff --git a/servicelogs/v1/cluster_server.go b/servicelogs/v1/cluster_server.go
@@ -28,10 +28,10 @@ import (
 // ClusterServer represents the interface the manages the 'cluster' resource.
 type ClusterServer interface {
 
-	// ClusterLogsUUID returns the target 'cluster_logs_UUID' resource.
+	// ClusterLogs returns the target 'cluster_logs_UUID' resource.
 	//
 	// Reference to the list of cluster logs for a specific cluster uuid.
-	ClusterLogsUUID() ClusterLogsUUIDServer
+	ClusterLogs() ClusterLogsUUIDServer
 }
 
 // dispatchCluster navigates the servers tree rooted at the given server
@@ -46,8 +46,8 @@ func dispatchCluster(w http.ResponseWriter, r *http.Request, server ClusterServe
 		}
 	}
 	switch segments[0] {
-	case "cluster_logs_uuid":
-		target := server.ClusterLogsUUID()
+	case "cluster_logs":
+		target := server.ClusterLogs()
 		if target == nil {
 			errors.SendNotFound(w, r)
 			return
-Original file line number
+Diff line change
@@ Expand Up / @@ -270,7 +270,7 @@ var pathTreeData = `{ @@
             },
             "clusters": {
               "-": {
-                "cluster_logs_uuid": null
+                "cluster_logs": null
               }
             }
           }
@@ Expand Down @@