Merge new feature changes into Main (#167)

* update ATG advanced settings struct (#160) * ATG crud operations * add ATG in service tunnel spec * support ATG in registered service * add support for attaching/detaching access tier to group * add test cases * refactor code * resolve review comments * update ATG advanced settings * SCIM changes terraform changes (#161) * ATG crud operations * add ATG in service tunnel spec * support ATG in registered service * add support for attaching/detaching access tier to group * add test cases * refactor code * resolve review comments * add terraform changes for scim * update ATG advanced settings --------- Co-authored-by: Naresh Kakubal <naresh@banyansecurity.io> * Always on vpn terraform changes (#162) * ATG crud operations * add ATG in service tunnel spec * support ATG in registered service * add support for attaching/detaching access tier to group * add test cases * refactor code * resolve review comments * always on vpn changes * update ATG advanced settings * fix test --------- Co-authored-by: Naresh Kakubal <naresh@banyansecurity.io> * renaming package * recommendation * add a way to input for running tests on demand * add a way to input for running tests on demand * address security alerts * update dependencies * Documentation generated * update static check version * address review comments * revert tunnel_config to tunnel_enduser till bug is fixed in production --------- Co-authored-by: rohitSangamnerkar <148537411+rohitSangamnerkar@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com>
banyansecurity · Apr 11, 2024 · 281c40e · 281c40e
1 parent ee33ead
commit 281c40e
Show file tree

Hide file tree

Showing 34 changed files with 1,759 additions and 180 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -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
@@ -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
@@ -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"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
@@ -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

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -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:
@@ -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
@@ -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/
@@ -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"
diff --git a/banyan/provider.go b/banyan/provider.go
@@ -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(),