feat: enhance error report and ignore removed resources on destroy (#107

)

* feat: enhance error report and ignore removed resources on destroy
* fix(ci): Workaround Go 1.16 issue with go.sum dependencies
* chore: Update dependencies

.github/workflows/ci-master.yml

@@ -45,6 +45,9 @@ jobs:
         with:
           go-version: ^1.15
 
+      - name: Workaround Go 1.16 issue with go.sum dependencies
+        run: go env -w GOFLAGS=-mod=mod
+
       - name: Build project
         run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o terraform-provider-sysdig
 
@@ -69,6 +72,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
+      - name: Workaround Go 1.16 issue with go.sum dependencies
+        run: go env -w GOFLAGS=-mod=mod
+
       - name: Get dependencies
         run: |
           go get -u -v github.com/onsi/ginkgo/ginkgo

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

@@ -45,6 +45,9 @@ jobs:
         with:
           go-version: ^1.15
 
+      - name: Workaround Go 1.16 issue with go.sum dependencies
+        run: go env -w GOFLAGS=-mod=mod
+
       - name: Build project
         run: GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o terraform-provider-sysdig
 
@@ -69,6 +72,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
+      - name: Workaround Go 1.16 issue with go.sum dependencies
+        run: go env -w GOFLAGS=-mod=mod
+
       - name: Get dependencies
         run: |
           go get -u -v github.com/onsi/ginkgo/ginkgo

go.mod

@@ -6,32 +6,38 @@ require (
 	cloud.google.com/go v0.76.0 // indirect
 	cloud.google.com/go/storage v1.13.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
+	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
+	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/aws/aws-sdk-go v1.37.10 // indirect
-	github.com/fatih/color v1.10.0 // indirect
+	github.com/fatih/color v1.12.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
-	github.com/hashicorp/go-getter v1.5.2 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.6.8
+	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
+	github.com/hashicorp/go-hclog v0.16.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/hashicorp/hcl/v2 v2.8.2 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
-	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
+	github.com/hashicorp/hcl/v2 v2.10.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.3.1 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0
+	github.com/hashicorp/yamux v0.0.0-20210707203944-259a57b3608c // indirect
 	github.com/jmespath/go-jmespath v0.4.0
+	github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba // indirect
 	github.com/klauspost/compress v1.11.7 // indirect
-	github.com/mitchellh/copystructure v1.1.1 // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/spf13/cast v1.3.1
 	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/zclconf/go-cty v1.7.1 // indirect
+	github.com/zclconf/go-cty v1.9.0 // indirect
 	go.opencensus.io v0.22.6 // indirect
-	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
 	golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
 	google.golang.org/api v0.40.0 // indirect
-	google.golang.org/genproto v0.0.0-20210212180131-e7f2df4ecc2d // indirect
+	google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a // indirect
 )

sysdig/internal/client/common/helpers.go

@@ -0,0 +1,30 @@
+package common
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"strings"
+
+	"github.com/jmespath/go-jmespath"
+	"github.com/spf13/cast"
+)
+
+func errorFromResponse(response *http.Response) error {
+	var data interface{}
+	err := json.NewDecoder(response.Body).Decode(&data)
+	if err != nil {
+		return errors.New(response.Status)
+	}
+
+	search, err := jmespath.Search("[message, errors[].[reason, message]][][] | join(', ', @)", data)
+	if err != nil {
+		return errors.New(response.Status)
+	}
+
+	if searchArray, ok := search.([]interface{}); ok {
+		return errors.New(strings.Join(cast.ToStringSlice(searchArray), ", "))
+	}
+
+	return errors.New(cast.ToString(search))
+}

sysdig/internal/client/common/users.go

