Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SSH key for go private module workarounds #13

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Remove SSH key for go private module workarounds #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
349abf5
Remove SSH key for go private module workarounds
momer Jul 16, 2024
34bec6f
Update plan refs for acceptance testing
momer Jul 16, 2024
3ff4dd9
Disable acceptance tests temporarily
momer Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 46 additions & 94 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .task/checksum/docs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ff5bf8f2e9064712d876ce0f0de2d3b7
d7dd695ec806732716d655c7f649e43
2 changes: 1 addition & 1 deletion docs/resources/cluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resource "bonsai_cluster" "test" {
name = "comped example"

plan = {
slug = "standard-nano-comped"
slug = "sandbox"
}

space = {
Expand Down
4 changes: 2 additions & 2 deletions examples/complete/complete.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {}
Expand Down Expand Up @@ -75,7 +75,7 @@ resource "bonsai_cluster" "test" {
name = "complete example"

plan = {
slug = "standard-nano-comped"
slug = "sandbox"
}

space = {
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/bonsai_cluster/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ resource "bonsai_cluster" "test" {
name = "comped example"

plan = {
slug = "standard-nano-comped"
slug = "sandbox"
}

space = {
Expand Down
8 changes: 4 additions & 4 deletions internal/cluster/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() {
name = "never-created-test-cluster"

plan = {
slug = "standard-nano-comped"
slug = "sandbox"
}

space = {
Expand All @@ -118,7 +118,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() {
name = "never-created-test-cluster"

plan = {
slug = "standard-nano-comped"
slug = "sandbox"
}

space = {
Expand All @@ -140,7 +140,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() {
name = "%s"

plan = {
slug = "standard-nano-comped"
slug = "admin-hobby"
}

space = {
Expand Down Expand Up @@ -169,7 +169,7 @@ func (s *ClusterTestSuite) TestCluster_Resource() {
name = "%s"

plan = {
slug = "standard-nano-comped"
slug = "admin-hobby"
}

space = {
Expand Down
Loading