Fix client call by checking if resource show route has params

rootlyhq · Nov 5, 2024 · 1b95fcb · 1b95fcb
1 parent 48d6b0b
commit 1b95fcb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/tools/generate-client-tpl.js b/tools/generate-client-tpl.js
@@ -1,6 +1,6 @@
 const inflect = require("./inflect");
 
-module.exports = (name, resourceSchema, pathIdField) => {
+module.exports = (name, resourceSchema, pathIdField, hasIncludeParam) => {
   const namePlural = inflect.pluralize(name);
   const nameCamel = inflect.camelize(name);
   const nameCamelPlural = inflect.camelize(namePlural);
@@ -79,7 +79,7 @@ func (c *Client) Create${nameCamel}(d *${nameCamel}) (*${nameCamel}, error) {
 }
 
 func (c *Client) Get${nameCamel}(id string) (*${nameCamel}, error) {
-	req, err := rootlygo.NewGet${nameCamel}Request(c.Rootly.Server, id)
+	req, err := rootlygo.NewGet${nameCamel}Request(c.Rootly.Server, id${hasIncludeParam ? ', nil' : ''})
 	if err != nil {
 		return nil, errors.Errorf("Error building request: %s", err.Error())
 	}

diff --git a/tools/generate.js b/tools/generate.js
@@ -165,7 +165,7 @@ function generateReadOnlyClient(name) {
     collectionSchema.parameters &&
     collectionSchema.parameters[0] &&
     collectionSchema.parameters[0].name;
-  const code = clientReadOnlyTpl(name, resourceSchema(name), pathIdField);
+  const code = clientReadOnlyTpl(name, resourceSchema(name), pathIdField, hasIncludeParam(name));
   fs.writeFileSync(
     path.resolve(__dirname, "..", "client", `${inflect.pluralize(name)}.go`),
     code
@@ -179,7 +179,7 @@ function generateClient(name) {
     collectionSchema.parameters &&
     collectionSchema.parameters[0] &&
     collectionSchema.parameters[0].name;
-  const code = clientTpl(name, resourceSchema(name), pathIdField);
+  const code = clientTpl(name, resourceSchema(name), pathIdField, hasIncludeParam(name));
   fs.writeFileSync(
     path.resolve(__dirname, "..", "client", `${inflect.pluralize(name)}.go`),
     code
@@ -352,3 +352,20 @@ function collectionPathSchema(name) {
     })
     .map((url) => swagger.paths[url])[0];
 }
+
+function hasIncludeParam(name) {
+  const paramsSchema = Object.keys(swagger.paths)
+    .filter((url) => {
+      const get = swagger.paths[url].get;
+      return (
+        get &&
+        get.operationId.replace(/ /g, "") ===
+          `get${inflect.singularize(inflect.camelize(name))}`
+      );
+    })
+    .map((url) => swagger.paths[url])[0]?.get;
+
+  return paramsSchema &&
+    paramsSchema.parameters &&
+    paramsSchema.parameters.some((param) => param.name === "include");
+}