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.

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

Merge new feature changes into Main #167

Merged
merged 13 commits into from
Apr 11, 2024
Merged
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: pull_request
on:
pull_request:
types: [push, force-push, opened, edited, synchronize, reopened]
types: [opened, edited, synchronize, reopened]
jobs:
pull_request:
runs-on: ubuntu-latest
Expand All @@ -21,9 +21,9 @@ jobs:
run: git fetch --prune --unshallow
-
name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.5
go-version: 1.22
-
name: Run Go Mod Tidy
run: go mod tidy
Expand All @@ -50,6 +50,6 @@ jobs:
fi
-
name: Static Check
uses: dominikh/staticcheck-action@v1.3.0
uses: dominikh/staticcheck-action@v1.3.1
with:
version: "2022.1.3"
version: "latest"
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
run: git fetch --prune --unshallow
-
name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.5
go-version: 1.22
-
name: Test
run: go test ./banyan/... -v
Expand All @@ -45,7 +45,7 @@ jobs:
PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v5
with:
version: latest
args: release --rm-dist
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
name: run_tests

on:
push:
workflow_dispatch:
branches: [ "dev" ]
inputs:
command_center_url:
description: 'Command Center URL'
required: true
default: 'https://net.banyanops.com'
type: string
secrets:
api_key:
description: 'API Key'
required: true
type: string

jobs:
run_tests:
Expand All @@ -20,9 +31,9 @@ jobs:
run: git fetch --prune --unshallow
-
name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.5
go-version: 1.22
-
name: Run Go Mod Tidy
run: go mod tidy
Expand All @@ -31,8 +42,8 @@ jobs:
run: go test ./banyan/... -v
env:
TF_ACC: true
BANYAN_API_KEY: ${{ secrets.BANYAN_API_KEY }}
BANYAN_HOST: ${{ secrets.BANYAN_HOST }}
BANYAN_API_KEY: ${{ secrets.api_key }}
BANYAN_HOST: ${{ inputs.command_center_url }}
-
name: Generate Documentation
run: go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate --provider-name terraform-provider-banyan --examples-dir ./examples/
Expand All @@ -47,6 +58,6 @@ jobs:
fi
-
name: Static Check
uses: dominikh/staticcheck-action@v1.3.0
uses: dominikh/staticcheck-action@v1.3.1
with:
version: "2022.1.3"
version: "latest"
2 changes: 2 additions & 0 deletions banyan/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ func Provider() *schema.Provider {
"banyan_api_key": resourceApiKey(),
"banyan_connector": resourceConnector(),
"banyan_accesstier": resourceAccessTier(),
"banyan_accesstier_group": resourceAccessTierGroup(),
"banyan_scim": resourceSCIM(),
},
DataSourcesMap: map[string]*schema.Resource{
"banyan_oidc_settings": dataSourceOidcSettings(),
Expand Down
Loading