Refactor tools and integrate Datadog configuration

- Refactor utility functions in the helper module to improve code clarity and remove deprecated components.
- Introduce a new TypeScript utility for creating and managing tool schema definitions, enhancing type safety.
- Streamline integration with Datadog by setting up environment-variable-based configuration, including validation checks.
- Restructure the incident handling module for better organization and clearer API initialization.

Signed-off-by: katsumata <12413150+winor30@users.noreply.github.com>

Author: winor30

.gitignore

@@ -1,5 +1,4 @@
 # Logs
-logs
 *.log
 npm-debug.log*
 yarn-debug.log*

src/index.ts

@@ -13,7 +13,7 @@ import {
   CallToolRequestSchema,
   ListToolsRequestSchema,
 } from '@modelcontextprotocol/sdk/types.js'
-import { config, log, mcpDatadogVersion } from './utils/helper'
+import { log, mcpDatadogVersion } from './utils/helper'
 import { INCIDENT_HANDLERS, INCIDENT_TOOLS } from './tools/incident'
 import { ToolHandlers } from './utils/types'
 
@@ -77,11 +77,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
  * which sends and receives data through standard input and output.
  */
 async function main() {
-  if (config.apiKeyAuth == null || config.appKeyAuth == null) {
-    log('error', 'Server error: Missing Datadog API key or app key')
-    process.exit(1)
-  }
-
   const transport = new StdioServerTransport()
   await server.connect(transport)
 }

src/tools/incident/index.ts

@@ -1 +1 @@
-export { INCIDENT_TOOLS, INCIDENT_HANDLERS } from './incident'
+export { INCIDENT_TOOLS, INCIDENT_HANDLERS } from './tool'

src/tools/incident/incident.ts src/tools/incident/tool.ts

@@ -1,7 +1,8 @@
 import { ExtendedTool, ToolHandlers } from '../../utils/types'
-import { client, v2 } from '@datadog/datadog-api-client'
-import { config, createToolSchema } from '../../utils/helper'
+import { v2 } from '@datadog/datadog-api-client'
+import { createToolSchema } from '../../utils/tool'
 import { GetIncidentZodSchema, ListIncidentsZodSchema } from './schema'
+import { datadogConfig } from '../../utils/datadog'
 
 type IncidentToolName = 'list_incidents' | 'get_incident'
 type IncidentTool = ExtendedTool<IncidentToolName>
@@ -19,22 +20,7 @@ export const INCIDENT_TOOLS: IncidentTool[] = [
   ),
 ] as const
 
-const CONFIG = client.createConfiguration({
-  authMethods: {
-    apiKeyAuth: config.apiKeyAuth,
-    appKeyAuth: config.appKeyAuth,
-  },
-})
-CONFIG.unstableOperations = {
-  'v2.listIncidents': true,
-  'v2.getIncident': true,
-}
-if (config.site != null) {
-  CONFIG.setServerVariables({
-    site: config.site,
-  })
-}
-const API_INSTANCE = new v2.IncidentsApi(CONFIG)
+const API_INSTANCE = new v2.IncidentsApi(datadogConfig)
 
 type IncidentToolHandlers = ToolHandlers<IncidentToolName>
 

src/utils/datadog.ts

@@ -0,0 +1,31 @@
+import { client } from '@datadog/datadog-api-client'
+
+const config = {
+  apiKeyAuth: process.env.DATADOG_API_KEY,
+  appKeyAuth: process.env.DATADOG_APP_KEY,
+  site: process.env.DATADOG_SITE,
+}
+
+if (!config.apiKeyAuth || !config.appKeyAuth) {
+  throw new Error('Datadog API key and APP key are required')
+}
+
+const datadogConfig = client.createConfiguration({
+  authMethods: {
+    apiKeyAuth: config.apiKeyAuth,
+    appKeyAuth: config.appKeyAuth,
+  },
+})
+
+if (config.site != null) {
+  datadogConfig.setServerVariables({
+    site: config.site,
+  })
+}
+
+datadogConfig.unstableOperations = {
+  'v2.listIncidents': true,
+  'v2.getIncident': true,
+}
+
+export { datadogConfig }

