Skip to content

feat(connectors): add Terraform remote MCP connector - #286

Open
gautambaghel wants to merge 3 commits into
aws:mainfrom
gautambaghel:feat/terraform-remote-mcp-connector
Open

gautambaghel wants to merge 3 commits into
aws:mainfrom
gautambaghel:feat/terraform-remote-mcp-connector

Conversation

@gautambaghel

@gautambaghel gautambaghel commented Nov 19, 2026 •

Copy link
Copy Markdown

Description

Adds a partner-managed Terraform connector for HashiCorp's hosted remote Terraform MCP server, plus a customer setup guide covering bearer-token authentication, HCP Terraform access boundaries, beta/region limitations, and read-only-first use. This PR adds no Agent Skills or skill files.

The new connector starts at 1.0.0. It is not added to connectors/releases.yaml, which is maintained by AWS maintainers and controls production promotion.

Type of change

  • Documentation or infrastructure change

Required before review

  • No internal-only or proprietary content — no customer data, credentials, AWS account identifiers, or internal-only URLs are included. The logo files are official public HashiCorp product assets sourced from its brand guidelines.
  • README is complete — prerequisites, setup steps, security boundaries, troubleshooting, and sample prompts are included.
  • Named owner — gautambaghel is listed as the connector maintainer.

Testing

  • python3 -m unittest discover -s tests -v — 348 tests passed.
  • mkdocs build --strict — passed.
  • python3 .github/scripts/validate_skills.py --base-ref upstream/main — 103 skills checked, 0 errors. The local shallow clone cannot check previously retired skill paths; no skills are changed here.
  • python3 .github/scripts/scan_aws_identifiers.py --base-ref upstream/main --head-ref HEAD — 0 findings.
  • Connector catalog build recognizes Terraform as a partner-managed 1.0.0 connector; light and dark logos pass the repository's logo safety check.
  • An unauthenticated MCP initialize request to https://mcp.terraform.io/mcp returned 401 Authorization bearer token is required, as expected.
  • Authenticated read-only smoke test using a locally stored HCP Terraform token: MCP initialize, tools/list (56 tools), whoami, list_terraform_orgs, get_token_permissions, list_workspaces, and a public AWS provider lookup all passed. Credentials and returned identity, organization, permission, and workspace data were not included in the PR. No mutative tools, runs, or applies were invoked.
  • git diff --check — passed.

SME review

Paul Thrasher (@thrashr888), HCP Terraform, approved commit cceb282. That approval predates this follow-up commit, which only removes the optional Agent Skills section and updates the maintainer username.

Connectors

License confirmation

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache License 2.0.

Closes #285

@gautambaghel

Copy link
Copy Markdown
Author

@thrashr888 — would you please review this connector for technical accuracy on the remote Terraform MCP and HCP Terraform behavior? In particular, please verify the US-only remote endpoint scope, bearer-token flow, beta caveat, and the documented read/write and run-approval boundaries. A comment or review identifying what you checked would provide the requested SME sign-off. Thank you!

@thrashr888 thrashr888 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is good. i approve. 👍🏻

@yeremyjt yeremyjt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Gautam! This passes our connector checks and our publish step on this commit. Two requests below: one on the README and one on maintainers.

Comment thread connectors/terraform/README.md Outdated
Comment on lines +43 to +61
## Optional: install HashiCorp Terraform Agent Skills

HashiCorp's Terraform Agent Skills are separate from this connector and are not installed into AWS DevOps Agent by connecting it. Browse the official [HashiCorp Agent Skills repository](https://github.com/hashicorp/agent-skills) and its [Terraform skill catalog](https://github.com/hashicorp/agent-skills/blob/main/SKILLS.md), then install skills into a compatible client as needed. For example:

```sh
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-style-guide
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-test
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-stacks
```

For Claude Code, install the Terraform plugin bundle with:

```sh
claude plugin marketplace add hashicorp/agent-skills
claude plugin install terraform@hashicorp
```

See the Agent Skills repository for current instructions for other compatible clients. The skills are maintained and licensed by HashiCorp under that repository's license; this connector does not copy or redistribute their content.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this section come out? The console shows this README next to the connection form, so it should cover only the steps in HCP Terraform before connecting (Section 5 of the Connector Guide for Partners). DevOps Agent can only read skills from this repository's skills/ directory, so skills installed in other clients don't reach it. If you'd like DevOps Agent to use Terraform skills, you can add them under skills/terraform-<skill>/ and list them in connector.yaml (Section 6).

Suggested change
## Optional: install HashiCorp Terraform Agent Skills
HashiCorp's Terraform Agent Skills are separate from this connector and are not installed into AWS DevOps Agent by connecting it. Browse the official [HashiCorp Agent Skills repository](https://github.com/hashicorp/agent-skills) and its [Terraform skill catalog](https://github.com/hashicorp/agent-skills/blob/main/SKILLS.md), then install skills into a compatible client as needed. For example:
```sh
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-style-guide
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-test
npx skills add hashicorp/agent-skills/plugins/terraform/skills/terraform-stacks
```
For Claude Code, install the Terraform plugin bundle with:
```sh
claude plugin marketplace add hashicorp/agent-skills
claude plugin install terraform@hashicorp
```
See the Agent Skills repository for current instructions for other compatible clients. The skills are maintained and licensed by HashiCorp under that repository's license; this connector does not copy or redistribute their content.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the optional Agent Skills install section. I left the rest of the README unchanged.

Comment thread connectors/terraform/connector.yaml Outdated
docs_url: https://developer.hashicorp.com/terraform/mcp-server/deploy/remote-mcp
support_url: https://www.ibm.com/mysupport
contact_email: hashicorp.security@ibm.com
maintainers: [hashicorp/team-agent-skills-ecosystem]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you list individual GitHub users here instead of the team? This is a new requirement from our security team: maintainers holds only GitHub usernames, not teams, and the pull request author must be one of them. You can add up to four more HashiCorp maintainers by username.

Suggested change
maintainers: [hashicorp/team-agent-skills-ecosystem]
maintainers: [gautambaghel]

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated maintainers to [gautambaghel], an individual GitHub username and the PR author.

@gautambaghel

Copy link
Copy Markdown
Author

Thanks for the review @yeremyjt, I made the changes as you requested!

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[request]: Add a HashiCorp Terraform remote MCP connector

3 participants