@@ -3,7 +3,6 @@ package common
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -16,13 +15,12 @@ func (client *sysdigCommonClient) GetUserById(ctx context.Context, id int) (u *U
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -34,18 +32,16 @@ func (client *sysdigCommonClient) GetUserByEmail(ctx context.Context, email stri
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
 	var userList struct {
 		Users []User `json:"users"`
 	}
 
-	err = json.Unmarshal(body, &userList)
+	err = json.NewDecoder(response.Body).Decode(&userList)
 	if err != nil {
 		return
 	}
@@ -67,13 +63,12 @@ func (client *sysdigCommonClient) CreateUser(ctx context.Context, uRequest *User
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusCreated {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -85,13 +80,12 @@ func (client *sysdigCommonClient) UpdateUser(ctx context.Context, uRequest *User
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }
@@ -103,8 +97,8 @@ func (client *sysdigCommonClient) DeleteUser(ctx context.Context, id int) error
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK {
-		return errors.New(response.Status)
+	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotFound {
+		return errorFromResponse(response)
 	}
 	return nil
 }
@@ -117,11 +111,11 @@ func (client *sysdigCommonClient) GetCurrentUser(ctx context.Context) (u *User,
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
-	body, _ := ioutil.ReadAll(response.Body)
 
+	body, _ := ioutil.ReadAll(response.Body)
 	user := UserFromJSON(body)
 	return &user, nil
 }

sysdig/internal/client/monitor/alerts.go

@@ -33,7 +33,7 @@ func (c *sysdigMonitorClient) DeleteAlert(ctx context.Context, alertID int) erro
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK {
+	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotFound {
 		return errorFromResponse(response)
 	}
 
@@ -47,7 +47,7 @@ func (c *sysdigMonitorClient) UpdateAlert(ctx context.Context, alert Alert) (upd
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != 200 {
+	if response.StatusCode != http.StatusOK {
 		err = errorFromResponse(response)
 		return
 	}
@@ -66,7 +66,7 @@ func (c *sysdigMonitorClient) GetAlertById(ctx context.Context, alertID int) (al
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != 200 {
+	if response.StatusCode != http.StatusOK {
 		err = errorFromResponse(response)
 		return
 	}

sysdig/internal/client/monitor/dashboards.go

@@ -71,7 +71,7 @@ func (client *sysdigMonitorClient) DeleteDashboard(ctx context.Context, ID int)
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK {
+	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotFound {
 		return errorFromResponse(response)
 	}
 

sysdig/internal/client/monitor/notification_channels.go

@@ -97,7 +97,7 @@ func (client *sysdigMonitorClient) DeleteNotificationChannel(ctx context.Context
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK {
+	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotFound {
 		return errorFromResponse(response)
 	}
 	return nil

sysdig/internal/client/monitor/teams.go

@@ -16,13 +16,12 @@ func (client *sysdigMonitorClient) getUserIdbyEmail(ctx context.Context, userRol
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return nil, err
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	// Set User Id to UserRoles struct
 	usersList := UsersListFromJSON(body)
 	usersMap := make(map[string]int)
@@ -31,7 +30,6 @@ func (client *sysdigMonitorClient) getUserIdbyEmail(ctx context.Context, userRol
 	}
 
 	modifiedUserRoles := []UserRoles{}
-
 	for _, userRole := range userRoles {
 		ur := userRole
 		id, ok := usersMap[ur.Email]
@@ -52,13 +50,12 @@ func (client *sysdigMonitorClient) GetTeamById(ctx context.Context, id int) (t T
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	t = TeamFromJSON(body)
 
 	return
@@ -78,13 +75,12 @@ func (client *sysdigMonitorClient) CreateTeam(ctx context.Context, tRequest Team
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusCreated {
-		err = errors.New(response.Status + " " + string(body))
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	t = TeamFromJSON(body)
 	return
 }
@@ -102,13 +98,12 @@ func (client *sysdigMonitorClient) UpdateTeam(ctx context.Context, tRequest Team
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
-
 	if response.StatusCode != http.StatusOK {
-		err = errors.New(response.Status)
+		err = errorFromResponse(response)
 		return
 	}
 
+	body, _ := ioutil.ReadAll(response.Body)
 	t = TeamFromJSON(body)
 	return
 }
@@ -120,7 +115,7 @@ func (client *sysdigMonitorClient) DeleteTeam(ctx context.Context, id int) error
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK {
+	if response.StatusCode != http.StatusNoContent && response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotFound {
 		return errorFromResponse(response)
 	}
 	return nil