Added Cluster Manager Resource

.github/workflows/golangci-lint.yml

@@ -0,0 +1,19 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+  pull_request:
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.29

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+# This GitHub action can publish assets for release when a tag is created.
+# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0).
+#
+# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
+# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE`
+# secret. If you would rather own your own GPG handling, please fork this action
+# or use an alternative one for key handling.
+#
+# You will need to pass the `--batch` flag to `gpg` in your signing step
+# in `goreleaser` to indicate this is being used in a non-interactive mode.
+#
+name: release
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Unshallow
+        run: git fetch --prune --unshallow
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+      -
+        name: Import GPG key
+        id: import_gpg
+        uses: paultyng/[email protected]
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    name: Build and test
+    runs-on: ubuntu-latest
+
+    services:
+      splunk:
+        image: splunk/splunk:latest
+        env:
+          SPLUNK_START_ARGS: --accept-license
+          SPLUNK_PASSWORD: password
+        ports:
+          - 8000:8000
+          - 8089:8089
+
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.14
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+        if [ -f Gopkg.toml ]; then
+            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            dep ensure
+        fi
+
+    - name: Build
+      run: go build -v .
+
+    - name: Test
+      run: TF_ACC=1 SPLUNK_HOME=/opt/splunk SPLUNK_URL=localhost:8089 SPLUNK_USERNAME=admin SPLUNK_PASSWORD=password go test ./... -v

.gitignore

@@ -1,8 +1,10 @@
 # Ignore dist file
 .idea
 .terraform
+dist
 terraform-provider-splunk
 terraform.tfstate
 terraform.tfstate.backup
 *.log
 .DS_Store
+.vscode

CHANGELOG.md

