refactor: remove all resource templates with tools (#44)

* refactor: remove all resource templates with tools

Resource templates are not widely supported in many clients so for consistency we are converting resource templates to paginated tool calls with resource identifier

* add listing reserved ipv4 and ipv6

* fix: remove tool names from top level readme

Author: asharkhan3101

README.md

@@ -64,18 +64,7 @@ The MCP DigitalOcean Integration supports a variety of services, allowing users
 | **Apps**       | Manage DigitalOcean App Platform applications, including deployments and configurations.                            |
 | **Droplets**   | Create, manage, resize, snapshot, and monitor droplets (virtual machines) on DigitalOcean.                          |
 | **Account**    | Get information about your DigitalOcean account, billing, balance, invoices, and SSH keys.                          |
-| **Networking** | Manage domains, DNS records, certificates, firewalls, reserved IPs, VPCs, CDNs, and partner attachments.            |
-
-### Service Tools
-
-Each service provides a toolset to interact with DigitalOcean.
-
-| **Service**    | **Tools** (examples, see per-service README for full list)                                           |
-|----------------|------------------------------------------------------------------------------------------------------|
-| **Account**    | `digitalocean-key-create`, `digitalocean-key-delete`, `account://current`, `balance://current`, `billing://{last}`, `invoice://{last}`, `actions://{id}`, `keys://{id}` |
-| **Apps**       | `digitalocean-create-app-from-spec`, `digitalocean-apps-update`, `digitalocean-apps-delete`, `digitalocean-apps-get-info`, `digitalocean-apps-usage`, `digitalocean-apps-get-deployment-status`, `digitalocean-apps-list` |
-| **Droplets**   | `digitalocean-droplet-create`, `digitalocean-droplet-delete`, `digitalocean-droplet-power-cycle`, `digitalocean-droplet-resize`, `digitalocean-droplet-snapshot`, `digitalocean-droplet-enable-backups`, `digitalocean-droplet-get-neighbors`, `digitalocean-droplet-rename`, `digitalocean-droplet-rebuild`, `digitalocean-droplet-get-kernels`, ... (see [Droplet README](./internal/droplet/README.md)) |
-| **Networking** | `digitalocean-domain-create`, `digitalocean-domain-delete`, `digitalocean-domain-record-create`, `digitalocean-domain-record-delete`, `digitalocean-certificate-create`, `digitalocean-certificate-delete`, `digitalocean-firewall-create`, `digitalocean-firewall-delete`, `digitalocean-reserved-ip-reserve`, `digitalocean-reserved-ip-release`, `digitalocean-vpc-create`, `digitalocean-vpc-delete`, `digitalocean-vpc-peering-create`, `digitalocean-vpc-peering-delete`, `digitalocean-cdn-create`, `digitalocean-cdn-delete`, `digitalocean-partner-attachment-create`, ... (see [Networking README](./internal/networking/README.md)) |
+| **Networking** | Manage domains, DNS records, certificates, firewalls, reserved IPs, VPCs, CDNs, and Partner Network attachments.            |
 
 ---
 ## Service Documentation
@@ -90,17 +79,6 @@ See the following files for full documentation:
 
 ---
 
-### Example Resource URIs
-
-Each service exposes resources that can be queried directly. Examples:
-
-- **Account:** `account://current`, `balance://current`, `billing://3`, `invoice://6`, `actions://123456`, `keys://987654`
-- **Apps:** `apps://{id}`, `apps://{id}/deployments/{deployment_id}`
-- **Droplets:** `droplets://{id}`, `droplets://{id}/actions/{action_id}`, `images://distribution`, `images://{id}`, `sizes://all`
-- **Networking:** `domains://{name}`, `domains://{name}/records/{record_id}`, `certificates://{id}`, `firewalls://{id}`, `reserved_ipv4://{ip}`, `vpcs://{id}`, `cdn://{id}`, `partner_attachment://{id}`, `vpc_peering://{id}`
-
----
-
 ### Example Tool Usage
 
 - Deploy an app from a GitHub repo: `digitalocean-create-app-from-spec`
@@ -109,8 +87,6 @@ Each service exposes resources that can be queried directly. Examples:
 - Create a new domain: `digitalocean-domain-create`
 - Enable backups on a droplet: `digitalocean-droplet-enable-backups`
 - Flush a CDN cache: `digitalocean-cdn-flush-cache`
-- List all available droplet sizes: `sizes://all`
-- Get account balance: `balance://current`
 - Create a VPC peering connection: `digitalocean-vpc-peering-create`
 - Delete a VPC peering connection: `digitalocean-vpc-peering-delete`
 

internal/account/README.md

@@ -1,34 +1,123 @@
-# Account MCP Tools
+# DigitalOcean Account Tools
 
-This directory contains tools and resources for interacting with DigitalOcean account-related features via the MCP Server. These tools allow you to query and manage account information, billing, invoices, SSH keys, and actions.
+This directory provides tool-based handlers for interacting with DigitalOcean account-related features via the MCP Server. All account operations are exposed as tools that accept structured arguments—no resource URIs are used. Pagination and filtering are supported where applicable.
 
 ## Supported Tools
 
-- `digitalocean-key-create`: Create a new SSH key for your account. This tool lets you add a new public SSH key, which can then be used for Droplet or App Platform deployments.
-- `digitalocean-key-delete`: Delete an existing SSH key by its ID. Useful for removing unused or compromised keys from your account.
+### Actions
 
-## Supported Resources
+- **digitalocean-action-get**
+  - Get a specific action by its ID.
+  - Arguments:
+    - `ID` (number, required): The action ID.
 
-- `account://current`: Retrieve information about the current DigitalOcean account, such as email, UUID, status, and more.
-- `balance://current`: Get the current account balance, including outstanding charges and account credits.
-- `billing://{last}`: Fetch billing history for the last N months. Replace `{last}` with the number of months you want to retrieve.
-- `invoice://{last}`: Retrieve invoice history for the last N months. Replace `{last}` with the number of months you want to retrieve.
-- `actions://{id}`: Get information about a specific action (such as Droplet creation, deletion, etc.) by its numeric ID.
-- `keys://{id}`: Retrieve information about a specific SSH key by its numeric ID.
+- **digitalocean-action-list**
+  - List actions with pagination.
+  - Arguments:
+    - `Page` (number, default: 1): Page number.
+    - `PerPage` (number, default: 30): Items per page.
 
-## Example Queries Using Account MCP Tools
+### Balance
 
-- Show me my current account information.
-- What is my current DigitalOcean balance?
-- List my billing history for the last 3 months.
-- Get all invoices from the past 6 months.
-- Show details for action ID 12345678.
-- Retrieve information about SSH key with ID 987654.
-- Add a new SSH key to my account.
-- Remove SSH key with ID 12345.
+- **digitalocean-balance-get**
+  - Get balance information for the user account.
+  - Arguments: _none_
+
+### Billing
+
+- **digitalocean-billing-history-list**
+  - List billing history with pagination.
+  - Arguments:
+    - `Page` (number, default: 1): Page number.
+    - `PerPage` (number, default: 30): Items per page.
+
+### Invoices
+
+- **digitalocean-invoice-list**
+  - List invoices with pagination.
+  - Arguments:
+    - `Page` (number, default: 1): Page number.
+    - `PerPage` (number, default: 30): Items per page.
+
+### SSH Keys
+
+- **digitalocean-key-create**
+  - Create a new SSH key.
+  - Arguments:
+    - `Name` (string, required): Name of the SSH key.
+    - `PublicKey` (string, required): Public key content.
+
+- **digitalocean-key-delete**
+  - Delete an SSH key by its ID.
+  - Arguments:
+    - `ID` (number, required): ID of the SSH key to delete.
+
+- **digitalocean-key-get**
+  - Get a specific SSH key by its ID.
+  - Arguments:
+    - `ID` (number, required): ID of the SSH key.
+
+- **digitalocean-key-list**
+  - List SSH keys with pagination.
+  - Arguments:
+    - `Page` (number, default: 1): Page number.
+    - `PerPage` (number, default: 30): Items per page.
+
+### Account Information
+
+- **digitalocean-account-get-information**
+  - Retrieves account information for the current user.
+  - Arguments: _none_
+
+---
+
+## Example Usage
+
+- Get details for action ID 123456:
+  - Tool: `digitalocean-action-get`
+  - Arguments: `{ "ID": 123456 }`
+
+- List actions (page 2, 50 per page):
+  - Tool: `digitalocean-action-list`
+  - Arguments: `{ "Page": 2, "PerPage": 50 }`
+
+- Get current account balance:
+  - Tool: `digitalocean-balance-get`
+  - Arguments: `{}`
+
+- List billing history (first page, 10 items per page):
+  - Tool: `digitalocean-billing-history-list`
+  - Arguments: `{ "Page": 1, "PerPage": 10 }`
+
+- List invoices (default pagination):
+  - Tool: `digitalocean-invoice-list`
+  - Arguments: `{}`
+
+- Create a new SSH key:
+  - Tool: `digitalocean-key-create`
+  - Arguments: `{ "Name": "my-key", "PublicKey": "ssh-rsa AAAA..." }`
+
+- Delete SSH key with ID 98765:
+  - Tool: `digitalocean-key-delete`
+  - Arguments: `{ "ID": 98765 }`
+
+- Get SSH key by ID:
+  - Tool: `digitalocean-key-get`
+  - Arguments: `{ "ID": 12345 }`
+
+- List SSH keys (page 3, 20 per page):
+  - Tool: `digitalocean-key-list`
+  - Arguments: `{ "Page": 3, "PerPage": 20 }`
+
+- Get current account information:
+  - Tool: `digitalocean-account-get-information`
+  - Arguments: `{}`
+
+---
 
 ## Notes
 
-- Most resources are read-only and provide information about your account and its usage.
-- The SSH key tools (`digitalocean-key-create` and `digitalocean-key-delete`) allow you to manage your account's SSH keys directly.
-- For endpoints that require an ID or a count (such as `{id}` or `{last}`), replace the placeholder with the appropriate value in your query.
+- All tools use argument-based input; do not use resource URIs.
+- Pagination is supported for list endpoints via `Page` and `PerPage` arguments.
+- All responses are returned as JSON-formatted text.
+- Error handling is consistent: errors are returned in the tool result with an error flag and message.

internal/account/account_resources.go

@@ -0,0 +1,46 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/digitalocean/godo"
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
+)
+
+type AccountTools struct {
+	client *godo.Client
+}
+
+func NewAccountTools(client *godo.Client) *AccountTools {
+	return &AccountTools{
+		client: client,
+	}
+}
+
+func (a *AccountTools) getAccountInformation(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	account, _, err := a.client.Account.Get(ctx)
+	if err != nil {
+		return mcp.NewToolResultErrorFromErr("api error", err), nil
+	}
+
+	jsonData, err := json.MarshalIndent(account, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("error marshalling account: %w", err)
+	}
+
+	return mcp.NewToolResultText(string(jsonData)), nil
+}
+
+func (a *AccountTools) Tools() []server.ServerTool {
+	return []server.ServerTool{
+		{
+			Handler: a.getAccountInformation,
+			Tool: mcp.NewTool("digitalocean-account-get-information",
+				mcp.WithDescription("Retrieves account information for the current user"),
+			),
+		},
+	}
+}

