chore: remove toolchain directive from go.mod (#482 )

2023-10-11 17:33:51 -07:00
136 changed files with 3214 additions and 5638 deletions
@@ -9,36 +9,12 @@ updates:
  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
-      # Check for updates to GitHub Actions every Sunday
-      interval: "weekly"
-      day: "sunday"
-    groups:
-      # Group all GitHub Actions updates into a single PR
-      actions:
-        patterns:
-          - "*"
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

+  # Maintain dependencies for Go modules
  - package-ecosystem: "gomod"
-    directories: 
-      - "/"
-      - "/plugins/kms/mains/alicloudkms"
-      - "/plugins/kms/mains/awskms"
-      - "/plugins/kms/mains/azurekeyvault"
-      - "/plugins/kms/mains/gcpckms"
-      - "/plugins/kms/mains/ocikms"
-      - "/plugins/kms/mains/transit"
+    directory: "/"
    schedule:
-      # Check for updates to Go modules every Sunday
-      interval: "weekly"
-      day: "sunday"
-    groups:
-      # Group all Go module updates into one PR for version updates
-      # and one for security updates.
-      go:
-        patterns:
-          - "*"
-        applies-to: "version-updates"
-      go-security:
-        patterns:
-          - "*"
-        applies-to: "security-updates"
+      # Check for updates to Go modules every weekday
+      interval: "daily"
@@ -1,11 +0,0 @@
-## PCI review checklist
-
-<!-- heimdall_github_prtemplate:grc-pci_dss-2024-01-05 -->
-
- [ ] I have documented a clear reason for, and description of, the change I am making.
-
- [ ] If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
-
- [ ] If applicable, I've documented the impact of any changes to security controls.
-
-  Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.
@@ -6,9 +6,9 @@ permissions:

 jobs:
  actionlint:
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(vars.RUNNER) }}
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
      - name: Check workflow files
        uses: docker://docker.mirror.hashicorp.services/rhysd/actionlint@sha256:02ccb6d91e4cb4a7b21eb99d5274d257e81ae667688d730e89d7ea0d6d35db91
        with:
@@ -1,195 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-#
-# This workflow builds the product for all supported platforms and uploads the resulting
-# binaries as Actions artifacts. The workflow also uploads a build metadata file
-# (metadata.json) -- and a Terraform Registry manifest file (terraform-registry-manifest.json).
-#
-# Reference: https://github.com/hashicorp/terraform-provider-crt-example/blob/main/.github/workflows/README.md
-#
-
-name: build
-
-# We default to running this workflow on every push to every branch.
-# This provides fast feedback when build issues occur, so they can be
-# fixed prior to being merged to the main branch.
-#
-# If you want to opt out of this, and only run the build on certain branches
-# please refer to the documentation on branch filtering here:
-#
-#   https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore
-#
-on: [workflow_dispatch, push]
-
-env:
-  PKG_NAME: "terraform-provider-boundary"
-
-jobs:
-  # Detects the Go version to use for builds.
-  get-go-version:
-    name: "Detect Go toolchain version"
-    runs-on: ubuntu-latest
-    outputs:
-      go-version: ${{ steps.get-go-version.outputs.go-version }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Detect Go version
-        id: get-go-version
-        # We use .go-version as our source of truth for current Go version,
-        # because "goenv" can react to it automatically.
-        run: |
-          echo "Building with Go $(cat .go-version)"
-          echo "go-version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
-      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-        with:
-          go-version: "${{ steps.get-go-version.outputs.go-version }}"
-          cache: false
-
-  # Parses the version/VERSION file. Reference: https://github.com/hashicorp/actions-set-product-version/blob/main/README.md
-  #
-  # > This action should be implemented in product repo `build.yml` files. The action is intended to grab the version
-  # > from the version file at the beginning of the build, then passes those versions (along with metadata, where
-  # > necessary) to any workflow jobs that need version information.
-  set-product-version:
-    name: "Parse version file"
-    runs-on: ubuntu-latest
-    outputs:
-      product-version: ${{ steps.set-product-version.outputs.product-version }}
-      product-base-version: ${{ steps.set-product-version.outputs.base-product-version }}
-      product-prerelease-version: ${{ steps.set-product-version.outputs.prerelease-product-version }}
-      product-minor-version: ${{ steps.set-product-version.outputs.minor-product-version }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Set variables
-        id: set-product-version
-        uses: hashicorp/actions-set-product-version@v2
-
-  # Creates metadata.json file containing build metadata for consumption by CRT workflows.
-  #
-  # Reference: https://github.com/hashicorp/actions-generate-metadata/blob/main/README.md
-  generate-metadata-file:
-    needs: set-product-version
-    runs-on: ubuntu-latest
-    outputs:
-      filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
-    steps:
-      - name: "Checkout directory"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Generate metadata file
-        id: generate-metadata-file
-        uses: hashicorp/actions-generate-metadata@v1
-        with:
-          version: ${{ needs.set-product-version.outputs.product-version }}
-          product: ${{ env.PKG_NAME }}
-          repositoryOwner: "hashicorp"
-      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: metadata.json
-          path: ${{ steps.generate-metadata-file.outputs.filepath }}
-
-  # Uploads an Actions artifact named terraform-registry-manifest.json.zip.
-  #
-  # The artifact contains a single file with a filename that Terraform Registry expects
-  # (example: terraform-provider-crt-example_2.3.6-alpha1_manifest.json). The file contents
-  # are identical to the terraform-registry-manifest.json file in the source repository.
-  upload-terraform-registry-manifest-artifact:
-    needs: set-product-version
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout directory"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: ${{ env.PKG_NAME }}
-      - name: "Copy manifest from checkout directory to a file with the desired name"
-        id: terraform-registry-manifest
-        run: |
-          name="${{ env.PKG_NAME }}"
-          version="${{ needs.set-product-version.outputs.product-version }}"
-
-          source="${name}/terraform-registry-manifest.json"
-          destination="${name}_${version}_manifest.json"
-
-          cp "$source" "$destination"
-          echo "filename=$destination" >> "$GITHUB_OUTPUT"
-      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
-        with:
-          name: terraform-registry-manifest.json
-          path: ${{ steps.terraform-registry-manifest.outputs.filename }}
-          if-no-files-found: error
-
-  # Builds the product for supported platforms.
-  #
-  # With `reproducible: report`, this job also reports whether the build is reproducible,
-  # but does not enforce it.
-  #
-  # Reference: https://github.com/hashicorp/actions-go-build/blob/main/README.md
-  build:
-    needs:
-      - get-go-version
-      - set-product-version
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        goos: [freebsd, windows, linux, darwin]
-        goarch: ["386", "amd64", "arm", "arm64"]
-        exclude:
-          - goos: freebsd
-            goarch: arm64
-          - goos: windows
-            goarch: arm64
-          - goos: windows
-            goarch: arm
-          - goos: darwin
-            goarch: 386
-          - goos: darwin
-            goarch: arm
-
-    name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: hashicorp/actions-go-build@v1
-        env:
-          CGO_ENABLED: 0
-          BASE_VERSION: ${{ needs.set-product-version.outputs.product-base-version }}
-          PRERELEASE_VERSION: ${{ needs.set-product-version.outputs.product-prerelease-version}}
-          METADATA_VERSION: ${{ env.METADATA }}
-        with:
-          bin_name: "${{ env.PKG_NAME }}_v${{ needs.set-product-version.outputs.product-version }}_x5"
-          product_name: ${{ env.PKG_NAME }}
-          product_version: ${{ needs.set-product-version.outputs.product-version }}
-          go_version: ${{ needs.get-go-version.outputs.go-version }}
-          os: ${{ matrix.goos }}
-          arch: ${{ matrix.goarch }}
-          reproducible: report
-          instructions: |
-            go mod download && ./scripts/plugins-all.sh
-            go build \
-              -o "$BIN_PATH" \
-              -trimpath \
-              -buildvcs=false \
-              -ldflags "-s -w -X 'main.version=${{ needs.set-product-version.outputs.product-version }}'"
-            cp LICENSE "$TARGET_DIR/LICENSE.txt"
-
-  whats-next:
-    needs:
-      - build
-      - generate-metadata-file
-      - upload-terraform-registry-manifest-artifact
-    runs-on: ubuntu-latest
-    name: "What's next?"
-    steps:
-      - name: "Write a helpful summary"
-        run: |
-          github_dot_com="${{ github.server_url }}"
-          owner_with_name="${{ github.repository }}"
-          ref="${{ github.ref }}"
-
-          {
-            echo "### What's next?"
-            echo "#### For a release branch (see \`.release/ci.hcl\`)"
-            echo "After this \`build\` workflow run completes succesfully, you can expect the CRT \`prepare\` workflow to begin momentarily."
-            echo "To find the \`prepare\` workflow run, [view the checks for this commit]($github_dot_com/$owner_with_name/commits/$ref)"
-          }  >> "$GITHUB_STEP_SUMMARY"
-
@@ -22,7 +22,7 @@ jobs:
      id: boundary-team-role
      run: |
        TEAM="boundary"
-        ROLE="$(gh api orgs/hashicorp/teams/${TEAM}/memberships/${{ github.actor }} | jq -r '.role | select(.!=null)')"
+        ROLE="$(hub api orgs/hashicorp/teams/${TEAM}/memberships/${{ github.actor }} | jq -r '.role | select(.!=null)')"
        if [[ -n "${ROLE}" ]]; then
          echo "Actor ${{ github.actor }} is a ${TEAM} team member, skipping ticket creation"
        else
@@ -32,6 +32,13 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ secrets.JIRA_SYNC_GITHUB_TOKEN }}

+    - name: Login
+      uses: atlassian/gajira-login@45fd029b9f1d6d8926c6f04175aa80c0e42c9026 # v3.0.1
+      env:
+        JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+        JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+        JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+
    - name: Set ticket type
      if: github.event.action == 'opened' && !steps.boundary-team-role.outputs.role
      id: set-ticket-type
@@ -45,10 +52,6 @@ jobs:
    - name: Create ticket
      if: github.event.action == 'opened' && !steps.boundary-team-role.outputs.role
      uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
-      env:
-        JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
-        JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
-        JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
      with:
        project: ICU
        issuetype: "GH Issue"
@@ -61,10 +64,6 @@ jobs:
      if: github.event.action != 'opened'
      id: search
      uses: tomhjp/gh-action-jira-search@04700b457f317c3e341ce90da5a3ff4ce058f2fa # v0.2.2
-      env:
-        JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
-        JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
-        JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
      with:
        # cf[10089] is Issue Link custom field
        jql: 'issuetype = "GH Issue" and cf[10089]="${{ github.event.issue.html_url || github.event.pull_request.html_url }}"'
@@ -72,38 +71,20 @@ jobs:
    - name: Sync comment
      if: github.event.action == 'created' && steps.search.outputs.issue
      uses: tomhjp/gh-action-jira-comment@6eb6b9ead70221916b6badd118c24535ed220bd9 # v0.2.0
-      env:
-        JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
-        JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
-        JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
      with:
        issue: ${{ steps.search.outputs.issue }}
        comment: "${{ github.actor }} ${{ github.event.review.state || 'commented' }}:\n\n${{ github.event.comment.body || github.event.review.body }}\n\n${{ github.event.comment.html_url || github.event.review.html_url }}"

-    - name: Transitions
-      id: transitions
-      if: steps.search.outputs.issue
-      run: |
-        if [[ "${{ github.event.action }}" == "closed" || "${{ github.event.action }}" == "deleted" ]]; then
-          echo "Closing ticket"
-          echo "name=Done" >> "$GITHUB_OUTPUT"
-        elif [[ "${{ github.event.action }}" == "reopened" ]]; then
-          echo "Reopening ticket"
-          echo "name='Reopen'" >> "$GITHUB_OUTPUT"
-        fi
+    - name: Close ticket
+      if: (github.event.action == 'closed' || github.event.action == 'deleted') && steps.search.outputs.issue
+      uses: atlassian/gajira-transition@38fc9cd61b03d6a53dd35fcccda172fe04b36de3 # v3
+      with:
+        issue: ${{ steps.search.outputs.issue }}
+        transition: Done