@@ -0,0 +1,54 @@
+## 1.3.9 (January 6, 2021)
+* Support to create dashboards and views resource #45
+
+## 1.3.8 (January 5, 2021)
+* Fix: Unable to create a Metric index (#48)
+* Fix: TestAccCreateSplunkIndex is randomly failing (#39)
+
+## 1.3.7 (December 8, 2020)
+* Fix: http client overrides default transport and no longer supports environment proxy settings. (#46)
+
+## 1.3.6 (December 8, 2020)
+* Fix: Pass HEC token as input with http event collector resource
+
+## 1.3.5 (December 1, 2020)
+Add email message field for reports & alerts #38
+
+## 1.3.4 (November 18, 2020)
+* Fix: Adding Slack actions to saved_searches resource #33
+* Revert go mod path update
+
+## 1.3.3 (November 13, 2020)
+* Fix: Fix URL encoding for resource names #32
+* Enhancements: Added linting `golangci-lint`
+* go mod path update to `github.com/terraform-providers/terraform-provider-splunk`
+
+## 1.3.2 (October 21, 2020)
+* Fix: Feature Request for saved search to support additional attributes #24
+* Fix: `saved_search` default is_visible to true #3
+
+## 1.3.1 (October 6, 2020)
+* Support for admin/SAML-groups API endpoint #23
+
+## 1.3.0 (October 6, 2020)
+* Fix: authorization/roles srchIndexesAllowed and srchIndexesDefault should be lists #20
+* Fix: Support for saved_search argument dispatch.index_earliest #15
+* github action workflow for integration tests
+* Additional examples in the examples folder
+
+## 1.2.1 (September 30, 2020)
+* Bug fix for authorization header
+
+## 1.2.0 (September 29, 2020)
+* Change provider configuration - support for splunk auth token
+
+## 1.1.0 (September 25, 2020)
+* Change HTTP inputs resource attribute types (`use_ack` and `use_deployment_server`) to `int`
+* Creating examples folder
+* Adding AWS firehose + Splunk integration example under `examples/aws`
+
+## 1.0.2 (September 21, 2020)
+* Adding Github actions workflow
+
+## 1.0.1 (September 21, 2020)
+* Adding CHANGELOG.MD

LICENSE

@@ -370,4 +370,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ---------------------------------------------------------
 
   This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
+  defined by the Mozilla Public License, v. 2.0.

Makefile

@@ -16,7 +16,7 @@ default: build
 
 fmt:
 	go fmt ./...
-	@terraform fmt
+	@terraform fmt -recursive
 
 build:
 	go build -o terraform-provider-splunk .
@@ -34,4 +34,4 @@ plan:
 	@terraform plan
 
 apply:
-	@terraform apply -auto-approve
+	@terraform apply -auto-approve

README.md

@@ -8,19 +8,20 @@
 
 ### Building The Provider
 
-Clone the repository: https://git.splunk.com/projects/GSA/repos/terraform-provider-splunk
+Clone the [repository](https://github.com/splunk/terraform-provider-splunk/)
 
 Create go src directory and setup $GOPATH
 
 Build the provider: `make build`
 
 ### Developing The Provider
-* Use the Splunk REST API manual: https://docs.splunk.com/Documentation/Splunk/latest/RESTREF/RESTprolog to design resource schemas for the provider.
+* Use the [Splunk REST API manual](https://docs.splunk.com/Documentation/Splunk/latest/RESTREF/RESTprolog) to design resource schemas for the provider.
 * Add a resource_x_test.go file to test the new resources' CRUD operations
 * Before merging your changes lint your code by running `make fmt`
 * Test the provider with the existing suite of provider tests before merging your changes
 * Build the provider and test the new resources' CRUD and import operations before merging your changes
 * Add all necessary documentation in the docs folder
+* As per [best practices](https://www.terraform.io/docs/extend/best-practices/versioning.html), update changelog.md and version as required
 
 ### Testing The Provider
 * To run unit tests: `make test`
@@ -37,20 +38,26 @@ Build the provider: `make build`
 * For importing existing resources use `terraform import`
 * To remove all terraform managed resources use `terraform destroy`
 
-**NOTE:** When developing or testing with terraform `>= 0.13` you must replace the provider location from remote (registry.terraform.io) to local build.
+**NOTE:** When developing and testing local provider builds, if terraform version `>= 0.13` you would have to replace the provider binaries in the `.terraform` folder with your local build. [Follow these guidelines](https://github.com/hashicorp/terraform/blob/master/website/upgrade-guides/0-13.html.markdown)
 
-Follow guidelines: https://github.com/hashicorp/terraform/blob/master/website/upgrade-guides/0-13.html.markdown
+### Contributions
+We are open to contributions!
+<p>Please follow development guidelines and feel free to open a PR against the `master` branch with your changes. The PR should trigger the GitHub actions to run
+both the unit and acceptance tests. Once all tests have passed, our team will review, make suggestions, approve, and merge the PR.
+After merging, our team will update the changelog.MD file and create a version tag that should automatically create a new release.</p>
 
 #### Examples
-* Use the `example.tf` provided in the repo to run `terraform plan` and `terraform apply` to apply configuration
-  * Modify `provider "splunk"` resource block with proper instance details
-* To update values modify the `example.tf` file and execute `terraform plan` and `terraform apply`
+* The examples folder contains a few basic splunk provider examples, run `terraform init` and `terraform apply` to apply these example configuration.
 * Resource examples are also available in their respective docs/resources folder
 
-**NOTE:** Create a resource block first before importing resources (USAGE: https://www.terraform.io/docs/import/usage.html)
+**NOTE:** Create a resource block first before importing resources. Docs on the import [usage](https://www.terraform.io/docs/import/usage.html)
 
 #### Notes and Troubleshooting
 * When conflicts arise during resource creation, import the resource first using `terraform import` command and make modifications to the resource.
-* Testing errors mentioning `too many open files` may be related to `ulimits` on your machine. Check current and increase the maximum number of open files `1024` using `ulimits -n 1024`
+* Testing errors mentioning `too many open files` may be related to `ulimit` on your machine. Check current and increase the maximum number of open files `1024` using `ulimit -n 1024`
 * If conf files are edited or deleted <b>manually</b>, restart Splunk to ensure state consistency before applying or reapplying a template.
 * Splunk environments with numerous indexes, saved searches, knowledge objects, etc. may cause issues with the provided tests. To avoid these errors, use a fresh or lightly configured Splunk environment.
+
+### Support
+Use the [GitHub issue tracker](https://github.com/splunk/terraform-provider-splunk/issues) to submit bugs or request features.
+[Splunk Ideas](https://ideas.splunk.com/) is another place for your suggestions and [Splunk Answers](https://community.splunk.com/t5/Community/ct-p/en-us) for questions.

client/acl.go

@@ -1,10 +1,11 @@
 package client
 
 import (
-	"github.com/google/go-querystring/query"
+	"github.com/splunk/terraform-provider-splunk/client/models"
 	"net/http"
 	"strings"
-	"terraform-provider-splunk/client/models"
+
+	"github.com/google/go-querystring/query"
 )
 
 //https://docs.splunk.com/Documentation/Splunk/8.0.4/RESTUM/RESTusing#Access_Control_List
@@ -23,6 +24,9 @@ func (client *Client) GetAcl(owner, app, name string, resources ...string) (*htt
 
 func (client *Client) UpdateAcl(owner, app, name string, acl *models.ACLObject, resources ...string) error {
 	values, err := query.Values(&acl)
+	if err != nil {
+		return err
+	}
 	// remove app from url values during POST
 	values.Del("app")
 	values.Del("perms[read]")
@@ -45,6 +49,9 @@ func (client *Client) UpdateAcl(owner, app, name string, acl *models.ACLObject,
 
 func (client *Client) Move(owner, app, name string, acl *models.ACLObject, resources ...string) error {
 	values, err := query.Values(&acl)
+	if err != nil {
+		return err
+	}
 	// Adding resources
 	resourcePath := []string{"servicesNS", owner, app}
 	resourcePath = append(resourcePath, resources...)

client/admin_saml_groups.go

@@ -0,0 +1,59 @@
+package client
+
+import (
+	"github.com/splunk/terraform-provider-splunk/client/models"
+	"net/http"
+
+	"github.com/google/go-querystring/query"
+)
+
+func (client *Client) CreateAdminSAMLGroups(name string, adminSAMLGroupsObject *models.AdminSAMLGroupsObject) error {
+	values, err := query.Values(adminSAMLGroupsObject)
+	if err != nil {
+		return err
+	}
+
+	endpoint := client.BuildSplunkURL(nil, "services", "admin", "SAML-groups")
+	resp, err := client.Post(endpoint, values)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	return nil
+}
+
+func (client *Client) ReadAdminSAMLGroups(name string) (*http.Response, error) {
+	endpoint := client.BuildSplunkURL(nil, "services", "admin", "SAML-groups", name)
+	resp, err := client.Get(endpoint)
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}
+
+func (client *Client) UpdateAdminSAMLGroups(name string, adminSAMLGroupsObject *models.AdminSAMLGroupsObject) error {
+	values, err := query.Values(&adminSAMLGroupsObject)
+	if err != nil {
+		return err
+	}
+	// Not required for updates
+	values.Del("name")
+	endpoint := client.BuildSplunkURL(nil, "services", "admin", "SAML-groups", name)
+	resp, err := client.Post(endpoint, values)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	return nil
+}
+
+func (client *Client) DeleteAdminSAMLGroups(name string) (*http.Response, error) {
+	endpoint := client.BuildSplunkURL(nil, "services", "admin", "SAML-groups", name)
+	resp, err := client.Delete(endpoint)
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

client/apps_local.go

@@ -1,14 +1,17 @@
 package client
 
 import (
+	"github.com/splunk/terraform-provider-splunk/client/models"
 	"net/http"
-	"terraform-provider-splunk/client/models"
 
 	"github.com/google/go-querystring/query"
 )
 
 func (client *Client) CreateAppsLocalObject(app string, localAppObject *models.AppsLocalObject) error {
 	values, err := query.Values(localAppObject)
+	if err != nil {
+		return err
+	}
 	endpoint := client.BuildSplunkURL(nil, "servicesNS", "nobody", "system", "apps", "local")
 	resp, err := client.Post(endpoint, values)
 	if err != nil {
@@ -29,6 +32,9 @@ func (client *Client) ReadAppsLocalObject(app string) (*http.Response, error) {
 
 func (client *Client) UpdateAppsLocalObject(app string, localAppObject *models.AppsLocalObject) error {
 	values, err := query.Values(&localAppObject)
+	if err != nil {
+		return err
+	}
 	values.Del("name")             // Handler does not support "name" argument
 	values.Del("update")           // Handler does not support "udpate" argument
 	values.Del("filename")         // Handler does not support "filename" argument