Resolve merge conflict by incorporating both suggestions

Author: gautambaghel

CHANGELOG.md

@@ -1,5 +1,33 @@
 ## 0.3.0
 
+## 0.2.2 (Aug 5, 2025)
+
+FEATURES
+
+* 2 New tools, get latest provider and module versions. See [#122](https://github.com/hashicorp/terraform-mcp-server/pull/122)
+
+IMPROVEMENTS
+
+* Restructure the codebase, changes too tool names from camelCase to snake_case. See [#118](https://github.com/hashicorp/terraform-mcp-server/pull/118)
+* Change tool names to be more consistent. See [#123](https://github.com/hashicorp/terraform-mcp-server/pull/123)
+
+FIXES
+
+* Enhanced provider documentation tool. See [#120](https://github.com/hashicorp/terraform-mcp-server/pull/120)
+* StreamableHttp endpoint customization, thanks to @sachinmalanki. See [#116](https://github.com/hashicorp/terraform-mcp-server/pull/116)
+
+## 0.2.1 (July 11, 2025)
+
+SECURITY
+
+* Added support for CORS (strict, development, disabled), default mode is strict. See [#108](https://github.com/hashicorp/terraform-mcp-server/pull/108)
+* Added support for CORS allowed origins, default is empty. See [#108](https://github.com/hashicorp/terraform-mcp-server/pull/108)
+* Added support for stateless streamable HTTP mode, see [#108](https://github.com/hashicorp/terraform-mcp-server/pull/108)
+
+IMPROVEMENTS
+
+* Improved the HTTP retry to the registry. See [#109](https://github.com/hashicorp/terraform-mcp-server/pull/109)
+
 ## 0.2.0 (July 3, 2025)
 
 SECURITY

README.md

@@ -143,12 +143,29 @@ The following sets of tools are available:
 
 | Toolset     | Tool                   | Description                                                                                                                                                                                                                                                    |
 |-------------|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `providers` | `resolve_provider_doc_id` | Queries the Terraform Registry to find and list available documentation for a specific provider using the specified `service_slug`. Returns a list of provider document IDs with their titles and categories for resources, data sources, functions, or guides. |
-| `providers` | `get_provider_docs`      | Fetches the complete documentation content for a specific provider resource, data source, or function using a document ID obtained from the `resolve_provider_doc_id` tool. Returns the raw documentation in markdown format.                                     |
+| `providers` | `search_providers` | Queries the Terraform Registry to find and list available documentation for a specific provider using the specified `service_slug`. Returns a list of provider document IDs with their titles and categories for resources, data sources, functions, or guides. |
+| `providers` | `get_provider_details`      | Fetches the complete documentation content for a specific provider resource, data source, or function using a document ID obtained from the `search_providers` tool. Returns the raw documentation in markdown format.                                     |
 | `modules`   | `search_modules`        | Searches the Terraform Registry for modules based on specified `module_query` with pagination. Returns a list of module IDs with their names, descriptions, download counts, verification status, and publish dates                                             |
-| `modules`   | `module_details`        | Retrieves detailed documentation for a module using a module ID obtained from the `search_modules` tool including inputs, outputs, configuration, submodules, and examples.                                                                                     |
+| `modules`   | `get_module_details`        | Retrieves detailed documentation for a module using a module ID obtained from the `search_modules` tool including inputs, outputs, configuration, submodules, and examples.                                                                                     |
 | `policies`  | `search_policies`       | Queries the Terraform Registry to find and list the appropriate Sentinel Policy based on the provided query `policy_query`. Returns a list of matching policies with terraform_policy_id(s) with their name, title and download counts.                             |
-| `policies`  | `policy_details`        | Retrieves detailed documentation for a policy set using a terraform_policy_id obtained from the `search_policies` tool including policy readme and implementation details.                                                                                        |
+| `policies`  | `get_policy_details`        | Retrieves detailed documentation for a policy set using a terraform_policy_id obtained from the `search_policies` tool including policy readme and implementation details.                                                                                        |
+
+## Resource Configuration
+
+### Available resources
+
+| Resource URI | Description |
+|--------------|-------------|
+| `/terraform/style-guide` | Terraform Style Guide - Provides access to the official Terraform style guide documentation in markdown format |
+| `/terraform/module-development` | Terraform Module Development Guide - Comprehensive guide covering module composition, structure, providers, publishing, and refactoring best practices |
+
+### Available Resource Templates
+
+| Resouce Template URI | Description |
+|--------------|-------------|
+| `/terraform/providers/{namespace}/name/{name}/version/{version}` | Provider Resource Template - Dynamically retrieves detailed documentation and overview for any Terraform provider by namespace, name, and version |
+
+
 ### Install from source
 
 Use the latest release version:

e2e/e2e_test.go

@@ -89,25 +89,25 @@ func runTestSuite(t *testing.T, client mcpClient.MCPClient, transportName string
 		require.Equal(t, "terraform-mcp-server", result.ServerInfo.Name)
 	})
 
-	for _, testCase := range providerTestCases {
-		t.Run(fmt.Sprintf("%s_resolve_provider_doc_id/%s", transportName, testCase.TestName), func(t *testing.T) {
+	for _, testCase := range searchProviderTestCases {
+		t.Run(fmt.Sprintf("%s_search_providers/%s", transportName, testCase.TestName), func(t *testing.T) {
 			ensureClientInitialized(t, client)
-			t.Logf("TOOL resolve_provider_doc_id %s", testCase.TestDescription)
+			t.Logf("TOOL search_providers %s", testCase.TestDescription)
 			t.Logf("Test payload: %v", testCase.TestPayload)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 			defer cancel()
 
 			request := mcp.CallToolRequest{}
-			request.Params.Name = "resolve_provider_doc_id"
+			request.Params.Name = "search_providers"
 			request.Params.Arguments = testCase.TestPayload
 
 			response, err := client.CallTool(ctx, request)
 			if testCase.TestShouldFail {
-				require.Error(t, err, "expected to call 'resolve_provider_doc_id' tool with error")
+				require.Error(t, err, "expected to call 'search_providers' tool with error")
 				t.Logf("Error: %v", err)
 			} else {
-				require.NoError(t, err, "expected to call 'resolve_provider_doc_id' tool successfully")
+				require.NoError(t, err, "expected to call 'search_providers' tool successfully")
 				require.False(t, response.IsError, "expected result not to be an error")
 				require.Len(t, response.Content, 1, "expected content to have one item")
 
@@ -129,25 +129,25 @@ func runTestSuite(t *testing.T, client mcpClient.MCPClient, transportName string
 		})
 	}
 
-	for _, testCase := range providerDocsTestCases {
-		t.Run(fmt.Sprintf("%s_get_provider_docs/%s", transportName, testCase.TestName), func(t *testing.T) {
+	for _, testCase := range providerDetailsTestCases {
+		t.Run(fmt.Sprintf("%s_get_provider_details/%s", transportName, testCase.TestName), func(t *testing.T) {
 			ensureClientInitialized(t, client)
-			t.Logf("TOOL get_provider_docs %s", testCase.TestDescription)
+			t.Logf("TOOL get_provider_details %s", testCase.TestDescription)
 			t.Logf("Test payload: %v", testCase.TestPayload)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 			defer cancel()
 
 			request := mcp.CallToolRequest{}
-			request.Params.Name = "get_provider_docs"
+			request.Params.Name = "get_provider_details"
 			request.Params.Arguments = testCase.TestPayload
 
 			response, err := client.CallTool(ctx, request)
 			if testCase.TestShouldFail {
-				require.Error(t, err, "expected to call 'get_provider_docs' tool with error")
+				require.Error(t, err, "expected to call 'get_provider_details' tool with error")
 				t.Logf("Error: %v", err)
 			} else {
-				require.NoError(t, err, "expected to call 'get_provider_docs' tool successfully")
+				require.NoError(t, err, "expected to call 'get_provider_details' tool successfully")
 				require.False(t, response.IsError, "expected result not to be an error")
 				require.Len(t, response.Content, 1, "expected content to have one item")
 
@@ -192,24 +192,24 @@ func runTestSuite(t *testing.T, client mcpClient.MCPClient, transportName string
 	}
 
 	for _, testCase := range moduleDetailsTestCases {
-		t.Run(fmt.Sprintf("%s_module_details/%s", transportName, testCase.TestName), func(t *testing.T) {
+		t.Run(fmt.Sprintf("%s_get_module_details/%s", transportName, testCase.TestName), func(t *testing.T) {
 			ensureClientInitialized(t, client)
-			t.Logf("TOOL module_details %s", testCase.TestDescription)
+			t.Logf("TOOL get_module_details %s", testCase.TestDescription)
 			t.Logf("Test payload: %v", testCase.TestPayload)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 			defer cancel()
 
 			request := mcp.CallToolRequest{}
-			request.Params.Name = "module_details"
+			request.Params.Name = "get_module_details"
 			request.Params.Arguments = testCase.TestPayload
 
 			response, err := client.CallTool(ctx, request)
 			if testCase.TestShouldFail {
-				require.Error(t, err, "expected to call 'module_details' tool with error")
+				require.Error(t, err, "expected to call 'get_module_details' tool with error")
 				t.Logf("Error: %v", err)
 			} else {
-				require.NoError(t, err, "expected to call 'module_details' tool successfully")
+				require.NoError(t, err, "expected to call 'get_module_details' tool successfully")
 				require.False(t, response.IsError, "expected result not to be an error")
 				require.Len(t, response.Content, 1, "expected content to have one item")
 
@@ -265,24 +265,24 @@ func runTestSuite(t *testing.T, client mcpClient.MCPClient, transportName string
 	}
 
 	for _, testCase := range policyDetailsTestCases {
-		t.Run("CallTool policy_details", func(t *testing.T) {
+		t.Run("CallTool get_policy_details", func(t *testing.T) {
 			// t.Parallel()
-			t.Logf("TOOL policy_details %s", testCase.TestDescription)
+			t.Logf("TOOL get_policy_details %s", testCase.TestDescription)
 			t.Logf("Test payload: %v", testCase.TestPayload)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 			defer cancel()
 
 			request := mcp.CallToolRequest{}
-			request.Params.Name = "policy_details"
+			request.Params.Name = "get_policy_details"
 			request.Params.Arguments = testCase.TestPayload
 
 			response, err := client.CallTool(ctx, request)
 			if testCase.TestShouldFail {
-				require.Error(t, err, "expected to call 'policy_details' tool with error")
+				require.Error(t, err, "expected to call 'get_policy_details' tool with error")
 				t.Logf("Error: %v", err)
 			} else {
-				require.NoError(t, err, "expected to call 'policy_details' tool successfully")
+				require.NoError(t, err, "expected to call 'get_policy_details' tool successfully")
 				require.False(t, response.IsError, "expected result not to be an error")
 				require.Len(t, response.Content, 1, "expected content to have at least one item")
 
@@ -297,6 +297,74 @@ func runTestSuite(t *testing.T, client mcpClient.MCPClient, transportName string
 		})
 	}
 
+	for _, testCase := range getLatestModuleVersionTestCases {
+		t.Run(fmt.Sprintf("%s_get_latest_module_version/%s", transportName, testCase.TestName), func(t *testing.T) {
+			ensureClientInitialized(t, client)
+			t.Logf("TOOL get_latest_module_version %s", testCase.TestDescription)
+			t.Logf("Test payload: %v", testCase.TestPayload)
+
+			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+			defer cancel()
+
+			request := mcp.CallToolRequest{}
+			request.Params.Name = "get_latest_module_version"
+			request.Params.Arguments = testCase.TestPayload
+
+			response, err := client.CallTool(ctx, request)
+			if testCase.TestShouldFail {
+				require.Error(t, err, "expected to call 'get_latest_module_version' tool with error")
+				t.Logf("Error: %v", err)
+			} else {
+				require.NoError(t, err, "expected to call 'get_latest_module_version' tool successfully")
+				require.False(t, response.IsError, "expected result not to be an error")
+				require.Len(t, response.Content, 1, "expected content to have one item")
+
+				textContent, ok := response.Content[0].(mcp.TextContent)
+				require.True(t, ok, "expected content to be of type TextContent")
+				t.Logf("Module version: %s", textContent.Text)
+
+				// Verify that the response contains a valid version string
+				require.NotEmpty(t, textContent.Text, "expected version string to not be empty")
+				// Basic version format validation (should contain at least one dot for semantic versioning)
+				require.Contains(t, textContent.Text, ".", "expected version to contain at least one dot")
+			}
+		})
+	}
+
+	for _, testCase := range getLatestProviderVersionTestCases {
+		t.Run(fmt.Sprintf("%s_get_latest_provider_version/%s", transportName, testCase.TestName), func(t *testing.T) {
+			ensureClientInitialized(t, client)
+			t.Logf("TOOL get_latest_provider_version %s", testCase.TestDescription)
+			t.Logf("Test payload: %v", testCase.TestPayload)
+
+			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+			defer cancel()
+
+			request := mcp.CallToolRequest{}
+			request.Params.Name = "get_latest_provider_version"
+			request.Params.Arguments = testCase.TestPayload
+
+			response, err := client.CallTool(ctx, request)
+			if testCase.TestShouldFail {
+				require.Error(t, err, "expected to call 'get_latest_provider_version' tool with error")
+				t.Logf("Error: %v", err)
+			} else {
+				require.NoError(t, err, "expected to call 'get_latest_provider_version' tool successfully")
+				require.False(t, response.IsError, "expected result not to be an error")
+				require.Len(t, response.Content, 1, "expected content to have one item")
+
+				textContent, ok := response.Content[0].(mcp.TextContent)
+				require.True(t, ok, "expected content to be of type TextContent")
+				t.Logf("Provider version: %s", textContent.Text)
+
+				// Verify that the response contains a valid version string
+				require.NotEmpty(t, textContent.Text, "expected version string to not be empty")
+				// Basic version format validation (should contain at least one dot for semantic versioning)
+				require.Contains(t, textContent.Text, ".", "expected version to contain at least one dot")
+			}
+		})
+	}
+
 }
 
 // createStdioClient creates a stdio-based MCP client