-    # Transition issue API reference: https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issues/#api-rest-api-3-issue-issueidorkey-transitions-post
-    - name: Transition ticket
-      if: steps.transitions.outputs.name
-      run: |
-        transitions="$(curl --silent \
-          --url "${{ secrets.JIRA_BASE_URL }}rest/api/3/issue/${{ steps.search.outputs.issue }}/transitions" \
-          --user "${{ secrets.JIRA_USER_EMAIL }}:${{ secrets.JIRA_API_TOKEN }}" \
-          --header "Accept: application/json")"
-        id="$(echo "${transitions}" | jq -r '.transitions[] | select(.name == "${{ steps.transitions.outputs.name }}") | .id')"
-        curl --silent \
-          --url "${{ secrets.JIRA_BASE_URL }}rest/api/3/issue/${{ steps.search.outputs.issue }}/transitions" \
-          --user "${{ secrets.JIRA_USER_EMAIL }}:${{ secrets.JIRA_API_TOKEN }}" \
-          --header "Accept: application/json" \
-          --header "Content-Type: application/json" \
-          --data "$(printf '{"transition": {"id": "%s"}}' "${id}")"
+    - name: Reopen ticket
+      if: github.event.action == 'reopened' && steps.search.outputs.issue
+      uses: atlassian/gajira-transition@38fc9cd61b03d6a53dd35fcccda172fe04b36de3 # v3
+      with:
+        issue: ${{ steps.search.outputs.issue }}
+        transition: "To Do"
@@ -1,43 +0,0 @@
-name: "make-gen-delta"
-on:
-  - workflow_dispatch
-  - push
-  - pull_request
-  - workflow_call
-
-permissions:
-  contents: read
-
-jobs:
-  make-gen-delta:
-    name: "Check for uncommitted changes from make gen"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: '0'
-      - name: Determine Go version
-        id: get-go-version
-        # We use .go-version as our source of truth for current Go
-        # version, because "goenv" can react to it automatically.
-        run: |
-          echo "Building with Go $(cat .go-version)"
-          echo "go-version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
-      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
-        with:
-          go-version: "${{ steps.get-go-version.outputs.go-version }}"
-      - name: Running go mod tidy
-        run: |
-          go mod tidy
-      - name: Install Dependencies
-        run: |
-          make tools
-      - name: Running make gen
-        run: |
-          make gen
-      - name: Check for changes
-        run: |
-          git diff --exit-code
-          git status --porcelain
-          test -z "$(git status --porcelain)"
@@ -0,0 +1,51 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+
+permissions:
+  contents: write
+
+jobs:
+  go-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.go-version.outputs.version }}
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - id: go-version
+        run: echo "name=version::$(cat ./.go-version)" >> "$GITHUB_OUTPUT"
+  release-notes:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        with:
+          fetch-depth: 0
+      - name: Generate Release Notes
+        run: sed -n -e "1{/# /d;}" -e "2{/^$/d;}" -e "/# $(git describe --abbrev=0 --exclude="$(git describe --abbrev=0 --match='v*.*.*' --tags)" --match='v*.*.*' --tags | tr -d v)/q;p" CHANGELOG.md > release-notes.txt
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        with:
+          name: release-notes
+          path: release-notes.txt
+          retention-days: 1
+  terraform-provider-release:
+    name: 'Terraform Provider Release'
+    needs: [go-version, release-notes]
+    uses: hashicorp/ghaction-terraform-provider-release/.github/workflows/hashicorp.yml@v2
+    secrets:
+      hc-releases-github-token: '${{ secrets.HASHI_RELEASES_GITHUB_TOKEN }}'
+      hc-releases-host-staging: '${{ secrets.HC_RELEASES_HOST_STAGING }}'
+      hc-releases-host-prod: '${{ secrets.HC_RELEASES_HOST_PROD }}'
+      hc-releases-key-prod: '${{ secrets.HC_RELEASES_KEY_PROD }}'
+      hc-releases-key-staging: '${{ secrets.HC_RELEASES_KEY_STAGING }}'
+      hc-releases-terraform-registry-sync-token: '${{ secrets.TF_PROVIDER_RELEASE_TERRAFORM_REGISTRY_SYNC_TOKEN }}'
+      setup-signore-github-token: '${{ secrets.HASHI_SIGNORE_GITHUB_TOKEN }}'
+      signore-client-id: '${{ secrets.SIGNORE_CLIENT_ID }}'
+      signore-client-secret: '${{ secrets.SIGNORE_CLIENT_SECRET }}'
+    with:
+      release-notes: true
+      setup-go-version: '${{ needs.go-version.outputs.version }}'
+      # Product Version (e.g. v1.2.3 or github.ref_name)
+      product-version: '${{ github.ref_name }}'
@@ -11,9 +11,9 @@ permissions:

 jobs:
  test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(vars.RUNNER) }}
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
      - name: Determine go version
        id: get-go-version
        # We use .go-version as our source of truth for current Go
@@ -22,17 +22,16 @@ jobs:
          echo "Building with Go $(cat .go-version)"
          echo "go-version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
        with:
          go-version: "${{ steps.get-go-version.outputs.go-version }}"
-          cache: false
      - name: Determine Go cache paths
        id: go-cache-paths
        run: |
          echo "go-build=$(go env GOCACHE)" >> "$GITHUB_OUTPUT"
          echo "go-mod=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
      - name: Set up Go modules cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
        with:
          path: |
            ${{ steps.go-cache-paths.outputs.go-build }}
@@ -1 +1 @@
-1.24.0
+1.21.1
@@ -0,0 +1,78 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+archives:
+  - files:
+      # Ensure only built binary is archived
+      - 'none*'
+    format: zip
+    name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+before:
+  hooks:
+    - 'go mod download'
+    - './scripts/plugins-all.sh'
+builds:
+  - # Binary naming only required for Terraform CLI 0.12
+    binary: '{{ .ProjectName }}_v{{ .Version }}_x5'
+    env:
+      - CGO_ENABLED=0
+    flags:
+      - -trimpath
+    goos:
+      - darwin
+      - freebsd
+      - linux
+      - windows
+    goarch:
+      - '386'
+      - amd64
+      - arm
+      - arm64
+    ignore:
+      - goarch: arm
+        goos: windows
+      - goarch: arm64
+        goos: freebsd
+      - goarch: arm64
+        goos: windows
+    ldflags:
+      - -s -w -X main.Version={{.Version}}
+    mod_timestamp: '{{ .CommitTimestamp }}'
+checksum:
+  algorithm: sha256
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+publishers:
+  - checksum: true
+    # Terraform CLI 0.10 - 0.11 perform discovery via HTTP headers on releases.hashicorp.com
+    # For providers which have existed since those CLI versions, exclude
+    # discovery by setting the protocol version headers to 5.
+    cmd: hc-releases upload -product {{ .ProjectName }} -version {{ .Version }} -file={{ .ArtifactPath }}={{ .ArtifactName }} -header=x-terraform-protocol-version=5 -header=x-terraform-protocol-versions=5.0
+    env:
+      - HC_RELEASES_HOST={{ .Env.HC_RELEASES_HOST }}
+      - HC_RELEASES_KEY={{ .Env.HC_RELEASES_KEY }}
+    extra_files:
+      - glob: 'terraform-registry-manifest.json'
+        name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+    name: upload
+    signature: true
+release:
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+  ids:
+    - none
+signs:
+  - args: ["sign", "--dearmor", "--file", "${artifact}", "--out", "${signature}"]
+    artifacts: checksum
+    cmd: signore
+    signature: ${artifact}.sig
+  - args: ["sign", "--dearmor", "--file", "${artifact}", "--out", "${signature}"]
+    artifacts: checksum
+    cmd: signore
+    id: key-id
+    signature: ${artifact}.72D7468F.sig
+snapshot:
+  name_template: "{{ .Tag }}-next"
@@ -1,96 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-# 
-# Reference: https://github.com/hashicorp/crt-core-helloworld/blob/main/.release/ci.hcl (private repository)
-# 
-# One way to validate this file, with a local build of the orchestrator (an internal repo):
-# 
-# $ GITHUB_TOKEN="not-used" orchestrator parse config -use-v2 -local-config=.release/ci.hcl
-
-schema = "2"
-
-project "terraform-provider-boundary" {
-  // team is currently unused and has no meaning
-  // but is required to be non-empty by CRT orchestator
-  team = "_UNUSED_"
-
-  slack {
-    notification_channel = "C01BWLSMJ03" // #proj-boundary-release-engineering
-  }
-
-  github {
-    organization     = "hashicorp"
-    repository       = "terraform-provider-boundary"
-    release_branches = ["main", "release/**"]
-  }
-}
-
-event "merge" {
-}
-
-event "build" {
-  action "build" {
-    depends = ["merge"]
-
-    organization = "hashicorp"
-    repository   = "terraform-provider-boundary"
-    workflow     = "build"
-  }
-}
-
-event "prepare" {
-  # `prepare` is the Common Release Tooling (CRT) artifact processing workflow.
-  # It prepares artifacts for potential promotion to staging and production.
-  # For example, it scans and signs artifacts.
-
-  depends = ["build"]
-
-  action "prepare" {
-    organization = "hashicorp"
-    repository   = "crt-workflows-common"
-    workflow     = "prepare"
-    depends      = ["build"]
-  }
-
-  notification {
-    on = "fail"
-  }
-}
-
-event "trigger-staging" {
-}
-
-event "promote-staging" {
-  action "promote-staging" {
-    organization = "hashicorp"
-    repository   = "crt-workflows-common"
-    workflow     = "promote-staging"
-    depends      = null
-    config       = "release-metadata.hcl"
-  }
-
-  depends = ["trigger-staging"]
-
-  notification {
-    on = "always"
-  }
-}
-
-event "trigger-production" {
-}
-
-event "promote-production" {
-  action "promote-production" {
-    organization = "hashicorp"
-    repository   = "crt-workflows-common"
-    workflow     = "promote-production"
-    depends      = null
-    config       = ""
-  }
-
-  depends = ["trigger-production"]
-
-  notification {
-    on = "always"
-  }
-}
@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: MPL-2.0

 url_source_repository      = "https://github.com/hashicorp/terraform-provider-boundary"
-url_project_website        = "https://registry.terraform.io/providers/hashicorp/boundary"
 url_license                = "https://github.com/hashicorp/terraform-provider-boundary/blob/main/LICENSE"
-url_release_notes          = "https://github.com/hashicorp/terraform-provider-boundary/blob/main/CHANGELOG.md"
@@ -1,14 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-#
-# Reference: https://github.com/hashicorp/security-scanner/blob/main/CONFIG.md#binary (private repository)
-
-binary {
-  secrets {
-    all = true
-  }
-  go_modules   = true
-  osv          = true
-  oss_index    = false
-  nvd          = false
-}
@@ -1,20 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-schema = 1
-artifacts {
-  # This should match the `matrix` in .github/workflows/build.yml
-  zip = [
-    "terraform-provider-boundary_${version}_darwin_amd64.zip",
-    "terraform-provider-boundary_${version}_darwin_arm64.zip",
-    "terraform-provider-boundary_${version}_freebsd_386.zip",
-    "terraform-provider-boundary_${version}_freebsd_amd64.zip",
-    "terraform-provider-boundary_${version}_freebsd_arm.zip",
-    "terraform-provider-boundary_${version}_linux_386.zip",
-    "terraform-provider-boundary_${version}_linux_amd64.zip",
-    "terraform-provider-boundary_${version}_linux_arm.zip",
-    "terraform-provider-boundary_${version}_linux_arm64.zip",
-    "terraform-provider-boundary_${version}_windows_386.zip",
-    "terraform-provider-boundary_${version}_windows_amd64.zip",
-  ]
-}
@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch a test function",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${fileDirname}",
-            "args": [
-                "-test.v",
-                "-test.run",
-                "^${selectedText}$"
-            ],
-            "showLog": true,
-            "envFile": "${workspaceFolder}/.vscode/private.env"
-        }
-    ]
-}
@@ -1,3 +0,0 @@
-TF_ACC=1
-TF_LOG=INFO
-GOFLAGS='-mod=readonly'
@@ -2,92 +2,6 @@

 Canonical reference for changes, improvements, and bugfixes for the Boundary Terraform provider.

