chore(lint): fix linting errors (#135)

* add azure to valid benchmark schemas

* update docs

* azure SP creds

* refactor

* gcp case

* refactor

* chore(fmt)

* chore: add pre-commit

* chore(lint): silent error handling

https://github.com/hashicorp/terraform-plugin-sdk/blob/main/helper/schema/resource_data.go#L206

* chore(lint): silent error handling

https://github.com/hashicorp/terraform-plugin-sdk/blob/main/helper/schema/resource_data.go#L206

* chore(lint): non required print

* chore(lint): error handling

* chore(lint): enforce linting

* chore(lint): pre-commit options

* chore(doc): readme/contrib update

* chore(lint): fixes

* chore(lint): revert. changed error for _

* chore(ci): test

* chore(ci): test

* chore(ci): test

* chore(lint): revert. changed error for _

Co-authored-by: Alex <alex.qiu@sysdig.com>

Author: iru

.envrc.template

@@ -0,0 +1,3 @@
+# prod/kubelab
+export SYSDIG_SECURE_API_TOKEN=
+export SYSDIG_MONITOR_API_TOKEN=

.github/workflows/ci-pull-request.yml

@@ -94,7 +94,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Lint
-        continue-on-error: true
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.27
+          args: --timeout 30m

.pre-commit-config.yaml

@@ -2,8 +2,8 @@ repos:
   - repo: local
     hooks:
     -   id: fmt
-        pass_filenames: false
         name: fmt
+        pass_filenames: false
         entry: make fmt
         language: system
     -   id: fmtcheck
@@ -12,7 +12,23 @@ repos:
         entry: make fmtcheck
         language: system
     -   id: lint
-        pass_filenames: false
         name: lint
+        pass_filenames: false
         entry: make lint
         language: system
+#  -   id: test-compile
+#        name: test-compile
+#        pass_filenames: false
+#        entry: make test-compile
+#        language: system
+    -   id: test
+        name: test
+        pass_filenames: false
+        entry: make test
+        language: system
+    -   id: testacc
+        name: testacc
+        pass_filenames: false
+        entry: make testacc
+        language: system
+

README.md

@@ -1,3 +1,8 @@
+<a href="https://terraform.io">
+    <img src="https://raw.githubusercontent.com/hashicorp/terraform-provider-aws/main/.github/terraform_logo.svg" alt="Terraform logo" title="Terraform" align="right" height="50" />
+</a>
+
+
 Terraform Provider for Sysdig
 =============================
 
@@ -6,7 +11,6 @@ Terraform Provider for Sysdig
 - Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 - [Blog on how to use this provider with Sysdig Secure](https://sysdig.com/blog/using-terraform-for-container-security-as-code/)
 
-<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
 
 Requirements
 ------------
@@ -29,7 +33,9 @@ Using the provider
 ----------------------
 If you're building the provider, follow the instructions to [install it as a plugin.](https://www.terraform.io/docs/plugins/basics.html#installing-a-plugin) After placing it into your plugins directory,  run `terraform init` to initialize it.
 
-Developing the Provider
+---
+
+Contribute
 ---------------------------
 
 If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.13+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
@@ -54,3 +60,16 @@ If you want to execute the acceptance tests, you can run `make testacc`. Please
 ```sh
 $ make testacc
 ```
+
+### Proposing PR's
+
+* on pull-requests some validations are enforced.
+  this can be prevented using [**pre-commit**](https://pre-commit.com)
+  * Defined in [`/.pre-commit-config.yaml`](https://github.com/sysdiglabs/terraform-provider-sysdig/blob/master/.pre-commit-config.yaml)
+* for `testacc` some credentials are required, check [`/.envrc.template`](https://github.com/sysdiglabs/terraform-provider-sysdig/blob/master/.envrc.template)
+
+
+### Release
+
+* Use **semver** for releases https://semver.org
+* To create a new release, create and push a new tag and it will be released  by [`/.github/workflows/release.yml`](https://github.com/sysdiglabs/terraform-provider-sysdig/blob/master/.github/workflows/release.yml)

sysdig/data_source_sysdig_current_user.go

@@ -53,10 +53,10 @@ func dataSourceSysdigCurrentUserRead(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.SetId(strconv.Itoa(user.ID))
-	d.Set("email", user.Email)
-	d.Set("name", user.FirstName)
-	d.Set("last_name", user.LastName)
-	d.Set("system_role", user.SystemRole)
+	_ = d.Set("email", user.Email)
+	_ = d.Set("name", user.FirstName)
+	_ = d.Set("last_name", user.LastName)
+	_ = d.Set("system_role", user.SystemRole)
 
 	return nil
 }

sysdig/data_source_sysdig_fargate_workload_agent.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/falcosecurity/kilt/runtimes/cloudformation/cfnpatcher"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -198,7 +199,7 @@ func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.Res
 
 	cdefChecksum := sha256.Sum256([]byte(containerDefinitions))
 	d.SetId(fmt.Sprintf("%x", cdefChecksum))
-	err = d.Set("output_container_definitions", *outputContainerDefinitions)
+	_ = d.Set("output_container_definitions", *outputContainerDefinitions)
 	if err != nil {
 		return diag.FromErr(err)
 	}

sysdig/data_source_sysdig_secure_notification_channel.go

@@ -117,22 +117,22 @@ func dataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.Reso
 	}
 
 	d.SetId(strconv.Itoa(nc.ID))
-	d.Set("version", nc.Version)
-	d.Set("name", nc.Name)
-	d.Set("enabled", nc.Enabled)
-	d.Set("type", nc.Type)
-	d.Set("recipients", strings.Join(nc.Options.EmailRecipients, ","))
-	d.Set("topics", strings.Join(nc.Options.SnsTopicARNs, ","))
-	d.Set("api_key", nc.Options.APIKey)
-	d.Set("url", nc.Options.Url)
-	d.Set("channel", nc.Options.Channel)
-	d.Set("account", nc.Options.Account)
-	d.Set("service_key", nc.Options.ServiceKey)
-	d.Set("service_name", nc.Options.ServiceName)
-	d.Set("routing_key", nc.Options.RoutingKey)
-	d.Set("notify_when_ok", nc.Options.NotifyOnOk)
-	d.Set("notify_when_resolved", nc.Options.NotifyOnResolve)
-	d.Set("send_test_notification", nc.Options.SendTestNotification)
+	_ = d.Set("version", nc.Version)
+	_ = d.Set("name", nc.Name)
+	_ = d.Set("enabled", nc.Enabled)
+	_ = d.Set("type", nc.Type)
+	_ = d.Set("recipients", strings.Join(nc.Options.EmailRecipients, ","))
+	_ = d.Set("topics", strings.Join(nc.Options.SnsTopicARNs, ","))
+	_ = d.Set("api_key", nc.Options.APIKey)
+	_ = d.Set("url", nc.Options.Url)
+	_ = d.Set("channel", nc.Options.Channel)
+	_ = d.Set("account", nc.Options.Account)
+	_ = d.Set("service_key", nc.Options.ServiceKey)
+	_ = d.Set("service_name", nc.Options.ServiceName)
+	_ = d.Set("routing_key", nc.Options.RoutingKey)
+	_ = d.Set("notify_when_ok", nc.Options.NotifyOnOk)
+	_ = d.Set("notify_when_resolved", nc.Options.NotifyOnResolve)
+	_ = d.Set("send_test_notification", nc.Options.SendTestNotification)
 
 	// When we receive a notification channel of type OpsGenie,
 	// the API sends us the URL, but we are configuring the API
@@ -147,8 +147,9 @@ func dataSourceSysdigNotificationChannelRead(ctx context.Context, d *schema.Reso
 			return diag.FromErr(err)
 		}
 		key := regex.FindStringSubmatch(nc.Options.Url)[1]
-		d.Set("api_key", key)
-		d.Set("url", "")
+		_ = d.Set("api_key", key)
+		_ = d.Set("url", "")
+
 	}
 	return nil
 }

sysdig/data_source_sysdig_secure_trusted_cloud_identity.go

@@ -64,26 +64,26 @@ func dataSourceSysdigSecureTrustedCloudIdentityRead(ctx context.Context, d *sche
 	}
 
 	d.SetId(identity)
-	d.Set("identity", identity)
+	_ = d.Set("identity", identity)
 
 	provider := d.Get("cloud_provider")
 	switch provider {
 	case "aws", "gcp":
 		// If identity is an ARN, attempt to extract certain fields
 		parsedArn, err := arn.Parse(identity)
 		if err == nil {
-			d.Set("aws_account_id", parsedArn.AccountID)
-
+			_ = d.Set("aws_account_id", parsedArn.AccountID)
 			if parsedArn.Service == "iam" && strings.HasPrefix(parsedArn.Resource, "role/") {
-				d.Set("aws_role_name", strings.TrimPrefix(parsedArn.Resource, "role/"))
+				_ = d.Set("aws_role_name", strings.TrimPrefix(parsedArn.Resource, "role/"))
 			}
 		}
 	case "azure":
 		// If identity is an Azure tenantID/clientID, separate into each part
 		tenantID, clientID, err := parseAzureCreds(identity)
 		if err == nil {
-			d.Set("azure_tenant_id", tenantID)
-			d.Set("azure_client_id", clientID)
+			_ = d.Set("azure_tenant_id", tenantID)
+			_ = d.Set("azure_client_id", clientID)
+
 		}
 	}
 	return nil

sysdig/data_source_sysdig_user.go

@@ -57,10 +57,10 @@ func dataSourceSysdigUserRead(ctx context.Context, d *schema.ResourceData, meta
 	}
 
 	d.SetId(strconv.Itoa(u.ID))
-	d.Set("version", u.Version)
-	d.Set("system_role", u.SystemRole)
-	d.Set("first_name", u.FirstName)
-	d.Set("last_name", u.LastName)
+	_ = d.Set("version", u.Version)
+	_ = d.Set("system_role", u.SystemRole)
+	_ = d.Set("first_name", u.FirstName)
+	_ = d.Set("last_name", u.LastName)
 
 	return nil
 

sysdig/internal/client/common/models.go

@@ -23,7 +23,7 @@ func (u *User) ToJSON() io.Reader {
 
 func UserFromJSON(body []byte) User {
 	var result userWrapper
-	json.Unmarshal(body, &result)
+	_ = json.Unmarshal(body, &result)
 
 	return result.User
 }