diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d7113b..fe86282 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,18 +36,6 @@ jobs: version: "3.x" - name: Check out code into the Go module directory uses: actions/checkout@v4.1.5 - - name: Add SSH Go Module Private Key - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.GO_MODULE_PRIVATE_KEY }}" - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV - - name: Setup access for private go modules - run: | - git config --global url."ssh://git@github.com/".insteadOf https://github.com/ - run: go mod download - name: Build run: task build @@ -72,18 +60,6 @@ jobs: version: "3.x" - name: Check out code into the Go module directory uses: actions/checkout@v4.1.5 - - name: Add SSH Go Module Private Key - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.GO_MODULE_PRIVATE_KEY }}" - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV - - name: Setup access for private go modules - run: | - git config --global url."ssh://git@github.com/".insteadOf https://github.com/ - run: go mod download - name: Run additional linters - tfproviderlint is flakey on go >=1.22.0 run: task lint @@ -103,18 +79,6 @@ jobs: uses: arduino/setup-task@v2 with: version: "3.x" - - name: Add SSH Go Module Private Key - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.GO_MODULE_PRIVATE_KEY }}" - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV - - name: Setup access for private go modules - run: | - git config --global url."ssh://git@github.com/".insteadOf https://github.com/ - name: Check out code into the Go module directory uses: actions/checkout@v4.1.5 - name: Check if docs are up-to-date @@ -125,63 +89,51 @@ jobs: test -z "$BADDOCS" || (echo -e "documentation needs regenerating using task docs: $BADDOCS"; exit 1) # Run acceptance tests in a matrix with Terraform CLI versions - test: - name: Terraform Provider Acceptance Tests - needs: build - runs-on: ubuntu-latest - timeout-minutes: 15 - strategy: - fail-fast: false - # Current Bonsai dev account is limited to the number of sandbox items - # which can be created. - max-parallel: 1 - matrix: - include: - - tool: opentofu - version: v1.6.x - - tool: opentofu - version: v1.7.x - - tool: terraform - version: v1.7.* - - tool: terraform - version: v1.8.* - - tool: terraform - version: v1.9.* + # test: + # name: Terraform Provider Acceptance Tests + # needs: build + # runs-on: ubuntu-latest + # timeout-minutes: 15 + # strategy: + # fail-fast: false + # # Current Bonsai dev account is limited to the number of sandbox items + # # which can be created. + # max-parallel: 1 + # matrix: + # include: + # - tool: opentofu + # version: v1.6.x + # - tool: opentofu + # version: v1.7.x + # - tool: terraform + # version: v1.7.* + # - tool: terraform + # version: v1.8.* + # - tool: terraform + # version: v1.9.* - steps: - - uses: actions/checkout@v4.1.5 - - uses: actions/setup-go@v5.0.1 - with: - go-version-file: 'go.mod' - cache: true - - if: matrix.tool == 'terraform' - uses: hashicorp/setup-terraform@v3 - with: - terraform_version: ${{ matrix.version }} - terraform_wrapper: false + # steps: + # - uses: actions/checkout@v4.1.5 + # - uses: actions/setup-go@v5.0.1 + # with: + # go-version-file: 'go.mod' + # cache: true + # - if: matrix.tool == 'terraform' + # uses: hashicorp/setup-terraform@v3 + # with: + # terraform_version: ${{ matrix.version }} + # terraform_wrapper: false - - if: matrix.tool == 'opentofu' - uses: opentofu/setup-opentofu@v1 - with: - tofu_version: ${{ matrix.version }} - tofu_wrapper: false - - name: Add SSH Go Module Private Key - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: | - mkdir -p ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts - ssh-agent -a $SSH_AUTH_SOCK > /dev/null - ssh-add - <<< "${{ secrets.GO_MODULE_PRIVATE_KEY }}" - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV - - name: Setup access for private go modules - run: | - git config --global url."ssh://git@github.com/".insteadOf https://github.com/ - - run: go mod download - - env: - TF_ACC: "1" - TF_LOG: "INFO" - BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }} - BONSAI_API_TOKEN: ${{ secrets.BONSAI_API_TOKEN }} - run: go test -v -cover ./internal/... - timeout-minutes: 10 + # - if: matrix.tool == 'opentofu' + # uses: opentofu/setup-opentofu@v1 + # with: + # tofu_version: ${{ matrix.version }} + # tofu_wrapper: false + # - run: go mod download + # - env: + # TF_ACC: "1" + # TF_LOG: "INFO" + # BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }} + # BONSAI_API_TOKEN: ${{ secrets.BONSAI_API_TOKEN }} + # run: go test -v -cover ./internal/... + # timeout-minutes: 10 diff --git a/.task/checksum/docs b/.task/checksum/docs index ad245bc..1f77b1b 100644 --- a/.task/checksum/docs +++ b/.task/checksum/docs @@ -1 +1 @@ -ff5bf8f2e9064712d876ce0f0de2d3b7 +d7dd695ec806732716d655c7f649e43 diff --git a/docs/resources/cluster.md b/docs/resources/cluster.md index 0797828..7dd278a 100644 --- a/docs/resources/cluster.md +++ b/docs/resources/cluster.md @@ -17,7 +17,7 @@ resource "bonsai_cluster" "test" { name = "comped example" plan = { - slug = "standard-nano-comped" + slug = "sandbox" } space = { diff --git a/examples/complete/complete.tf b/examples/complete/complete.tf index bf4c75d..6e1b5df 100644 --- a/examples/complete/complete.tf +++ b/examples/complete/complete.tf @@ -40,7 +40,7 @@ output "bonsai_releases" { // Bonsai Plans data "bonsai_plan" "get_by_slug" { - slug = "standard-micro-aws-us-east-1" + slug = "sandbox" } data "bonsai_plans" "list" {} @@ -75,7 +75,7 @@ resource "bonsai_cluster" "test" { name = "complete example" plan = { - slug = "standard-nano-comped" + slug = "sandbox" } space = { diff --git a/examples/resources/bonsai_cluster/resource.tf b/examples/resources/bonsai_cluster/resource.tf index 6c1fbbc..ad03d9f 100644 --- a/examples/resources/bonsai_cluster/resource.tf +++ b/examples/resources/bonsai_cluster/resource.tf @@ -2,7 +2,7 @@ resource "bonsai_cluster" "test" { name = "comped example" plan = { - slug = "standard-nano-comped" + slug = "sandbox" } space = { diff --git a/internal/cluster/resource_test.go b/internal/cluster/resource_test.go index ffd5d90..505bda3 100644 --- a/internal/cluster/resource_test.go +++ b/internal/cluster/resource_test.go @@ -97,7 +97,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() { name = "never-created-test-cluster" plan = { - slug = "standard-nano-comped" + slug = "sandbox" } space = { @@ -118,7 +118,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() { name = "never-created-test-cluster" plan = { - slug = "standard-nano-comped" + slug = "sandbox" } space = { @@ -140,7 +140,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() { name = "%s" plan = { - slug = "standard-nano-comped" + slug = "admin-hobby" } space = { @@ -169,7 +169,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() { name = "%s" plan = { - slug = "standard-nano-comped" + slug = "admin-hobby" } space = {