-## 1.3.1 (July 11th, 2025)
-
-### Bug Fix
-
-* Fixes a problem where the KMS plugins were not being bundled in the provider's
-  binary ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/717))
-
-## 1.3.0 (July 9th, 2025)
-
-### Known Issues
-
-* `Error configuring kms: plugin is nil`: This error message may occur when you
-  attempt to use KMS plugin functionality. The [KMS plugins](plugins/kms/mains)
-  were not bundled in this Terraform provider release and thus any functionality
-  related to this will not work.
-
-### New and Improved
-
-* Updates various dependencies across the provider
-  ([Example PR](https://github.com/hashicorp/terraform-provider-boundary/pull/708))
-
-## 1.2.0 (October 21, 2024)
-
-### New and Improved
-
-* Introduces support for specifying a worker filter in dynamic host catalogs
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/626))
-
-### Deprecations/Changes
-
-* With Boundary 0.15, a deprecation notice was put under the `grant_scope_id`
-  field, and a new `grant_scope_ids` field was introduced to replace it. With
-  Boundary v0.17.1 and Boundary API v0.0.52, `grant_scope_id` support was
-  entirely removed. `grant_scope_id` support has now been removed from this TF
-  provider.
-
-## 1.1.15 (May 1, 2024)
-
-### New and Improved
-
-* Add support for a target alias as a resource
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/571))
-
-## 1.1.14 (February 14, 2024)
-
-### New and Improved
-
-* Support the multi-value `grant_scope_ids` field in the role provider
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/562))
-
-* Support Boundary [Storage Policies](https://developer.hashicorp.com/boundary/docs/configuration/session-recording/configure-storage-policy)
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/558))
-
-## 1.1.13 (February 1, 2024)
-
-### New and Improved
-
-* Allow dynamic credentials when configuring storage buckets
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/549))
-
-## 1.1.12 (January 8, 2024)
-
-### New and Improved
-
-* Add support to configure valid_principals with Vault SSH Certificate Credential Library
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/512))
-
-## 1.1.11 (December 13, 2023)
-
-### New and Improved
-
-* Add support for OIDC prompts. Using prompts, the Relying Party (RP) can customize the authentication and authorization flow to suit their specific needs and improve the user experience. [OIDC Authentication request](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest) server.
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/519))
-* Add boundary_auth_method data source
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/505))
-* Add boundary_group data source
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/503))
-* Add boundary_account data source
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/493))
-* Add boundary_user data source
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/468))
-
-### Bug Fix
-* Fix boundary_worker overwriting worker generated auth token during
-  ([PR](https://github.com/hashicorp/terraform-provider-boundary/pull/461)) 
-
 ## 1.1.10 (October 11, 2023)

 ### New and Improved
@@ -371,4 +285,4 @@ Update provider to handle new domain errors ([PR](https://github.com/hashicorp/t

 ## 0.1.0 (October 14, 2020)

-Initial release!
+Initial release!
@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo, unless a later match takes precedence.

-* @hashicorp/boundary
+@hashicorp/boundary
@@ -18,12 +18,14 @@ DOCKER_ARGS ?= -d
 PG_OPTS ?=
 TEST_DB_PORT ?= 5432
 BOUNDARY_VERSION = $(shell go mod edit -json | jq -r '.["Require"][] | select(.Path=="github.com/hashicorp/boundary") | .["Version"]')
-GOPATH ?= $(abspath ~/go)
+GOPATH ?= ~/go
 GOMODCACHE ?= $(GOPATH)/pkg/mod

 tools:
 	go generate -tags tools tools/tools.go
-	go install github.com/hashicorp/copywrite@v0.15.0
+
+fmtcheck:
+	echo "Placeholder"

 test:
 	echo "Placeholder"
@@ -79,14 +81,3 @@ test-database-down:
 	docker rm -v boundary-sql-tests || true

 .PHONY: testacc tools docs test-database-up test-database-down
-
-.PHONY: copywrite
-copywrite:
-	copywrite headers
-
-.PHONY: fmt
-fmt:
-	gofumpt -w $$(find . -name '*.go')
-
-.PHONY: gen
-gen: docs copywrite fmt
@@ -1,15 +1,18 @@
 ![](boundary.png)

-# Terraform Provider Boundary
+Terraform Provider Boundary
+==================

 Available in the [Terraform Registry](https://registry.terraform.io/providers/hashicorp/boundary/latest).

-## Requirements
+Requirements
+------------

-	[Terraform](https://www.terraform.io/downloads.html) >= 0.13.x
-	[Go](https://golang.org/doc/install) >= 1.21
+-	[Terraform](https://www.terraform.io/downloads.html) >= 0.12.x
+-	[Go](https://golang.org/doc/install) >= 1.20

-## Building The Provider
+Building The Provider
+---------------------

 1. Clone the repository
 1. Enter the repository directory
@@ -19,30 +22,32 @@ You'll need to ensure that your Terraform file contains the information necessar

 ```hcl
 terraform {
-  required_providers {
-    boundary = {
-      source = "localhost/providers/boundary"
-      version = "0.0.1"
-    }
-  }
+        required_providers {
+                boundary = {
+                        source = "localhost/providers/boundary"
+                        version = "0.0.1"
+                }
+        }
 }
 ```

-## Adding Dependencies
+Adding Dependencies
+---------------------

 This provider uses [Go modules](https://github.com/golang/go/wiki/Modules).
 Please see the Go documentation for the most up to date information about using Go modules.

 To add a new dependency `github.com/author/dependency` to your Terraform provider:

-```shell
+```
 go get github.com/author/dependency
 go mod tidy
 ```

 Then commit the changes to `go.mod` and `go.sum`.

-## Developing the Provider
+Developing the Provider
+---------------------------

 If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (see [Requirements](#requirements) above).

@@ -67,40 +72,25 @@ $ make testacc
 For more details on the docker image and troubleshooting see the
 [boundary testing doc](https://github.com/hashicorp/boundary/blob/main/CONTRIBUTING.md#testing).

-## Debugging the provider
-
-If you're using vscode, this provider has delve debugging baked into the [.vscode](https://github.com/hashicorp/terraform-provider-boundary/tree/main/.vscode) directory. To debug you can find instructions [here.](https://dev.to/drewmullen/vscode-terraform-provider-development-setup-debugging-6bn#usage)
-
-## Generating Docs
-
-This provider uses the [terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs/) tool to generate documentation. Each resource and data source requires a set of examples [examples](https://github.com/hashicorp/terraform-provider-boundary/tree/main/examples) then you execute a binary to generate the docs which are placed in [./docs](https://github.com/hashicorp/terraform-provider-boundary/tree/main/docs). Optionally, you can specify your own [templates](https://github.com/hashicorp/terraform-provider-boundary/tree/main/templates) for a resource or data source if you want to add custom information (example: [data "boundary_scope"](https://github.com/hashicorp/terraform-provider-boundary/blob/main/templates/data-sources/scope.md.tmpl#L11))
-
-### New Resources & Data Sources (documentation templates)
-
-If you're adding a new resource or a data source, you must include a documentation template for your new R/DS in [./templates](https://github.com/hashicorp/terraform-provider-boundary/tree/main/templates) directory. This provider uses the [terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs/) tool to generate documentation. For full details see the link.
-
-### Documentation Examples for Resources & Data Sources
-
-Examples are required for all resources and data sources. This provider uses the [terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs/) tool to generate documentation. To add examples, add a new file to the [./examples](https://github.com/hashicorp/terraform-provider-boundary/tree/main/examples) directory or update the existing files. Next make sure the corresponding template in [./templates](https://github.com/hashicorp/terraform-provider-boundary/tree/main/templates) directory references this example.
-
-### Generating
+Generating Docs
+----------------------

 From the root of the repo run:

-```shell
+```
 go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 ```

-## Using the provider
-
+Using the provider
+----------------------
 Please see our detailed docs for individual resource usage. Below is a complex example using the Boundary provider to configure all resource types available:

 ```hcl
 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_id         = "ampw_1234567890"      # changeme
-  auth_method_login_name = "myuser"               # changeme
-  auth_method_password   = "passpass"             # changeme
+  addr                            = "http://127.0.0.1:9200"
+  auth_method_id                  = "ampw_1234567890"      # changeme
+  password_auth_method_login_name = "myuser"               # changeme
+  password_auth_method_password   = "passpass"             # changeme
 }

 variable "users" {
@@ -150,7 +140,7 @@ resource "boundary_user" "users" {
  scope_id    = boundary_scope.corp.id
 }

-// organization level group for readonly users
+// organization level group for readonly users 
 resource "boundary_group" "readonly" {
  name        = "readonly"
  description = "Organization group for readonly users"
@@ -163,7 +153,7 @@ resource "boundary_role" "organization_readonly" {
  name        = "readonly"
  description = "Read-only role"
  principal_ids = [boundary_group.readonly_users.id]
-  grant_strings = ["ids=*;type=*;actions=read"]
+  grant_strings = ["id=*;type=*;actions=read"]
  scope_id    = boundary_scope.corp.id
 }

@@ -174,7 +164,7 @@ resource "boundary_role" "organization_admin" {
  principal_ids = concat(
    [for user in boundary_user.user: user.id]
  )
-  grant_strings   = ["ids=*;type=*;actions=create,read,update,delete"]
+  grant_strings   = ["id=*;type=*;actions=create,read,update,delete"]
  scope_id = boundary_scope.corp.id
 }

@@ -1,47 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_account Data Source - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The boundary_account data source allows you to find a Boundary account.
---
-
-# boundary_account (Data Source)
-
-The boundary_account data source allows you to find a Boundary account.
-
-## Example Usage
-
-```terraform
-# Retrieve the ID of a Boundary account
-data "boundary_account" "admin" {
-  name           = "admin"
-  auth_method_id = "ampw_1234567890"
-}
-```
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `auth_method_id` (String) The auth method ID that will be queried for the account.
- `name` (String) The name of the account to retrieve.
-
-### Read-Only
-
- `description` (String) The description of the retrieved account.
- `id` (String) The ID of the retrieved account.
- `scope` (List of Object) (see [below for nested schema](#nestedatt--scope))
- `type` (String) The type of the account
-
-<a id="nestedatt--scope"></a>
-### Nested Schema for `scope`
-
-Read-Only:
-
- `description` (String)
- `id` (String)
- `name` (String)
- `parent_scope_id` (String)
- `type` (String)
@@ -1,60 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_auth_method Data Source - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The boundary_auth_method data source allows you to find a Boundary auth method.
---
-
-# boundary_auth_method (Data Source)
-
-The boundary_auth_method data source allows you to find a Boundary auth method.
-
-## Example Usage
-
-```terraform
-# Retrieve an auth method from the global scope
-data "boundary_auth_method" "auth_method" {
-  name = "password_auth_method"
-}
-
-# Auth method from a org scope
-data "boundary_scope" "org" {
-  name     = "my-org"
-  scope_id = "global"
-}
-
-data "boundary_auth_method" "auth_method" {
-  name     = "password_auth_method"
-  scope_id = data.boundary_scope.org.id
-}
-```
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `name` (String) The name of the auth method to retrieve.
-
-### Optional
-
- `scope_id` (String) The scope ID in which the resource is created. Defaults `global` if unset.
-
-### Read-Only
-
- `description` (String) The description of the retrieved auth method.
- `id` (String) The ID of the retrieved auth method.
- `scope` (List of Object) (see [below for nested schema](#nestedatt--scope))
- `type` (String) The type of the auth method
-
-<a id="nestedatt--scope"></a>
-### Nested Schema for `scope`
-
-Read-Only:
-
- `description` (String)
- `id` (String)
- `name` (String)
- `parent_scope_id` (String)
- `type` (String)
@@ -1,60 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_group Data Source - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The boundary_group data source allows you to find a Boundary group.
---
-
-# boundary_group (Data Source)
-
-The boundary_group data source allows you to find a Boundary group.
-
-## Example Usage
-
-```terraform
-# Retrieve a user from the global scope
-data "boundary_group" "global_group" {
-  name = "admin"
-}
-
-# User from an org scope
-data "boundary_scope" "org" {
-  name     = "org"
-  scope_id = "global"
-}
-
-data "boundary_group" "org_group" {
-  name     = "username"
-  scope_id = data.boundary_scope.org.id
-}
-```
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `name` (String) The name of the group to retrieve.
-
-### Optional
-
- `scope_id` (String) The scope ID in which the resource is created. Defaults `global` if unset.
-
-### Read-Only
-
- `description` (String) The description of the retrieved group.
- `id` (String) The ID of the retrieved group.
- `member_ids` (Set of String) Resource IDs for group members, these are most likely boundary users.
- `scope` (List of Object) (see [below for nested schema](#nestedatt--scope))
-
-<a id="nestedatt--scope"></a>
-### Nested Schema for `scope`
-
-Read-Only:
-
- `description` (String)
- `id` (String)
- `name` (String)
- `parent_scope_id` (String)
- `type` (String)
@@ -1,4 +1,5 @@
 ---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "boundary_scope Data Source - terraform-provider-boundary"
 subcategory: ""
 description: |-
@@ -12,19 +13,21 @@ Please note that the Global scope will always have an id of "global", and does n

 ## Example Usage

+Basic usage:
+
 ```terraform
-# Retrieve the ID of a Boundary project
 data "boundary_scope" "org" {
  name     = "SecOps"
-  scope_id = "global"
+  parent_scope_id = "global"
 }

 data "boundary_scope" "project" {
  name     = "2111"
-  scope_id = data.boundary_scope.id
+  parent_scope_id = data.boundary_scope.id
 }
 ```

+
 <!-- schema generated by tfplugindocs -->
 ## Schema

@@ -1,63 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_user Data Source - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The user data source allows you to find a Boundary user.
---
-
-# boundary_user (Data Source)
-
-The user data source allows you to find a Boundary user.
-
-## Example Usage
-
-```terraform
-# Retrieve a user from the global scope
-data "boundary_user" "global_scope_admin" {
-  name = "admin"
-}
-
-# User from a org scope
-data "boundary_user" "org_user" {
-  name     = "username"
-  scope_id = data.boundary_scope.org.id
-}
-
-data "boundary_scope" "org" {
-  name     = "my-org"
-  scope_id = data.boundary_scope.org.id
-}
-```
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `name` (String) The username to search for.
-
-### Optional
-
- `scope_id` (String) The scope ID in which the resource is created. Defaults `global` if unset.
-
-### Read-Only
-
- `account_ids` (Set of String) Account ID's to associate with this user resource.
- `authorized_actions` (List of String) A list of actions that the worker is entitled to perform.
- `description` (String) The user description.
- `id` (String) The ID of the user.
- `login_name` (String) Login name for user.
- `primary_account_id` (String) Primary account ID.
- `scope` (List of Object) (see [below for nested schema](#nestedatt--scope))
-
-<a id="nestedatt--scope"></a>
-### Nested Schema for `scope`
-
-Read-Only:
-
- `description` (String)
- `id` (String)
- `name` (String)
- `parent_scope_id` (String)
- `type` (String)
@@ -15,23 +15,23 @@ Do not keep your authentication password in HCL for production environments, use

 ```terraform
 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_id         = "ampw_1234567890" # changeme
-  auth_method_login_name = "myuser"          # changeme
-  auth_method_password   = "passpass"        # changeme
+  addr                            = "http://127.0.0.1:9200"
+  auth_method_id                  = "ampw_1234567890" # changeme
+  password_auth_method_login_name = "myuser"          # changeme
+  password_auth_method_password   = "passpass"        # changeme
 }

 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_login_name = "myuser"
-  auth_method_password   = "passpass"
+  addr                            = "http://127.0.0.1:9200"
+  password_auth_method_login_name = "myuser"
+  password_auth_method_password   = "passpass"
 }

 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_login_name = "myuser"
-  auth_method_password   = "passpass"
-  scope_id               = "s_1234567890"
+  addr                            = "http://127.0.0.1:9200"
+  password_auth_method_login_name = "myuser"
+  password_auth_method_password   = "passpass"
+  scope_id                        = "s_1234567890"
 }
 ```

@@ -10,44 +10,7 @@ description: |-

 The account resource allows you to configure a Boundary account.

-## Example Usage

-```terraform
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
-
-resource "boundary_account_ldap" "einstein" {
-  auth_method_id = boundary_auth_method_ldap.forumsys_ldap.id
-  login_name     = "einstein"
-  name           = "einstein"
-}
-
-resource "boundary_user" "einstein" {
-  name        = "einstein"
-  description = "User resource for einstein"
-  scope_id    = "global"
-  account_ids = [boundary_account_ldap.einstein.id]
-}
-```

 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -66,13 +29,3 @@ resource "boundary_user" "einstein" {
 ### Read-Only

 - `id` (String) The ID of the account.
-
-## Import
-
-Import is supported using the following syntax:
-
-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
-```shell
-terraform import boundary_account_ldap.foo <my-id>
-```
@@ -56,8 +56,6 @@ resource "boundary_account_password" "jeff" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_account_password.foo <my-id>
 ```
@@ -1,108 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_alias_target Resource - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The target alias resource allows you to configure a Boundary target alias.
---
-
-# boundary_alias_target (Resource)
-
-The target alias resource allows you to configure a Boundary target alias.
-
-## Example Usage
-
-```terraform
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "global scope"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_scope" "project" {
-  name                   = "project_one"
-  description            = "My first scope!"
-  scope_id               = boundary_scope.org.id
-  auto_create_admin_role = true
-}
-
-resource "boundary_host_catalog_static" "foo" {
-  name        = "test"
-  description = "test catalog"
-  scope_id    = boundary_scope.project.id
-}
-
-resource "boundary_host_static" "foo" {
-  name            = "foo"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-  address         = "10.0.0.1"
-}
-
-resource "boundary_host_static" "bar" {
-  name            = "bar"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-  address         = "127.0.0.1"
-}
-
-resource "boundary_host_set_static" "foo" {
-  name            = "foo"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-
-  host_ids = [
-    boundary_host_static.foo.id,
-    boundary_host_static.bar.id,
-  ]
-}
-
-resource "boundary_target" "foo" {
-  name         = "foo"
-  description  = "Foo target"
-  type         = "tcp"
-  default_port = "22"
-  scope_id     = boundary_scope.project.id
-  host_source_ids = [
-    boundary_host_set_static.foo.id,
-  ]
-}
-
-resource "boundary_alias_target" "example_alias_target" {
-  name                      = "example_alias_target"
-  description               = "Example alias to target foo using host boundary_host_static.bar"
-  scope_id                  = "global"
-  value                     = "example.bar.foo.boundary"
-  destination_id            = boundary_target.foo.id
-  authorize_session_host_id = boundary_host_static.bar.id
-}
-```
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `scope_id` (String) The scope ID.
- `value` (String) The value of the alias.
-
-### Optional
-
- `authorize_session_host_id` (String) The host id to pass to Boundary when performing an authorize session action.
- `description` (String) The alias description.
- `destination_id` (String) The destination of the alias.
- `name` (String) The alias name. Defaults to the resource name.
- `type` (String) The type of alias; hardcoded.
-
-### Read-Only
-
- `id` (String) The ID of the account.
-
-## Import
-
-Import is supported using the following syntax:
-
-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
-```shell
-terraform import boundary_alias_target.example_alias_target <my-id>
-```
@@ -50,8 +50,6 @@ resource "boundary_auth_method" "password" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_auth_method.foo <my-id>
 ```
@@ -3,38 +3,14 @@
 page_title: "boundary_auth_method_ldap Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
-  The LDAP auth method resource allows you to configure a Boundary auth_method_ldap.
+  The LDAP auth method resource allows you to configure a Boundary authmethodldap.
 ---

 # boundary_auth_method_ldap (Resource)

 The LDAP auth method resource allows you to configure a Boundary auth_method_ldap.

-## Example Usage

-```terraform
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
-```

 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -78,13 +54,3 @@ resource "boundary_auth_method_ldap" "forumsys_ldap" {
 ### Read-Only

 - `id` (String) The ID of the auth method.
-
-## Import
-
-Import is supported using the following syntax:
-
-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
-```shell
-terraform import boundary_auth_method_ldap.foo <my-id>
-```
@@ -3,59 +3,14 @@
 page_title: "boundary_auth_method_oidc Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
-  The OIDC auth method resource allows you to configure a Boundary auth_method_oidc.
+  The OIDC auth method resource allows you to configure a Boundary authmethodoidc.
 ---

 # boundary_auth_method_oidc (Resource)

 The OIDC auth method resource allows you to configure a Boundary auth_method_oidc.

-## Example Usage

-```terraform
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_oidc" "vault" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method for Vault"
-  issuer             = "https://XO-XO-XO-XO-XOXOXO.vault.hashicorp.cloud:8200/v1/identity/oidc/provider/my-provider"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  type               = "oidc"
-}
-
-resource "boundary_auth_method_oidc" "oidc_with_one_prompt" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method With Prompt"
-  issuer             = "https://sts.windows.net/TENANT_ID/"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  prompts            = ["select_account"]
-  type               = "oidc"
-}
-
-resource "boundary_auth_method_oidc" "oidc_with_multiple_prompts" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method With Multiple Prompts"
-  issuer             = "https://sts.windows.net/TENANT_ID/"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  prompts            = ["consent", "select_account"]
-  type               = "oidc"
-}
-```

 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -81,7 +36,6 @@ resource "boundary_auth_method_oidc" "oidc_with_multiple_prompts" {
 - `issuer` (String) The issuer corresponding to the provider, which must match the issuer field in generated tokens.
 - `max_age` (Number) The max age to provide to the provider, indicating how much time is allowed to have passed since the last authentication before the user is challenged again. A value of 0 sets an immediate requirement for all users to reauthenticate, and an unset maxAge results in a Terraform value of -1 and the default TTL of the chosen OIDC will be used.
 - `name` (String) The auth method name. Defaults to the resource name.
- `prompts` (List of String) The prompts passed to the identity provider to determine whether to prompt the end-user for reauthentication, account selection or consent. Please note the values passed are case-sensitive. The valid values are: `none`, `login`, `consent` and `select_account`.
 - `signing_algorithms` (List of String) Allowed signing algorithms for the provider's issued tokens.
 - `state` (String) Can be one of 'inactive', 'active-private', or 'active-public'. Currently automatically set to active-public.
 - `type` (String) The type of auth method; hardcoded.
@@ -89,13 +43,3 @@ resource "boundary_auth_method_oidc" "oidc_with_multiple_prompts" {
 ### Read-Only

 - `id` (String) The ID of the auth method.
-
-## Import
-
-Import is supported using the following syntax:
-
-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
-```shell
-terraform import boundary_auth_method_oidc.foo <my-id>
-```
@@ -3,7 +3,7 @@
 page_title: "boundary_auth_method_password Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
-  The auth method resource allows you to configure a Boundary auth_method_password.
+  The auth method resource allows you to configure a Boundary authmethodpassword.
 ---

 # boundary_auth_method_password (Resource)
@@ -64,8 +64,6 @@ resource "boundary_credential_json" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_json.example_json <my-id>
 ```
@@ -110,8 +110,6 @@ resource "boundary_credential_library_vault" "quz" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_library_vault.foo <my-id>
 ```
@@ -89,7 +89,6 @@ resource "boundary_credential_library_vault_ssh_certificate" "baz" {

 ### Optional

- `additional_valid_principals` (List of String) Principals to be signed as "valid_principles" in addition to username.
 - `critical_options` (Map of String) Specifies a map of the critical options that the certificate should be signed for.
 - `description` (String) The Vault credential library description.
 - `extensions` (Map of String) Specifies a map of the extensions that the certificate should be signed for.
@@ -107,8 +106,6 @@ resource "boundary_credential_library_vault_ssh_certificate" "baz" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_library_vault_ssh_certificate.foo <my-id>
 ```
@@ -69,8 +69,6 @@ resource "boundary_credential_ssh_private_key" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_ssh_private_key.example_ssh_private_key <my-id>
 ```
@@ -55,8 +55,6 @@ resource "boundary_credential_store_static" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_store_static.example_static_credential_store <my-id>
 ```
@@ -68,8 +68,6 @@ resource "boundary_credential_store_vault" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_store_vault.foo <my-id>
 ```
@@ -66,8 +66,6 @@ resource "boundary_credential_username_password" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_credential_username_password.example_username_password <my-id>
 ```
@@ -66,8 +66,6 @@ resource "boundary_host" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host.foo <my-id>
 ```
@@ -57,8 +57,6 @@ resource "boundary_host_catalog" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_catalog.foo <my-id>
 ```
@@ -94,7 +94,6 @@ resource "boundary_host_catalog_plugin" "azure_example" {
 - `plugin_name` (String) The name of the plugin that should back the resource. This or plugin_id must be defined.
 - `secrets_hmac` (String) The HMAC'd secrets value returned from the server.
 - `secrets_json` (String, Sensitive) The secrets for the host catalog. Either values encoded with the "jsonencode" function, pre-escaped JSON string, or a file:// or env:// path. Set to a string "null" to clear any existing values. NOTE: Unlike "attributes_json", removing this block will NOT clear secrets from the host catalog; this allows injecting secrets for one call, then removing them for storage.
- `worker_filter` (String) HCP Only. A filter used to control which PKI workers can handle dynamic host catalog requests.

 ### Read-Only

@@ -104,8 +103,6 @@ resource "boundary_host_catalog_plugin" "azure_example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_catalog_plugin.foo <my-id>
 ```
@@ -55,8 +55,6 @@ resource "boundary_host_catalog_static" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_catalog_static.foo <my-id>
 ```
@@ -39,6 +39,7 @@ resource "boundary_host" "first" {
  description     = "My first host!"
  address         = "10.0.0.1"
  host_catalog_id = boundary_host_catalog.static.id
+  scope_id        = boundary_scope.project.id
 }

 resource "boundary_host" "second" {
@@ -47,6 +48,7 @@ resource "boundary_host" "second" {
  description     = "My second host!"
  address         = "10.0.0.2"
  host_catalog_id = boundary_host_catalog.static.id
+  scope_id        = boundary_scope.project.id
 }

 resource "boundary_host_set" "web" {
@@ -81,8 +83,6 @@ resource "boundary_host_set" "web" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_set.foo <my-id>
 ```
@@ -3,7 +3,7 @@
 page_title: "boundary_host_set_plugin Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
-  The host_set_plugin resource allows you to configure a Boundary host set. Host sets are always part of a host catalog, so a host catalog resource should be used inline or you should have the host catalog ID in hand to successfully configure a host set.
+  The hostsetplugin resource allows you to configure a Boundary host set. Host sets are always part of a host catalog, so a host catalog resource should be used inline or you should have the host catalog ID in hand to successfully configure a host set.
 ---

 # boundary_host_set_plugin (Resource)
@@ -140,8 +140,6 @@ resource "boundary_host_set_plugin" "foodev" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_set_plugin.foo <my-id>
 ```
@@ -3,7 +3,7 @@
 page_title: "boundary_host_set_static Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
-  The host_set_static resource allows you to configure a Boundary host set. Host sets are always part of a host catalog, so a host catalog resource should be used inline or you should have the host catalog ID in hand to successfully configure a host set.
+  The hostsetstatic resource allows you to configure a Boundary host set. Host sets are always part of a host catalog, so a host catalog resource should be used inline or you should have the host catalog ID in hand to successfully configure a host set.
 ---

 # boundary_host_set_static (Resource)
@@ -77,8 +77,6 @@ resource "boundary_host_set_static" "web" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_set_static.foo <my-id>
 ```
@@ -64,8 +64,6 @@ resource "boundary_host_static" "example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_host_static.foo <my-id>
 ```
@@ -10,38 +10,7 @@ description: |-

 The managed group resource allows you to configure a Boundary group.

-## Example Usage

-```terraform
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
-
-resource "boundary_managed_group_ldap" "forumsys_scientists" {
-  name           = "scientists"
-  description    = "forumsys scientists managed group"
-  auth_method_id = boundary_auth_method_ldap.forumsys_ldap.id
-  group_names    = ["Scientists"]
-}
-```

 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -59,13 +28,3 @@ resource "boundary_managed_group_ldap" "forumsys_scientists" {
 ### Read-Only

 - `id` (String) The ID of the group.
-
-## Import
-
-Import is supported using the following syntax:
-
-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
-```shell
-terraform import boundary_managed_group_ldap.foo <my-id>
-```
@@ -1,33 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_policy_storage Resource - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  The storage policy resource allows you to configure a Boundary storage policy. Storage policies allow an admin to configure how long session recordings must be stored and when to delete them. Storage policies must be applied to the global scope or an org scope in order to take effect.
---
-
-# boundary_policy_storage (Resource)
-
-The storage policy resource allows you to configure a Boundary storage policy. Storage policies allow an admin to configure how long session recordings must be stored and when to delete them. Storage policies must be applied to the global scope or an org scope in order to take effect.
-
-
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `scope_id` (String) The scope for this policy.
-
-### Optional
-
- `delete_after_days` (Number) The number of days after which a session recording will be automatically deleted. Defaults to 0: never automatically delete. However, delete_after_days and retain_for_days cannot both be 0.
- `delete_after_overridable` (Boolean) Whether or not the associated delete_after_days value can be overridden by org scopes. Note: if the associated delete_after_days value is 0, overridable is ignored
- `description` (String) The policy description.
- `name` (String) The policy name. Defaults to the resource name.
- `retain_for_days` (Number) The number of days a session recording is required to be stored. Defaults to 0: allow deletions at any time. However, retain_for_days and delete_after_days cannot both be 0.
- `retain_for_overridable` (Boolean) Whether or not the associated retain_for_days value can be overridden by org scopes. Note: if the associated retain_for_days value is 0, overridable is ignored.
-
-### Read-Only
-
- `id` (String) The ID of the policy.
@@ -79,7 +79,7 @@ resource "boundary_role" "readonly" {
  name          = "readonly"
  description   = "A readonly role"
  principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["ids=*;type=*;actions=read"]
+  grant_strings = ["id=*;type=*;actions=read"]
  scope_id      = boundary_scope.org.id
 }
 ```
@@ -112,7 +112,7 @@ resource "boundary_role" "readonly" {
  name          = "readonly"
  description   = "A readonly role"
  principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["ids=*;type=*;actions=read"]
+  grant_strings = ["id=*;type=*;actions=read"]
  scope_id      = boundary_scope.project.id
 }
 ```
@@ -127,7 +127,7 @@ resource "boundary_role" "readonly" {
 ### Optional

 - `description` (String) The role description.
- `grant_scope_ids` (Set of String) A list of scopes for which the grants in this role should apply, which can include the special values "this", "children", or "descendants"
+- `grant_scope_id` (String)
 - `grant_strings` (Set of String) A list of stringified grants for the role.
 - `name` (String) The role name. Defaults to the resource name.
 - `principal_ids` (Set of String) A list of principal (user or group) IDs to add as principals on the role.
@@ -53,10 +53,10 @@ resource "boundary_scope" "org" {
 }

 resource "boundary_role" "org_admin" {
-  scope_id        = boundary_scope.global.id
-  grant_scope_ids = [boundary_scope.org.id]
-  grant_strings   = ["ids=*;type=*;actions=*"]
-  principal_ids   = ["u_auth"]
+  scope_id       = boundary_scope.global.id
+  grant_scope_id = boundary_scope.org.id
+  grant_strings  = ["id=*;type=*;actions=*"]
+  principal_ids  = ["u_auth"]
 }
 ```

@@ -1,25 +0,0 @@
---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "boundary_scope_policy_attachment Resource - terraform-provider-boundary"
-subcategory: ""
-description: |-
-  
---
-
-# boundary_scope_policy_attachment (Resource)
-
-
-
-
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
- `policy_id` (String)
- `scope_id` (String)
-
-### Read-Only
-
- `id` (String) The ID of this resource.
@@ -21,8 +21,8 @@ resource "boundary_scope" "org" {
  auto_create_default_role = true
 }

-resource "boundary_storage_bucket" "aws_static_credentials_example" {
-  name            = "My aws storage bucket with static credentials"
+resource "boundary_storage_bucket" "aws_example" {
+  name            = "My aws storage bucket"
  description     = "My first storage bucket!"
  scope_id        = boundary_scope.org.id
  plugin_name     = "aws"
@@ -37,23 +37,6 @@ resource "boundary_storage_bucket" "aws_static_credentials_example" {
  })
  worker_filter = "\"pki\" in \"/tags/type\""
 }
-
-resource "boundary_storage_bucket" "aws_dynamic_credentials_example" {
-  name        = "My aws storage bucket with dynamic credentials"
-  description = "My first storage bucket!"
-  scope_id    = boundary_scope.org.id
-  plugin_name = "aws"
-  bucket_name = "mybucket"
-
-  # the role_arn value should be the same arn used as the instance profile that is attached to the ec2 instance
-  # https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html
-  attributes_json = jsonencode({
-    "region"                      = "us-east-1"
-    "role_arn"                    = "arn:aws:iam::123456789012:role/S3Access"
-    "disable_credential_rotation" = "true"
-  })
-  worker_filter = "\"pki\" in \"/tags/type\""
-}
 ```

 <!-- schema generated by tfplugindocs -->
@@ -63,6 +46,7 @@ resource "boundary_storage_bucket" "aws_dynamic_credentials_example" {

 - `bucket_name` (String) The name of the bucket within the external object store service.
 - `scope_id` (String) The scope for this storage bucket.
+- `secrets_json` (String, Sensitive) The secrets for the storage bucket. Either values encoded with the "jsonencode" function, pre-escaped JSON string, or a file:// or env:// path. Set to a string "null" to clear any existing values. NOTE: Unlike "attributes_json", removing this block will NOT clear secrets from the storage bucket; this allows injecting secrets for one call, then removing them for storage.
 - `worker_filter` (String) Filters to the worker(s) that can handle requests for this storage bucket. The filter must match an existing worker in order to create a storage bucket.

 ### Optional
@@ -73,7 +57,6 @@ resource "boundary_storage_bucket" "aws_dynamic_credentials_example" {
 - `name` (String) The storage bucket name. Defaults to the resource name.
 - `plugin_id` (String) The ID of the plugin that should back the resource. This or plugin_name must be defined.
 - `plugin_name` (String) The name of the plugin that should back the resource. This or plugin_id must be defined.
- `secrets_json` (String, Sensitive) The secrets for the storage bucket. Either values encoded with the "jsonencode" function, pre-escaped JSON string, or a file:// or env:// path. Set to a string "null" to clear any existing values. NOTE: Unlike "attributes_json", removing this block will NOT clear secrets from the storage bucket; this allows injecting secrets for one call, then removing them for storage.

 ### Read-Only

@@ -87,8 +70,6 @@ resource "boundary_storage_bucket" "aws_dynamic_credentials_example" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_storage_bucket.foo <my-id>
 ```
@@ -61,6 +61,7 @@ resource "boundary_host" "foo" {
  type            = "static"
  name            = "foo"
  host_catalog_id = boundary_host_catalog.foo.id
+  scope_id        = boundary_scope.project.id
  address         = "10.0.0.1"
 }

@@ -68,6 +69,7 @@ resource "boundary_host" "bar" {
  type            = "static"
  name            = "bar"
  host_catalog_id = boundary_host_catalog.foo.id
+  scope_id        = boundary_scope.project.id
  address         = "10.0.0.1"
 }

@@ -184,8 +186,6 @@ resource "boundary_target" "address_foo" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_target.foo <my-id>
 ```
@@ -62,8 +62,6 @@ resource "boundary_user" "jeff" {

 Import is supported using the following syntax:

-The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
-
 ```shell
 terraform import boundary_user.foo <my-id>
 ```
@@ -1,4 +1,5 @@
 ---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "boundary_worker Resource - terraform-provider-boundary"
 subcategory: ""
 description: |-
@@ -11,22 +12,16 @@ The resource allows you to create a self-managed worker object.

 ## Example Usage

-### Controller-led worker
-
 ```terraform
 resource "boundary_worker" "controller_led" {
  scope_id    = "global"
-  name        = "controller-led-worker-1"
+  name        = "worker 1"
  description = "self managed worker with controller led auth"
 }
-```

-### Worker-led worker
-
-```terraform
 resource "boundary_worker" "worker_led" {
  scope_id                    = "global"
-  name                        = "worker-led-worker-1"
+  name                        = "worker 2"
  description                 = "self managed worker with worker led auth"
  worker_generated_auth_token = var.worker_generated_auth_token
 }
@@ -1,5 +0,0 @@
-# Retrieve the ID of a Boundary account
-data "boundary_account" "admin" {
-  name           = "admin"
-  auth_method_id = "ampw_1234567890"
-}
@@ -1,15 +0,0 @@
-# Retrieve an auth method from the global scope
-data "boundary_auth_method" "auth_method" {
-  name = "password_auth_method"
-}
-
-# Auth method from a org scope
-data "boundary_scope" "org" {
-  name     = "my-org"
-  scope_id = "global"
-}
-
-data "boundary_auth_method" "auth_method" {
-  name     = "password_auth_method"
-  scope_id = data.boundary_scope.org.id
-}
@@ -1,15 +0,0 @@
-# Retrieve a user from the global scope
-data "boundary_group" "global_group" {
-  name = "admin"
-}
-
-# User from an org scope
-data "boundary_scope" "org" {
-  name     = "org"
-  scope_id = "global"
-}
-
-data "boundary_group" "org_group" {
-  name     = "username"
-  scope_id = data.boundary_scope.org.id
-}
@@ -1,15 +0,0 @@
-# Retrieve a user from the global scope
-data "boundary_user" "global_scope_admin" {
-  name = "admin"
-}
-
-# User from a org scope
-data "boundary_user" "org_user" {
-  name     = "username"
-  scope_id = data.boundary_scope.org.id
-}
-
-data "boundary_scope" "org" {
-  name     = "my-org"
-  scope_id = data.boundary_scope.org.id
-}
@@ -1,10 +1,10 @@
 # Retrieve the ID of a Boundary project
 data "boundary_scope" "org" {
  name     = "SecOps"
-  scope_id = "global"
+  parent_scope_id = "global"
 }

 data "boundary_scope" "project" {
  name     = "2111"
-  scope_id = data.boundary_scope.id
-}
+  parent_scope_id = data.boundary_scope.id
+}
@@ -1,19 +1,19 @@
 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_id         = "ampw_1234567890" # changeme
-  auth_method_login_name = "myuser"          # changeme
-  auth_method_password   = "passpass"        # changeme
+  addr                            = "http://127.0.0.1:9200"
+  auth_method_id                  = "ampw_1234567890" # changeme
+  password_auth_method_login_name = "myuser"          # changeme
+  password_auth_method_password   = "passpass"        # changeme
 }

 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_login_name = "myuser"
-  auth_method_password   = "passpass"
+  addr                            = "http://127.0.0.1:9200"
+  password_auth_method_login_name = "myuser"
+  password_auth_method_password   = "passpass"
 }

 provider "boundary" {
-  addr                   = "http://127.0.0.1:9200"
-  auth_method_login_name = "myuser"
-  auth_method_password   = "passpass"
-  scope_id               = "s_1234567890"
+  addr                            = "http://127.0.0.1:9200"
+  password_auth_method_login_name = "myuser"
+  password_auth_method_password   = "passpass"
+  scope_id                        = "s_1234567890"
 }
@@ -1 +0,0 @@
-terraform import boundary_account_ldap.foo <my-id>
@@ -1,34 +0,0 @@
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
-
-resource "boundary_account_ldap" "einstein" {
-  auth_method_id = boundary_auth_method_ldap.forumsys_ldap.id
-  login_name     = "einstein"
-  name           = "einstein"
-}
-
-resource "boundary_user" "einstein" {
-  name        = "einstein"
-  description = "User resource for einstein"
-  scope_id    = "global"
-  account_ids = [boundary_account_ldap.einstein.id]
-}
@@ -1 +0,0 @@
-terraform import boundary_alias_target.example_alias_target <my-id>
@@ -1,62 +0,0 @@
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "global scope"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_scope" "project" {
-  name                   = "project_one"
-  description            = "My first scope!"
-  scope_id               = boundary_scope.org.id
-  auto_create_admin_role = true
-}
-
-resource "boundary_host_catalog_static" "foo" {
-  name        = "test"
-  description = "test catalog"
-  scope_id    = boundary_scope.project.id
-}
-
-resource "boundary_host_static" "foo" {
-  name            = "foo"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-  address         = "10.0.0.1"
-}
-
-resource "boundary_host_static" "bar" {
-  name            = "bar"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-  address         = "127.0.0.1"
-}
-
-resource "boundary_host_set_static" "foo" {
-  name            = "foo"
-  host_catalog_id = boundary_host_catalog_static.foo.id
-
-  host_ids = [
-    boundary_host_static.foo.id,
-    boundary_host_static.bar.id,
-  ]
-}
-
-resource "boundary_target" "foo" {
-  name         = "foo"
-  description  = "Foo target"
-  type         = "tcp"
-  default_port = "22"
-  scope_id     = boundary_scope.project.id
-  host_source_ids = [
-    boundary_host_set_static.foo.id,
-  ]
-}
-
-resource "boundary_alias_target" "example_alias_target" {
-  name                      = "example_alias_target"
-  description               = "Example alias to target foo using host boundary_host_static.bar"
-  scope_id                  = "global"
-  value                     = "example.bar.foo.boundary"
-  destination_id            = boundary_target.foo.id
-  authorize_session_host_id = boundary_host_static.bar.id
-}
@@ -1 +0,0 @@
-terraform import boundary_auth_method_ldap.foo <my-id>
@@ -1,21 +0,0 @@
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
@@ -1 +0,0 @@
-terraform import boundary_auth_method_oidc.foo <my-id>
@@ -1,42 +0,0 @@
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_oidc" "vault" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method for Vault"
-  issuer             = "https://XO-XO-XO-XO-XOXOXO.vault.hashicorp.cloud:8200/v1/identity/oidc/provider/my-provider"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  type               = "oidc"
-}
-
-resource "boundary_auth_method_oidc" "oidc_with_one_prompt" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method With Prompt"
-  issuer             = "https://sts.windows.net/TENANT_ID/"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  prompts            = ["select_account"]
-  type               = "oidc"
-}
-
-resource "boundary_auth_method_oidc" "oidc_with_multiple_prompts" {
-  api_url_prefix     = "https://XO-XO-XO-XO-XOXOXO.boundary.hashicorp.cloud:9200"
-  client_id          = "eieio"
-  client_secret      = "hvo_secret_XO"
-  description        = "My Boundary OIDC Auth Method With Multiple Prompts"
-  issuer             = "https://sts.windows.net/TENANT_ID/"
-  scope_id           = "global"
-  signing_algorithms = ["RS256"]
-  prompts            = ["consent", "select_account"]
-  type               = "oidc"
-}
@@ -24,6 +24,7 @@ resource "boundary_host" "first" {
  description     = "My first host!"
  address         = "10.0.0.1"
  host_catalog_id = boundary_host_catalog.static.id
+  scope_id        = boundary_scope.project.id
 }

 resource "boundary_host" "second" {
@@ -32,6 +33,7 @@ resource "boundary_host" "second" {
  description     = "My second host!"
  address         = "10.0.0.2"
  host_catalog_id = boundary_host_catalog.static.id
+  scope_id        = boundary_scope.project.id
 }

 resource "boundary_host_set" "web" {
@@ -1 +0,0 @@
-terraform import boundary_managed_group_ldap.foo <my-id>
@@ -1,28 +0,0 @@
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = "global"
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_auth_method_ldap" "forumsys_ldap" {
-  name          = "forumsys public LDAP"
-  scope_id      = "global"                               # add the new auth method to the global scope
-  urls          = ["ldap://ldap.forumsys.com"]           # the addr of the LDAP server
-  user_dn       = "dc=example,dc=com"                    # the basedn for users
-  user_attr     = "uid"                                  # the user attribute
-  group_dn      = "dc=example,dc=com"                    # the basedn for groups
-  bind_dn       = "cn=read-only-admin,dc=example,dc=com" # the dn to use when binding
-  bind_password = "password"                             # passwd to use when binding
-  state         = "active-public"                        # make sure the new auth-method is available to everyone
-  enable_groups = true                                   # this turns-on the discovery of a user's groups
-  discover_dn   = true                                   # this turns-on the discovery of an authenticating user's dn
-}
-
-resource "boundary_managed_group_ldap" "forumsys_scientists" {
-  name           = "scientists"
-  description    = "forumsys scientists managed group"
-  auth_method_id = boundary_auth_method_ldap.forumsys_ldap.id
-  group_names    = ["Scientists"]
-}
@@ -1,27 +0,0 @@
-resource "boundary_scope" "global" {
-  global_scope = true
-  scope_id     = "global"
-}
-
-resource "boundary_scope" "org" {
-  name                     = "organization_one"
-  description              = "My first scope!"
-  scope_id                 = boundary_scope.global.id
-  auto_create_admin_role   = true
-  auto_create_default_role = true
-}
-
-resource "boundary_policy_storage" "foo" {
-  name                     = "foo"
-  description              = "Foo policy"
-  scope_id                 = boundary_scope.org.id
-  retain_for_days          = 10
-  retain_for_overridable   = false
-  delete_after_days        = 10
-  delete_after_overridable = true
-}
-
-resource "boundary_scope_policy_attachment" "foo_attachment" {
-  scope_id  = boundary_scope.org.id
-  policy_id = boundary_policy_storage.foo.id
-}
@@ -23,6 +23,6 @@ resource "boundary_role" "readonly" {
  name          = "readonly"
  description   = "A readonly role"
  principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["ids=*;type=*;actions=read"]
+  grant_strings = ["id=*;type=*;actions=read"]
  scope_id      = boundary_scope.project.id
 }
@@ -16,6 +16,6 @@ resource "boundary_role" "readonly" {
  name          = "readonly"
  description   = "A readonly role"
  principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["ids=*;type=*;actions=read"]
+  grant_strings = ["id=*;type=*;actions=read"]
  scope_id      = boundary_scope.org.id
 }
@@ -5,8 +5,8 @@ resource "boundary_scope" "org" {
 }

 resource "boundary_role" "org_admin" {
-  scope_id        = boundary_scope.global.id
-  grant_scope_ids = [boundary_scope.org.id]
-  grant_strings   = ["ids=*;type=*;actions=*"]
-  principal_ids   = ["u_auth"]
+  scope_id       = boundary_scope.global.id
+  grant_scope_id = boundary_scope.org.id
+  grant_strings  = ["id=*;type=*;actions=*"]
+  principal_ids  = ["u_auth"]
 }
@@ -6,8 +6,8 @@ resource "boundary_scope" "org" {
  auto_create_default_role = true
 }

-resource "boundary_storage_bucket" "aws_static_credentials_example" {
-  name            = "My aws storage bucket with static credentials"
+resource "boundary_storage_bucket" "aws_example" {
+  name            = "My aws storage bucket"
  description     = "My first storage bucket!"
  scope_id        = boundary_scope.org.id
  plugin_name     = "aws"
@@ -22,20 +22,3 @@ resource "boundary_storage_bucket" "aws_static_credentials_example" {
  })
  worker_filter = "\"pki\" in \"/tags/type\""
 }
-
-resource "boundary_storage_bucket" "aws_dynamic_credentials_example" {
-  name        = "My aws storage bucket with dynamic credentials"
-  description = "My first storage bucket!"
-  scope_id    = boundary_scope.org.id
-  plugin_name = "aws"
-  bucket_name = "mybucket"
-
-  # the role_arn value should be the same arn used as the instance profile that is attached to the ec2 instance
-  # https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html
-  attributes_json = jsonencode({
-    "region"                      = "us-east-1"
-    "role_arn"                    = "arn:aws:iam::123456789012:role/S3Access"
-    "disable_credential_rotation" = "true"
-  })
-  worker_filter = "\"pki\" in \"/tags/type\""
-}
@@ -46,6 +46,7 @@ resource "boundary_host" "foo" {
  type            = "static"
  name            = "foo"
  host_catalog_id = boundary_host_catalog.foo.id
+  scope_id        = boundary_scope.project.id
  address         = "10.0.0.1"
 }

@@ -53,6 +54,7 @@ resource "boundary_host" "bar" {
  type            = "static"
  name            = "bar"
  host_catalog_id = boundary_host_catalog.foo.id
+  scope_id        = boundary_scope.project.id
  address         = "10.0.0.1"
 }

@@ -1,5 +0,0 @@
-resource "boundary_worker" "controller_led" {
-  scope_id    = "global"
-  name        = "controller-led-worker-1"
-  description = "self managed worker with controller led auth"
-}
@@ -0,0 +1,13 @@
+resource "boundary_worker" "controller_led" {
+  scope_id                    = "global"
+  name                        = "worker 1"
+  description                 = "self managed worker with controller-led auth"
+  worker_generated_auth_token = var.worker_generated_auth_token
+}
+
+resource "boundary_worker" "worker_led" {
+  scope_id                    = "global"
+  name                        = "worker 2"
+  description                 = "self managed worker with worker-led auth"
+  worker_generated_auth_token = var.worker_generated_auth_token
+}
@@ -1,6 +1,12 @@
+resource "boundary_worker" "controller_led" {
+  scope_id    = "global"
+  name        = "worker 1"
+  description = "self managed worker with controller led auth"
+}
+
 resource "boundary_worker" "worker_led" {
  scope_id                    = "global"
-  name                        = "worker-led-worker-1"
+  name                        = "worker 2"
  description                 = "self managed worker with worker led auth"
  worker_generated_auth_token = var.worker_generated_auth_token
 }
@@ -1,147 +1,135 @@
 module github.com/hashicorp/terraform-provider-boundary

-go 1.24.0
+go 1.21

 require (
-	github.com/YakDriver/regexache v0.24.0
-	github.com/hashicorp/boundary v0.19.2
-	github.com/hashicorp/boundary/api v0.0.56
-	github.com/hashicorp/boundary/sdk v0.0.52
-	github.com/hashicorp/cap v0.9.0
-	github.com/hashicorp/cap/ldap v0.0.0-20240206183135-ed8f24513744
-	github.com/hashicorp/go-cty v1.5.0
-	github.com/hashicorp/go-kms-wrapping/v2 v2.0.18
-	github.com/hashicorp/go-secure-stdlib/configutil/v2 v2.0.12
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0
-	github.com/hashicorp/go-secure-stdlib/pluginutil/v2 v2.0.8
-	github.com/hashicorp/terraform-plugin-docs v0.22.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
-	github.com/jimlambrt/gldap v0.1.14
+	github.com/hashicorp/boundary v0.14.0
+	github.com/hashicorp/boundary/api v0.0.41
+	github.com/hashicorp/boundary/sdk v0.0.37
+	github.com/hashicorp/cap v0.4.0
+	github.com/hashicorp/cap/ldap v0.0.0-20230918191608-899e3f8e8cd6
+	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
+	github.com/hashicorp/go-kms-wrapping/v2 v2.0.13
+	github.com/hashicorp/go-secure-stdlib/configutil/v2 v2.0.10
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7
+	github.com/hashicorp/go-secure-stdlib/pluginutil/v2 v2.0.4
+	github.com/hashicorp/terraform-plugin-docs v0.16.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
+	github.com/jimlambrt/gldap v0.1.7
 	github.com/kr/pretty v0.3.1
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.39.0
-	mvdan.cc/gofumpt v0.8.0
+	github.com/stretchr/testify v1.8.4
+	golang.org/x/crypto v0.14.0
 )

 require (
-	dario.cat/mergo v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
-	github.com/BurntSushi/toml v1.2.1 // indirect
-	github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
-	github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
+	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.1 // indirect
+	github.com/Masterminds/semver/v3 v3.2.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/alessio/shellescape v1.4.2 // indirect
+	github.com/alessio/shellescape v1.4.1 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/containerd/continuity v0.4.3 // indirect
-	github.com/coreos/go-oidc/v3 v3.11.0 // indirect
-	github.com/danieljoos/wincred v1.2.1 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v25.0.3+incompatible // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/containerd/continuity v0.3.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.5.0 // indirect
+	github.com/danieljoos/wincred v1.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/cli v23.0.1+incompatible // indirect
+	github.com/docker/docker v23.0.3+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/glebarez/go-sqlite v1.22.0 // indirect
-	github.com/glebarez/sqlite v1.10.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
-	github.com/go-ldap/ldap/v3 v3.4.8 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
+	github.com/go-ldap/ldap/v3 v3.4.6 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/golang-migrate/migrate/v4 v4.16.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
-	github.com/hashicorp/cli v1.1.7 // indirect
-	github.com/hashicorp/dbassert v0.0.0-20231012105025-1bc1bd88e22b // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/hashicorp/dbassert v0.0.0-20230622135851-cc4c0f18f4a7 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/eventlogger v0.2.9 // indirect
-	github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20231208142215-efdb51ec090d // indirect
-	github.com/hashicorp/go-bexpr v0.1.13 // indirect
+	github.com/hashicorp/eventlogger v0.2.5 // indirect
+	github.com/hashicorp/eventlogger/filters/encrypt v0.1.8-0.20230428153751-cca445805f24 // indirect
+	github.com/hashicorp/go-bexpr v0.1.12 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-dbw v0.1.5-0.20240909162114-6cee92b3da36 // indirect
-	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/go-kms-wrapping/extras/kms/v2 v2.0.0-20241126174344-f3b1a41a15fd // indirect
-	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.8 // indirect
+	github.com/hashicorp/go-dbw v0.1.0 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-kms-wrapping/extras/kms/v2 v2.0.0-20230902160534-7a966e6313fd // indirect
+	github.com/hashicorp/go-kms-wrapping/plugin/v2 v2.0.4 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.6.3 // indirect
-	github.com/hashicorp/go-rate v0.0.0-20231204194614-cc8d401f70ab // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
+	github.com/hashicorp/go-plugin v1.5.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/base62 v0.1.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/gatedwriter v0.1.1 // indirect
 	github.com/hashicorp/go-secure-stdlib/kv-builder v0.1.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9 // indirect
+	github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.7 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.3 // indirect
-	github.com/hashicorp/go-secure-stdlib/permitpool v1.0.0 // indirect
 	github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.3 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.6 // indirect
+	github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.5 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/hashicorp/hc-install v0.9.2 // indirect
-	github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
-	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hc-install v0.6.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.18.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/nodeenrollment v0.2.13 // indirect
-	github.com/hashicorp/terraform-exec v0.23.0 // indirect
-	github.com/hashicorp/terraform-json v0.25.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.27.0 // indirect
+	github.com/hashicorp/nodeenrollment v0.2.6 // indirect
+	github.com/hashicorp/terraform-exec v0.19.0 // indirect
+	github.com/hashicorp/terraform-json v0.17.1 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.2 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
-	github.com/hashicorp/vault/api v1.12.0 // indirect
-	github.com/hashicorp/vault/sdk v0.11.0 // indirect
+	github.com/hashicorp/vault/api v1.9.1 // indirect
+	github.com/hashicorp/vault/sdk v0.3.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.14.3 // indirect
+	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.6.0 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/pgx/v4 v4.18.1 // indirect
+	github.com/jackc/pgx/v5 v5.4.3 // indirect
 	github.com/jefferai/go-libsecret v0.0.0-20210525195240-b53481abef97 // indirect
 	github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f // indirect
 	github.com/jefferai/keyring v1.1.7-0.20220316160357-58a74bb55891 // indirect
-	github.com/jinzhu/gorm v1.9.16 // indirect
+	github.com/jinzhu/gorm v1.9.12 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect
 	github.com/mitchellh/cli v1.1.5 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -150,68 +138,58 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/pointerstructure v1.2.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
-	github.com/opencontainers/runc v1.2.0-rc.3 // indirect
-	github.com/ory/dockertest/v3 v3.10.0 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/runc v1.1.5 // indirect
+	github.com/ory/dockertest/v3 v3.9.1 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
-	github.com/prometheus/client_golang v1.18.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.46.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/russross/blackfriday v1.6.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sethvargo/go-diceware v0.3.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/sirupsen/logrus v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
-	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xo/dburl v0.23.1 // indirect
-	github.com/yuin/goldmark v1.7.7 // indirect
-	github.com/yuin/goldmark-meta v1.1.0 // indirect
+	github.com/xo/dburl v0.16.0 // indirect
 	github.com/zalando/go-keyring v0.2.3 // indirect
-	github.com/zclconf/go-cty v1.16.3 // indirect
-	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
+	github.com/zclconf/go-cty v1.14.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
-	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/tools v0.33.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
-	google.golang.org/grpc v1.72.1 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/grpc v1.58.2 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/driver/postgres v1.5.9 // indirect
-	gorm.io/driver/sqlite v1.5.6 // indirect
-	gorm.io/gorm v1.25.11 // indirect
-	modernc.org/libc v1.41.0 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.7.2 // indirect
-	modernc.org/sqlite v1.28.0 // indirect
+	gorm.io/driver/postgres v1.5.2 // indirect
+	gorm.io/driver/sqlite v1.5.3 // indirect
+	gorm.io/gorm v1.25.4 // indirect
 )
@@ -46,18 +46,4 @@ const (
 	internalForceUpdateKey = "internal_force_update"
 	// workerFilter is used for common "worker_filter" resource attribute
 	WorkerFilterKey = "worker_filter"
-	// LoginNameKey is used for common "login_name" resource attribute
-	LoginNameKey = "login_name"
-	// PrimaryAccountIdKey is used for common "primary_account_id" resource attribute
-	PrimaryAccountIdKey = "primary_account_id"
-	// ScopeKey is used for common "scope" resource attribute
-	ScopeKey = "scope"
-	// ParentScopeKey is used for common "parent_scope_id" resource attribute
-	ParentScopeIdKey = "parent_scope_id"
-	// GroupMemberIdsKey is used for common "member_ids" resource attribute
-	GroupMemberIdsKey = "member_ids"
-	// ValueKey is used for common "value" resource attribute
-	ValueKey = "value"
-	// DestinationIdKey is used for common "destination_id" resource attribute
-	DestinationIdKey = "destination_id"
 )
@@ -1,139 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/hashicorp/boundary/api"
-	"github.com/hashicorp/boundary/api/accounts"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-)
-
-func dataSourceAccount() *schema.Resource {
-	return &schema.Resource{
-		Description: "The boundary_account data source allows you to find a Boundary account.",
-		ReadContext: dataSourceAccountRead,
-
-		Schema: map[string]*schema.Schema{
-			NameKey: {
-				Description:  "The name of the account to retrieve.",
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			AuthMethodIdKey: {
-				Description:  "The auth method ID that will be queried for the account.",
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			IDKey: {
-				Description: "The ID of the retrieved account.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			DescriptionKey: {
-				Description: "The description of the retrieved account.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			TypeKey: {
-				Description: "The type of the account",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			ScopeKey: {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						IDKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						NameKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						TypeKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						DescriptionKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						ParentScopeIdKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func dataSourceAccountRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	md := meta.(*metaData)
-
-	name := d.Get(NameKey).(string)
-	authMethodId := d.Get(AuthMethodIdKey).(string)
-
-	acl := accounts.NewClient(md.client)
-	accountsList, err := acl.List(ctx, authMethodId,
-		accounts.WithFilter(FilterWithItemNameMatches(name)),
-	)
-	if err != nil {
-		return diag.Errorf("error calling list account: %v", err)
-	}
-	accounts := accountsList.GetItems()
-	if accounts == nil {
-		return diag.Errorf("no accounts found")
-	}
-	if len(accounts) == 0 {
-		return diag.Errorf("no matching account found")
-	}
-	if len(accounts) > 1 {
-		return diag.Errorf("error found more than 1 account")
-	}
-
-	arr, err := acl.Read(ctx, accounts[0].Id)
-	if err != nil {
-		if apiErr := api.AsServerError(err); apiErr != nil && apiErr.Response().StatusCode() == http.StatusNotFound {
-			d.SetId("")
-			return nil
-		}
-		return diag.Errorf("error calling read account: %v", err)
-	}
-	if arr == nil {
-		return diag.Errorf("account nil after read")
-	}
-
-	if err := setFromAccountRead(d, *arr.Item); err != nil {
-		return diag.FromErr(err)
-	}
-
-	return nil
-}
-
-func setFromAccountRead(d *schema.ResourceData, account accounts.Account) error {
-	if err := d.Set(NameKey, account.Name); err != nil {
-		return err
-	}
-	if err := d.Set(DescriptionKey, account.Description); err != nil {
-		return err
-	}
-	if err := d.Set(TypeKey, account.Type); err != nil {
-		return err
-	}
-
-	d.Set(ScopeKey, flattenScopeInfo(account.Scope))
-	d.SetId(account.Id)
-	return nil
-}
@@ -1,121 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/boundary/testing/controller"
-	"github.com/hashicorp/cap/oidc"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-var accountPasswordRead = `
-data "boundary_account" "acc_password" {
-	depends_on = [ boundary_account_password.foo ]
-	name = "test"
-	auth_method_id = boundary_auth_method.foo.id
-}`
-
-var accountLdapRead = fmt.Sprintf(`
-data "boundary_account" "acc_ldap" {
-	depends_on = [ boundary_account_ldap.foo ]
-	name = "%s"
-	auth_method_id = boundary_auth_method_ldap.foo.id
-}`, testAccountLdapName)
-
-var accountOidcRead = `
-data "boundary_account" "acc_oidc" {
-	depends_on = [ boundary_account_oidc.foo ]
-	name = "test"
-	auth_method_id = boundary_auth_method_oidc.foo.id
-}`
-
-func TestAccAccountReadPassword(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, fooAccountPassword, accountPasswordRead),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAccountResourceExists(provider, "boundary_account_password.foo"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_password", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_password", AuthMethodIdKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_password", NameKey),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_password", DescriptionKey, fooAccountPasswordDesc),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_password", TypeKey, "password"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_password", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_password", "scope.0.name", "org1"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_password", "scope.0.type", "org"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccAccountReadLdap(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, testAccountLdap, accountLdapRead),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAccountResourceExists(provider, "boundary_account_ldap.foo"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_ldap", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_ldap", AuthMethodIdKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_ldap", NameKey),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_ldap", DescriptionKey, testAccountLdapDesc),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_ldap", TypeKey, "ldap"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_ldap", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_ldap", "scope.0.name", "org1"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_ldap", "scope.0.type", "org"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccAccountReadOidc(t *testing.T) {
-	tp := oidc.StartTestProvider(t)
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	tpCert := strings.TrimSpace(tp.CACert())
-	createConfig := fmt.Sprintf(fooAccountOidc, tp.Addr(), tpCert, fooAccountOidcDesc, tp.ExpectedSubject(), tp.Addr())
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, createConfig, accountOidcRead),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAccountResourceExists(provider, "boundary_account_oidc.foo"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_oidc", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_oidc", AuthMethodIdKey),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_oidc", NameKey),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_oidc", DescriptionKey, fooAccountOidcDesc),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_oidc", TypeKey, "oidc"),
-					resource.TestCheckResourceAttrSet("data.boundary_account.acc_oidc", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_oidc", "scope.0.name", "org1"),
-					resource.TestCheckResourceAttr("data.boundary_account.acc_oidc", "scope.0.type", "org"),
-				),
-			},
-		},
-	})
-}
@@ -1,142 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/hashicorp/boundary/api"
-	"github.com/hashicorp/boundary/api/authmethods"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-)
-
-func dataSourceAuthMethod() *schema.Resource {
-	return &schema.Resource{
-		Description: "The boundary_auth_method data source allows you to find a Boundary auth method.",
-		ReadContext: dataSourceAuthMethodRead,
-
-		Schema: map[string]*schema.Schema{
-			NameKey: {
-				Description:  "The name of the auth method to retrieve.",
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			ScopeIdKey: {
-				Description:  "The scope ID in which the resource is created. Defaults `global` if unset.",
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "global",
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			IDKey: {
-				Description: "The ID of the retrieved auth method.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			DescriptionKey: {
-				Description: "The description of the retrieved auth method.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			TypeKey: {
-				Description: "The type of the auth method",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			ScopeKey: {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						IDKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						NameKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						TypeKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						DescriptionKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						ParentScopeIdKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func dataSourceAuthMethodRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	md := meta.(*metaData)
-
-	name := d.Get(NameKey).(string)
-	scopeId := d.Get(ScopeIdKey).(string)
-
-	amcl := authmethods.NewClient(md.client)
-	authMethodsList, err := amcl.List(ctx, scopeId,
-		authmethods.WithFilter(FilterWithItemNameMatches(name)),
-	)
-	if err != nil {
-		return diag.Errorf("error calling list auth method: %v", err)
-	}
-	authMethods := authMethodsList.GetItems()
-	if authMethods == nil {
-		return diag.Errorf("no auth methods found")
-	}
-	if len(authMethods) == 0 {
-		return diag.Errorf("no matching auth method found")
-	}
-	if len(authMethods) > 1 {
-		return diag.Errorf("error found more than 1 auth method")
-	}
-
-	amrr, err := amcl.Read(ctx, authMethods[0].Id)
-	if err != nil {
-		if apiErr := api.AsServerError(err); apiErr != nil && apiErr.Response().StatusCode() == http.StatusNotFound {
-			d.SetId("")
-			return nil
-		}
-		return diag.Errorf("error calling read auth method: %v", err)
-	}
-	if amrr == nil {
-		return diag.Errorf("auth method nil after read")
-	}
-
-	if err := setFromAuthMethodRead(d, *amrr.Item); err != nil {
-		return diag.FromErr(err)
-	}
-
-	return nil
-}
-
-func setFromAuthMethodRead(d *schema.ResourceData, authMethod authmethods.AuthMethod) error {
-	if err := d.Set(NameKey, authMethod.Name); err != nil {
-		return err
-	}
-	if err := d.Set(DescriptionKey, authMethod.Description); err != nil {
-		return err
-	}
-	if err := d.Set(ScopeIdKey, authMethod.ScopeId); err != nil {
-		return err
-	}
-	if err := d.Set(TypeKey, authMethod.Type); err != nil {
-		return err
-	}
-	d.Set(ScopeKey, flattenScopeInfo(authMethod.Scope))
-	d.SetId(authMethod.Id)
-	return nil
-}
@@ -1,98 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/boundary/testing/controller"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-const (
-	testAuthMethodName = "test_auth_method"
-)
-
-var authMethodReadGlobal = fmt.Sprintf(`
-resource "boundary_auth_method" "auth_method" {
-	name 		= "%s"
-	description = "test"
-	scope_id    = "global"
-	type 		= "password"
-	depends_on  = [boundary_role.org1_admin]
-}
-
-data "boundary_auth_method" "auth_method" {
-	depends_on = [ boundary_auth_method.auth_method ]
-	name 	   = "%s"
-}`, testAuthMethodName, testAuthMethodName)
-
-var authMethodReadOrg = fmt.Sprintf(`
-resource "boundary_auth_method" "auth_method" {
-	name 		= "%s"
-	description = "test"
-	scope_id    = boundary_scope.org1.id
-	type 		= "password"
-	depends_on  = [boundary_role.org1_admin]
-}
-
-data "boundary_auth_method" "auth_method" {
-	depends_on = [ boundary_auth_method.auth_method ]
-	name = "%s"
-	scope_id = boundary_scope.org1.id
-}`, testAuthMethodName, testAuthMethodName)
-
-func TestAccAuthMethodReadGlobal(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, authMethodReadGlobal),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", ScopeIdKey),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", NameKey, testAuthMethodName),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", TypeKey, "password"),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", DescriptionKey),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", "scope.0.name", "global"),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", "scope.0.type", "global"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccAuthMethodReadOrg(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, authMethodReadOrg),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", ScopeIdKey),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", NameKey, testAuthMethodName),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", TypeKey, "password"),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", DescriptionKey),
-					resource.TestCheckResourceAttrSet("data.boundary_auth_method.auth_method", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", "scope.0.name", "org1"),
-					resource.TestCheckResourceAttr("data.boundary_auth_method.auth_method", "scope.0.type", "org"),
-				),
-			},
-		},
-	})
-}
@@ -1,144 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/hashicorp/boundary/api"
-	"github.com/hashicorp/boundary/api/groups"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-)
-
-func dataSourceGroup() *schema.Resource {
-	return &schema.Resource{
-		Description: "The boundary_group data source allows you to find a Boundary group.",
-		ReadContext: dataSourceGroupRead,
-
-		Schema: map[string]*schema.Schema{
-			NameKey: {
-				Description:  "The name of the group to retrieve.",
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			ScopeIdKey: {
-				Description:  "The scope ID in which the resource is created. Defaults `global` if unset.",
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "global",
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			IDKey: {
-				Description: "The ID of the retrieved group.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			DescriptionKey: {
-				Description: "The description of the retrieved group.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			ScopeKey: {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						IDKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						NameKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						TypeKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						DescriptionKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						ParentScopeIdKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-			GroupMemberIdsKey: {
-				Description: "Resource IDs for group members, these are most likely boundary users.",
-				Type:        schema.TypeSet,
-				Elem:        &schema.Schema{Type: schema.TypeString},
-				Computed:    true,
-			},
-		},
-	}
-}
-
-func dataSourceGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	md := meta.(*metaData)
-
-	name := d.Get(NameKey).(string)
-	scopeId := d.Get(ScopeIdKey).(string)
-
-	gcl := groups.NewClient(md.client)
-	groupsList, err := gcl.List(ctx, scopeId,
-		groups.WithFilter(FilterWithItemNameMatches(name)),
-	)
-	if err != nil {
-		return diag.Errorf("error calling list group: %v", err)
-	}
-	groups := groupsList.GetItems()
-	if groups == nil {
-		return diag.Errorf("no groups found")
-	}
-	if len(groups) == 0 {
-		return diag.Errorf("no matching group found")
-	}
-	if len(groups) > 1 {
-		return diag.Errorf("error found more than 1 group")
-	}
-
-	grr, err := gcl.Read(ctx, groups[0].Id)
-	if err != nil {
-		if apiErr := api.AsServerError(err); apiErr != nil && apiErr.Response().StatusCode() == http.StatusNotFound {
-			d.SetId("")
-			return nil
-		}
-		return diag.Errorf("error calling read group: %v", err)
-	}
-	if grr == nil {
-		return diag.Errorf("group nil after read")
-	}
-
-	if err := setFromGroupRead(d, *grr.Item); err != nil {
-		return diag.FromErr(err)
-	}
-
-	return nil
-}
-
-func setFromGroupRead(d *schema.ResourceData, group groups.Group) error {
-	if err := d.Set(NameKey, group.Name); err != nil {
-		return err
-	}
-	if err := d.Set(DescriptionKey, group.Description); err != nil {
-		return err
-	}
-	if err := d.Set(ScopeIdKey, group.ScopeId); err != nil {
-		return err
-	}
-	if err := d.Set(GroupMemberIdsKey, group.MemberIds); err != nil {
-		return err
-	}
-
-	d.Set(ScopeKey, flattenScopeInfo(group.Scope))
-	d.SetId(group.Id)
-	return nil
-}
@@ -1,113 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/boundary/testing/controller"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-const (
-	testGroupName = "test_group"
-)
-
-var groupReadGlobal = fmt.Sprintf(`
-
-resource "boundary_user" "user" {
-	description = "user"
-	scope_id    = "global"
-	depends_on  = [boundary_role.org1_admin]
-}
-
-resource "boundary_group" "group" {
-	name 	    = "%s"
-	description = "test"
-	scope_id    = "global"
-	member_ids  = [boundary_user.user.id]
-	depends_on  = [boundary_user.user]
-}
-
-data "boundary_group" "group" {
-	depends_on = [ boundary_group.group ]
-	name = "%s"
-}`, testGroupName, testGroupName)
-
-var groupReadOrg = fmt.Sprintf(`
-resource "boundary_user" "user" {
-	description = "user"
-	scope_id    = boundary_scope.org1.id
-	depends_on  = [boundary_role.org1_admin]
-}
-
-resource "boundary_group" "group" {
-	name 	    = "%s"
-	description = "test"
-	scope_id    = boundary_scope.org1.id
-	member_ids  = [boundary_user.user.id]
-	depends_on  = [boundary_user.user]
-}
-
-data "boundary_group" "group" {
-	depends_on = [ boundary_group.group ]
-	name = "%s"
-	scope_id = boundary_scope.org1.id
-}`, testGroupName, testGroupName)
-
-func TestAccGroupReadGlobal(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, groupReadGlobal),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGroupResourceExists(provider, "boundary_group.group"),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", ScopeIdKey),
-					resource.TestCheckResourceAttr("data.boundary_group.group", NameKey, testGroupName),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", DescriptionKey),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", fmt.Sprintf("%s.#", GroupMemberIdsKey)),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_group.group", "scope.0.name", "global"),
-					resource.TestCheckResourceAttr("data.boundary_group.group", "scope.0.type", "global"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccGroupReadOrg(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfig(url, fooOrg, groupReadOrg),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGroupResourceExists(provider, "boundary_group.group"),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", IDKey),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", ScopeIdKey),
-					resource.TestCheckResourceAttr("data.boundary_group.group", NameKey, testGroupName),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", DescriptionKey),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", fmt.Sprintf("%s.#", GroupMemberIdsKey)),
-					resource.TestCheckResourceAttrSet("data.boundary_group.group", "scope.0.id"),
-					resource.TestCheckResourceAttr("data.boundary_group.group", "scope.0.name", "org1"),
-					resource.TestCheckResourceAttr("data.boundary_group.group", "scope.0.type", "org"),
-				),
-			},
-		},
-	})
-}
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package provider

 import (
@@ -65,7 +62,7 @@ func dataSourceScopeRead(ctx context.Context, d *schema.ResourceData, meta inter

 	scpls, err := scp.List(ctx, scopeId, opts...)
 	if err != nil {
-		return diag.Errorf("error calling list scope: %v", err)
+		return diag.Errorf("error calling read scope: %v", err)
 	}
 	if scpls == nil {
 		return diag.Errorf("no scopes found")
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package provider

 import (
@@ -42,8 +39,8 @@ resource "boundary_scope" "project" {

 resource "boundary_role" "org_admin" {
 	scope_id = "global"
-	grant_scope_ids = [boundary_scope.org.id]
-	grant_strings = ["ids=*;type=*;actions=*"]
+	grant_scope_id = boundary_scope.org.id
+	grant_strings = ["id=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }

@@ -1,161 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"context"
-
-	"github.com/hashicorp/boundary/api/users"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-)
-
-func dataSourceUser() *schema.Resource {
-	return &schema.Resource{
-		Description: "The user data source allows you to find a Boundary user.",
-		ReadContext: dataSourceUserRead,
-
-		Schema: map[string]*schema.Schema{
-			IDKey: {
-				Description: "The ID of the user.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			NameKey: {
-				Description:  "The username to search for.",
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			DescriptionKey: {
-				Description: "The user description.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			ScopeIdKey: {
-				Description:  "The scope ID in which the resource is created. Defaults `global` if unset.",
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "global",
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-			userAccountIDsKey: {
-				Description: "Account ID's to associate with this user resource.",
-				Type:        schema.TypeSet,
-				Computed:    true,
-				Elem:        &schema.Schema{Type: schema.TypeString},
-			},
-			ScopeKey: {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						IDKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						NameKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						TypeKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						DescriptionKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-						ParentScopeIdKey: {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-			authorizedActions: {
-				Description: "A list of actions that the worker is entitled to perform.",
-				Type:        schema.TypeList,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
-				Computed: true,
-			},
-			LoginNameKey: {
-				Description: "Login name for user.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-			PrimaryAccountIdKey: {
-				Description: "Primary account ID.",
-				Type:        schema.TypeString,
-				Computed:    true,
-			},
-		},
-	}
-}
-
-func dataSourceUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	md := meta.(*metaData)
-	usrs := users.NewClient(md.client)
-
-	opts := []users.Option{}
-
-	// Get user ID using name
-	name := d.Get(NameKey).(string)
-	scopeID := d.Get(ScopeIdKey).(string)
-
-	opts = append(opts, users.WithFilter(FilterWithItemNameMatches(name)))
-
-	usersList, err := usrs.List(ctx, scopeID, opts...)
-	if err != nil {
-		return diag.Errorf("error calling list user: %v", err)
-	}
-	users := usersList.GetItems()
-
-	// check length, 0 means no user, > 1 means too many
-	if len(users) == 0 {
-		return diag.Errorf("no matching user found: %v", err)
-	}
-
-	if len(users) > 1 {
-		return diag.Errorf("error found more than 1 user: %v", err)
-	}
-
-	if err := setFromUserItem(d, *users[0]); err != nil {
-		return diag.FromErr(err)
-	}
-
-	return nil
-}
-
-func setFromUserItem(d *schema.ResourceData, user users.User) error {
-	if err := d.Set(NameKey, user.Name); err != nil {
-		return err
-	}
-	if err := d.Set(DescriptionKey, user.Description); err != nil {
-		return err
-	}
-	if err := d.Set(ScopeIdKey, user.ScopeId); err != nil {
-		return err
-	}
-	if err := d.Set(userAccountIDsKey, user.AccountIds); err != nil {
-		return err
-	}
-	if err := d.Set(authorizedActions, user.AuthorizedActions); err != nil {
-		return err
-	}
-	if err := d.Set(LoginNameKey, user.LoginName); err != nil {
-		return err
-	}
-	if err := d.Set(PrimaryAccountIdKey, user.PrimaryAccountId); err != nil {
-		return err
-	}
-
-	d.Set(ScopeKey, flattenScopeInfo(user.Scope))
-
-	d.SetId(user.Id)
-	return nil
-}
@@ -1,95 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/YakDriver/regexache"
-	"github.com/hashicorp/boundary/testing/controller"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-var (
-	orgUserDataSource = fmt.Sprintf(`
-resource "boundary_user" "org1" {
-	name        = "test"
-	description = "%s"
-	scope_id    = boundary_scope.org1.id
-	depends_on  = [boundary_role.org1_admin]
-}
-data "boundary_user" "org1" {
-	name     = "test"
-	scope_id = boundary_scope.org1.id
-	depends_on  = [boundary_user.org1]
-}`, fooDescription)
-
-	globalUserDataSource = `
-data "boundary_user" "admin" {
-	name        = "admin"
-	depends_on  = [boundary_role.org1_admin]
-}`
-)
-
-// NOTE: this test also tests out the direct token auth mechanism.
-
-func TestAccUserDataSource_basicOrgUser(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-	token := tc.Token().Token
-
-	resourceName := "boundary_user.org1"
-	dataSourceName := "data.boundary_user.org1"
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		CheckDestroy:      testAccCheckUserResourceDestroy(t, provider),
-		Steps: []resource.TestStep{
-			{
-				// test create
-				Config: testConfigWithToken(url, token, fooOrg, orgUserDataSource),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckUserResourceExists(provider, resourceName),
-					resource.TestCheckResourceAttr(dataSourceName, DescriptionKey, fooDescription),
-					resource.TestCheckResourceAttr(dataSourceName, NameKey, "test"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccUserDataSource_globalAdminUser(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-	token := tc.Token().Token
-
-	dataSourceName := "data.boundary_user.admin"
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories(&provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfigWithToken(url, token, fooOrg, globalUserDataSource),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(dataSourceName, NameKey, "admin"),
-					resource.TestCheckResourceAttr(dataSourceName, DescriptionKey, "Initial admin user within the \"global\" scope"),
-					resource.TestCheckResourceAttr(dataSourceName, LoginNameKey, "testuser"),
-					resource.TestMatchResourceAttr(dataSourceName, IDKey, regexache.MustCompile(`^u_.+`)),
-					resource.TestMatchResourceAttr(dataSourceName, PrimaryAccountIdKey, regexache.MustCompile(`^acctpw_.+`)),
-					resource.TestCheckResourceAttr(dataSourceName, "authorized_actions.#", "8"),
-					resource.TestCheckResourceAttr(dataSourceName, "scope.0.name", "global"),
-					resource.TestCheckResourceAttr(dataSourceName, "scope.0.id", "global"),
-					resource.TestCheckResourceAttr(dataSourceName, "scope.0.type", "global"),
-					resource.TestCheckResourceAttr(dataSourceName, "scope.0.description", "Global Scope"),
-				),
-			},
-		},
-	})
-}
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package provider
-
-import "fmt"
-
-func FilterWithItemNameMatches(name string) string {
-	return fmt.Sprintf("\"/item/name\" matches \"%s\"", name)
-}
@@ -98,7 +98,6 @@ func New() *schema.Provider {
 			"boundary_account_password":                         resourceAccountPassword(),
 			"boundary_account_oidc":                             resourceAccountOidc(),
 			"boundary_account_ldap":                             resourceAccountLdap(),
-			"boundary_alias_target":                             resourceAliasTarget(),
 			"boundary_auth_method":                              resourceAuthMethod(),
 			"boundary_auth_method_password":                     resourceAuthMethodPassword(),
 			"boundary_auth_method_oidc":                         resourceAuthMethodOidc(),
@@ -121,8 +120,6 @@ func New() *schema.Provider {
 			"boundary_host_set":                                 resourceHostSet(),
 			"boundary_host_set_static":                          resourceHostSetStatic(),
 			"boundary_host_set_plugin":                          resourceHostSetPlugin(),
-			"boundary_policy_storage":                           resourcePolicyStorage(),
-			"boundary_scope_policy_attachment":                  resourceScopePolicyAttachment(),
 			"boundary_role":                                     resourceRole(),
 			"boundary_scope":                                    resourceScope(),
 			"boundary_storage_bucket":                           resourceStorageBucket(),
@@ -131,11 +128,7 @@ func New() *schema.Provider {
 			"boundary_worker":                                   resourceWorker(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
-			"boundary_account":     dataSourceAccount(),
-			"boundary_auth_method": dataSourceAuthMethod(),
-			"boundary_group":       dataSourceGroup(),
-			"boundary_scope":       dataSourceScope(),
-			"boundary_user":        dataSourceUser(),
+			"boundary_scope": dataSourceScope(),
 		},
 	}

@@ -106,19 +106,6 @@ provider "boundary" {

 func testConfigWithDefaultAuthMethod(url string, res ...string) string {
 	provider := fmt.Sprintf(`
-provider "boundary" {
-	addr  = "%s"
-	auth_method_login_name = "%s"
-	auth_method_password = "%s"
-}`, url, tcLoginName, tcPassword)
-
-	c := []string{provider}
-	c = append(c, res...)
-	return strings.Join(c, "\n")
-}
-
-func testConfigWithDeprecatedAuthMethod(url string, res ...string) string {
-	provider := fmt.Sprintf(`
 provider "boundary" {
 	addr  = "%s"
 	password_auth_method_login_name = "%s"
@@ -269,28 +256,6 @@ func TestConfigWithDefaultAuthMethod(t *testing.T) {
 	})
 }

-func TestConfigWithDeprecatedAuthMethod(t *testing.T) {
-	tc := controller.NewTestController(t, tcConfig...)
-	defer tc.Shutdown()
-	url := tc.ApiAddrs()[0]
-
-	var provider *schema.Provider
-	resource.Test(t, resource.TestCase{
-		IsUnitTest:        true,
-		ProviderFactories: providerFactories(&provider),
-		CheckDestroy:      testAccCheckScopeResourceDestroy(t, provider),
-		Steps: []resource.TestStep{
-			{
-				Config: testConfigWithDeprecatedAuthMethod(url, fooOrg, firstProjectFoo, secondProject),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScopeResourceExists(provider, "boundary_scope.org1"),
-					testProviderTokenExists(provider),
-				),
-			},
-		},
-	})
-}
-
 func TestConfigWithoutAMPWCredentials(t *testing.T) {
 	tc := controller.NewTestController(t, tcConfig...)
 	defer tc.Shutdown()
@@ -92,8 +92,8 @@ resource "boundary_user" "alice" {

 resource "boundary_role" "ldap_principal" {
 	scope_id = boundary_scope.global.id
-	grant_scope_ids = [boundary_scope.global.id]
-	grant_strings = ["ids=*;type=*;actions=*"]
+	grant_scope_id = boundary_scope.global.id
+	grant_strings = ["id=*;type=*;actions=*"]
 	principal_ids = [boundary_user.alice.id]
 }`
 )
@@ -1 +1 @@
 .24.0
 .21.1
				`@@ -1 +0,0 @@`
				`terraform import boundary_account_ldap.foo <my-id>`
				`@@ -1 +0,0 @@`
				`terraform import boundary_alias_target.example_alias_target <my-id>`
				`@@ -1 +0,0 @@`
				`terraform import boundary_auth_method_ldap.foo <my-id>`
				`@@ -1 +0,0 @@`
				`terraform import boundary_auth_method_oidc.foo <my-id>`
				`@@ -1 +0,0 @@`
				`terraform import boundary_managed_group_ldap.foo <my-id>`