Merge branch 'main' into feature/auth-tfe

Author: gautambaghel

.gitignore

@@ -3,4 +3,5 @@ cmd/terraform-mcp-server/terraform-mcp-server/terraform-mcp-server
 cmd/mcpcurl/mcpcurl
 *.log
 .vscode/
-dist/
+dist/
+bin/*

Makefile

@@ -23,7 +23,7 @@ all: build
 ARCH     = $(shell A=$$(uname -m); [ $$A = x86_64 ] && A=amd64; echo $$A)
 OS       = $(shell uname | tr [[:upper:]] [[:lower:]])
 build:
-	CGO_ENABLED=0 GOARCH=$(ARCH) GOOS=$(OS) $(GO) build $(LDFLAGS) -o $(BINARY_NAME) ./cmd/terraform-mcp-server
+	CGO_ENABLED=0 GOARCH=$(ARCH) GOOS=$(OS) $(GO) build $(LDFLAGS) -o bin/$(BINARY_NAME) ./cmd/terraform-mcp-server
 
 crt-build:
 	@mkdir -p $(TARGET_DIR)

pkg/tools/resolve_provider_doc_id.go

@@ -116,7 +116,7 @@ func resolveProviderDocIDHandler(ctx context.Context, request mcp.CallToolReques
 
 	var builder strings.Builder
 	builder.WriteString(fmt.Sprintf("Available Documentation (top matches) for %s in Terraform provider %s/%s version: %s\n\n", providerDetail.ProviderDataType, providerDetail.ProviderNamespace, providerDetail.ProviderName, providerDetail.ProviderVersion))
-	builder.WriteString("Each result includes:\n- providerDocID: tfprovider-compatible identifier\n- Title: Service or resource name\n- Category: Type of document\n")
+	builder.WriteString("Each result includes:\n- providerDocID: tfprovider-compatible identifier\n- Title: Service or resource name\n- Category: Type of document\n- Description: Brief summary of the document\n")
 	builder.WriteString("For best results, select libraries based on the service_slug match and category of information requested.\n\n---\n\n")
 
 	contentAvailable := false
@@ -126,7 +126,11 @@ func resolveProviderDocIDHandler(ctx context.Context, request mcp.CallToolReques
 			cs_pn, err_pn := utils.ContainsSlug(fmt.Sprintf("%s_%s", providerDetail.ProviderName, doc.Slug), serviceSlug)
 			if (cs || cs_pn) && err == nil && err_pn == nil {
 				contentAvailable = true
-				builder.WriteString(fmt.Sprintf("- providerDocID: %s\n- Title: %s\n- Category: %s\n---\n", doc.ID, doc.Title, doc.Category))
+				descriptionSnippet, err := getContentSnippet(registryClient, doc.ID, logger)
+				if err != nil {
+					logger.Warnf("Error fetching content snippet for provider doc ID: %s: %v", doc.ID, err)
+				}
+				builder.WriteString(fmt.Sprintf("- providerDocID: %s\n- Title: %s\n- Category: %s\n- Description: %s\n---\n", doc.ID, doc.Title, doc.Category, descriptionSnippet))
 			}
 		}
 	}
@@ -218,11 +222,46 @@ func get_provider_docsV2(registryClient *http.Client, providerDetail client.Prov
 
 	var builder strings.Builder
 	builder.WriteString(fmt.Sprintf("Available Documentation (top matches) for %s in Terraform provider %s/%s version: %s\n\n", providerDetail.ProviderDataType, providerDetail.ProviderNamespace, providerDetail.ProviderName, providerDetail.ProviderVersion))
-	builder.WriteString("Each result includes:\n- providerDocID: tfprovider-compatible identifier\n- Title: Service or resource name\n- Category: Type of document\n")
+	builder.WriteString("Each result includes:\n- providerDocID: tfprovider-compatible identifier\n- Title: Service or resource name\n- Category: Type of document\n- Description: Brief summary of the document\n")
 	builder.WriteString("For best results, select libraries based on the service_slug match and category of information requested.\n\n---\n\n")
 	for _, doc := range docs {
-		builder.WriteString(fmt.Sprintf("- providerDocID: %s\n- Title: %s\n- Category: %s\n---\n", doc.ID, doc.Attributes.Title, doc.Attributes.Category))
+		descriptionSnippet, err := getContentSnippet(registryClient, doc.ID, logger)
+		if err != nil {
+			logger.Warnf("Error fetching content snippet for provider doc ID: %s: %v", doc.ID, err)
+		}
+		builder.WriteString(fmt.Sprintf("- providerDocID: %s\n- Title: %s\n- Category: %s\n- Description: %s\n---\n", doc.ID, doc.Attributes.Title, doc.Attributes.Category, descriptionSnippet))
 	}
 
 	return builder.String(), nil
 }
+
+func getContentSnippet(registryClient *http.Client, docID string, logger *log.Logger) (string, error) {
+	docContent, err := client.SendRegistryCall(registryClient, "GET", fmt.Sprintf("provider-docs/%s", docID), logger, "v2")
+	if err != nil {
+		return "", utils.LogAndReturnError(logger, fmt.Sprintf("error fetching provider-docs/%s within getContentSnippet", docID), err)
+	}
+	var docDescription client.ProviderResourceDetails
+	if err := json.Unmarshal(docContent, &docDescription); err != nil {
+		return "", utils.LogAndReturnError(logger, fmt.Sprintf("error unmarshalling provider-docs/%s within getContentSnippet", docID), err)
+	}
+
+	content := docDescription.Data.Attributes.Content
+	// Try to extract description from markdown content
+	desc := ""
+	if start := strings.Index(content, "description: |-"); start != -1 {
+		if end := strings.Index(content[start:], "\n---"); end != -1 {
+			substring := content[start+len("description: |-") : start+end]
+			trimmed := strings.TrimSpace(substring)
+			desc = strings.ReplaceAll(trimmed, "\n", " ")
+		} else {
+			substring := content[start+len("description: |-"):]
+			trimmed := strings.TrimSpace(substring)
+			desc = strings.ReplaceAll(trimmed, "\n", " ")
+		}
+	}
+
+	if len(desc) > 300 {
+		return desc[:300] + "...", nil
+	}
+	return desc, nil
+}