src/utils/helper.ts

@@ -1,6 +1,3 @@
-import { Tool } from '@modelcontextprotocol/sdk/types.js'
-import { ZodSchema } from 'zod'
-
 /**
  * Logs a formatted message with a specified severity to stderr.
  *
@@ -18,55 +15,4 @@ export function log(
   process.stderr.write(msg)
 }
 
-export const config = {
-  apiKeyAuth: process.env.DATADOG_API_KEY,
-  appKeyAuth: process.env.DATADOG_APP_KEY,
-  site: process.env.DATADOG_SITE,
-}
-
 export { version as mcpDatadogVersion } from '../../package.json'
-
-type JsonSchema = Record<string, any> // eslint-disable-line @typescript-eslint/no-explicit-any
-
-function pickRootObjectProperty(
-  fullSchema: JsonSchema,
-  schemaName: string,
-): {
-  type: 'object'
-  properties: any // eslint-disable-line @typescript-eslint/no-explicit-any
-  required?: string[]
-} {
-  const definitions = fullSchema.definitions ?? {}
-  const root = definitions[schemaName]
-  return {
-    type: 'object',
-    properties: root?.properties ?? {},
-    required: root?.required ?? [],
-  }
-}
-
-/**
- * Creates a tool definition object using the provided Zod schema.
- *
- * This function converts a Zod schema (acting as the single source of truth) into a JSON Schema,
- * extracts the relevant root object properties, and embeds them into the tool definition.
- * This approach avoids duplicate schema definitions and ensures type safety and consistency.
- *
- * Note: The provided name is also used as the tool's name in the Model Context Protocol.
- *
- * @param schema - The Zod schema representing the tool's parameters.
- * @param name - The name of the tool and the key used to extract the corresponding schema definition, and the tool's name in the Model Context Protocol.
- * @param description - A brief description of the tool's functionality.
- * @returns A tool object containing the name, description, and input JSON Schema.
- */
-export function createToolSchema<T extends string>(
-  schema: ZodSchema<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
-  name: T,
-  description: string,
-): Tool & { name: T } {
-  return {
-    name,
-    description,
-    inputSchema: pickRootObjectProperty(schema, name),
-  }
-}

src/utils/tool.ts

@@ -0,0 +1,47 @@
+import { Tool } from '@modelcontextprotocol/sdk/types.js'
+import { ZodSchema } from 'zod'
+
+type JsonSchema = Record<string, any> // eslint-disable-line @typescript-eslint/no-explicit-any
+
+function pickRootObjectProperty(
+  fullSchema: JsonSchema,
+  schemaName: string,
+): {
+  type: 'object'
+  properties: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  required?: string[]
+} {
+  const definitions = fullSchema.definitions ?? {}
+  const root = definitions[schemaName]
+  return {
+    type: 'object',
+    properties: root?.properties ?? {},
+    required: root?.required ?? [],
+  }
+}
+
+/**
+ * Creates a tool definition object using the provided Zod schema.
+ *
+ * This function converts a Zod schema (acting as the single source of truth) into a JSON Schema,
+ * extracts the relevant root object properties, and embeds them into the tool definition.
+ * This approach avoids duplicate schema definitions and ensures type safety and consistency.
+ *
+ * Note: The provided name is also used as the tool's name in the Model Context Protocol.
+ *
+ * @param schema - The Zod schema representing the tool's parameters.
+ * @param name - The name of the tool and the key used to extract the corresponding schema definition, and the tool's name in the Model Context Protocol.
+ * @param description - A brief description of the tool's functionality.
+ * @returns A tool object containing the name, description, and input JSON Schema.
+ */
+export function createToolSchema<T extends string>(
+  schema: ZodSchema<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
+  name: T,
+  description: string,
+): Tool & { name: T } {
+  return {
+    name,
+    description,
+    inputSchema: pickRootObjectProperty(schema, name),
+  }
+}