internal/account/account_tools.go

@@ -11,13 +11,13 @@ import (
 	"go.uber.org/mock/gomock"
 )
 
-func setupAccountResourceWithMock(mockAccount *MockAccountService) *AccountMCPResource {
+func setupAccountToolsWithMock(mockAccount *MockAccountService) *AccountTools {
 	client := &godo.Client{}
 	client.Account = mockAccount
-	return NewAccountMCPResource(client)
+	return NewAccountTools(client)
 }
 
-func TestAccountMCPResource_handleGetAccountResource(t *testing.T) {
+func TestAccountTools_handleGetAccountInformation(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -58,19 +58,19 @@ func TestAccountMCPResource_handleGetAccountResource(t *testing.T) {
 			if tc.mockSetup != nil {
 				tc.mockSetup(mockAccount)
 			}
-			resource := setupAccountResourceWithMock(mockAccount)
-			req := mcp.ReadResourceRequest{}
-			resp, err := resource.handleGetAccountResource(context.Background(), req)
+			tool := setupAccountToolsWithMock(mockAccount)
+			req := mcp.CallToolRequest{}
+			resp, err := tool.getAccountInformation(context.Background(), req)
 			if tc.expectError {
-				require.Error(t, err)
+				require.NotNil(t, resp)
+				require.True(t, resp.IsError)
 				return
 			}
 			require.NoError(t, err)
 			require.NotNil(t, resp)
-			require.Len(t, resp, 1)
-			content, ok := resp[0].(mcp.TextResourceContents)
-			require.True(t, ok)
-			require.Equal(t, "application/json", content.MIMEType)
+			require.False(t, resp.IsError)
+			content := resp.Content[0].(mcp.TextContent).Text
+			require.NotEmpty(t, content)
 		})
 	}
 }