fix: lint

ecmadao · ecmadao · commit 2e6c2015b555 · 2022-11-21T18:25:15.000+08:00
diff --git a/go.mod b/go.mod
@@ -47,9 +47,9 @@ require (
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/zclconf/go-cty v1.11.0 // indirect
 	golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
-	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/net v0.2.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
 	google.golang.org/grpc v1.48.0 // indirect
diff --git a/go.sum b/go.sum
@@ -237,8 +237,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -266,15 +266,15 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8=
-golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
diff --git a/provider/internal/doc.go b/provider/internal/doc.go
@@ -0,0 +1,2 @@
+// Package internal is the utils for test.
+package internal
diff --git a/provider/internal/mock_client.go b/provider/internal/mock_client.go
@@ -27,7 +27,7 @@ func newMockClient(_, _, _ string) (api.Client, error) {
 }
 
 // Login will login the user and get the response.
-func (c *mockClient) Login() (*api.AuthResponse, error) {
+func (*mockClient) Login() (*api.AuthResponse, error) {
 	return &api.AuthResponse{}, nil
 }
 
@@ -45,7 +45,7 @@ func (c *mockClient) CreateEnvironment(create *api.EnvironmentCreate) (*api.Envi
 	}
 
 	if existed := c.findEnvironmentByName(env.Name); existed != nil {
-		return nil, errors.Errorf("Environment %s already exists.", create.Name)
+		return nil, errors.Errorf("Environment %s already exists", create.Name)
 	}
 	c.environmentMap[env.ID] = env
 
@@ -56,15 +56,15 @@ func (c *mockClient) CreateEnvironment(create *api.EnvironmentCreate) (*api.Envi
 func (c *mockClient) GetEnvironment(environmentID int) (*api.Environment, error) {
 	env, ok := c.environmentMap[environmentID]
 	if !ok {
-		return nil, errors.Errorf("Cannot found environment with ID %d.", environmentID)
+		return nil, errors.Errorf("Cannot found environment with ID %d", environmentID)
 	}
 
 	return env, nil
 }
 
 // ListEnvironment finds all environments.
-func (c *mockClient) ListEnvironment() ([]*api.Environment, error) {
-	return nil, errors.Errorf("ListEnvironment is not implemented yet.")
+func (*mockClient) ListEnvironment() ([]*api.Environment, error) {
+	return nil, errors.Errorf("ListEnvironment is not implemented yet")
 }
 
 // UpdateEnvironment updates the environment.
@@ -82,7 +82,7 @@ func (c *mockClient) UpdateEnvironment(environmentID int, patch *api.Environment
 	}
 
 	if existed := c.findEnvironmentByName(env.Name); existed != nil {
-		return nil, errors.Errorf("Environment %s already exists.", env.Name)
+		return nil, errors.Errorf("Environment %s already exists", env.Name)
 	}
 
 	delete(c.environmentMap, env.ID)
@@ -107,26 +107,26 @@ func (c *mockClient) findEnvironmentByName(envName string) *api.Environment {
 }
 
 // ListInstance will return all instances.
-func (c *mockClient) ListInstance() ([]*api.Instance, error) {
-	return nil, errors.Errorf("ListInstance is not implemented yet.")
+func (*mockClient) ListInstance() ([]*api.Instance, error) {
+	return nil, errors.Errorf("ListInstance is not implemented yet")
 }
 
 // CreateInstance creates the instance.
-func (c *mockClient) CreateInstance(create *api.InstanceCreate) (*api.Instance, error) {
-	return nil, errors.Errorf("CreateInstance is not implemented yet.")
+func (*mockClient) CreateInstance(_ *api.InstanceCreate) (*api.Instance, error) {
+	return nil, errors.Errorf("CreateInstance is not implemented yet")
 }
 
 // GetInstance gets the instance by id.
-func (c *mockClient) GetInstance(instanceID int) (*api.Instance, error) {
-	return nil, errors.Errorf("GetInstance is not implemented yet.")
+func (*mockClient) GetInstance(_ int) (*api.Instance, error) {
+	return nil, errors.Errorf("GetInstance is not implemented yet")
 }
 
 // UpdateInstance updates the instance.
-func (c *mockClient) UpdateInstance(instanceID int, patch *api.InstancePatch) (*api.Instance, error) {
-	return nil, errors.Errorf("UpdateInstance is not implemented yet.")
+func (*mockClient) UpdateInstance(_ int, _ *api.InstancePatch) (*api.Instance, error) {
+	return nil, errors.Errorf("UpdateInstance is not implemented yet")
 }
 
 // DeleteInstance deletes the instance.
-func (c *mockClient) DeleteInstance(instanceID int) error {
-	return errors.Errorf("DeleteInstance is not implemented yet.")
+func (*mockClient) DeleteInstance(_ int) error {
+	return errors.Errorf("DeleteInstance is not implemented yet")
 }
diff --git a/provider/provider_test.go b/provider/provider_test.go
@@ -25,7 +25,7 @@ func TestProvider(t *testing.T) {
 	}
 }
 
-func TestProvider_impl(t *testing.T) {
+func TestProvider_impl(_ *testing.T) {
 	var _ *schema.Provider = NewProvider()
 }
 
diff --git a/provider/resource_environment_test.go b/provider/resource_environment_test.go
@@ -5,9 +5,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/bytebase/terraform-provider-bytebase/api"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/pkg/errors"
+
+	"github.com/bytebase/terraform-provider-bytebase/api"
 )
 
 func TestAccEnvironment(t *testing.T) {
@@ -62,11 +64,11 @@ func testAccCheckEnvironmentExists(n string) resource.TestCheckFunc {
 		rs, ok := s.RootModule().Resources[n]
 
 		if !ok {
-			return fmt.Errorf("Not found: %s", n)
+			return errors.Errorf("Not found: %s", n)
 		}
 
 		if rs.Primary.ID == "" {
-			return fmt.Errorf("No environment set")
+			return errors.Errorf("No environment set")
 		}
 
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Package internal is the utils for test.`
	`2`	`+package internal`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func newMockClient(_, _, _ string) (api.Client, error) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Login will login the user and get the response.`
`30`		`-func (c mockClient) Login() (api.AuthResponse, error) {`
	`30`	`+func (mockClient) Login() (api.AuthResponse, error) {`
`31`	`31`	`return &api.AuthResponse{}, nil`
`32`	`32`	`}`
`33`	`33`
`@@ -45,7 +45,7 @@ func (c mockClient) CreateEnvironment(create api.EnvironmentCreate) (*api.Envi`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if existed := c.findEnvironmentByName(env.Name); existed != nil {`
`48`		`- return nil, errors.Errorf("Environment %s already exists.", create.Name)`
	`48`	`+ return nil, errors.Errorf("Environment %s already exists", create.Name)`
`49`	`49`	`}`
`50`	`50`	`c.environmentMap[env.ID] = env`
`51`	`51`
`@@ -56,15 +56,15 @@ func (c mockClient) CreateEnvironment(create api.EnvironmentCreate) (*api.Envi`
`56`	`56`	`func (c mockClient) GetEnvironment(environmentID int) (api.Environment, error) {`
`57`	`57`	`env, ok := c.environmentMap[environmentID]`
`58`	`58`	`if !ok {`
`59`		`- return nil, errors.Errorf("Cannot found environment with ID %d.", environmentID)`
	`59`	`+ return nil, errors.Errorf("Cannot found environment with ID %d", environmentID)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return env, nil`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`// ListEnvironment finds all environments.`
`66`		`-func (c mockClient) ListEnvironment() ([]api.Environment, error) {`
`67`		`- return nil, errors.Errorf("ListEnvironment is not implemented yet.")`
	`66`	`+func (mockClient) ListEnvironment() ([]api.Environment, error) {`
	`67`	`+ return nil, errors.Errorf("ListEnvironment is not implemented yet")`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// UpdateEnvironment updates the environment.`
`@@ -82,7 +82,7 @@ func (c mockClient) UpdateEnvironment(environmentID int, patch api.Environment`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if existed := c.findEnvironmentByName(env.Name); existed != nil {`
`85`		`- return nil, errors.Errorf("Environment %s already exists.", env.Name)`
	`85`	`+ return nil, errors.Errorf("Environment %s already exists", env.Name)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`delete(c.environmentMap, env.ID)`
`@@ -107,26 +107,26 @@ func (c mockClient) findEnvironmentByName(envName string) api.Environment {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// ListInstance will return all instances.`
`110`		`-func (c mockClient) ListInstance() ([]api.Instance, error) {`
`111`		`- return nil, errors.Errorf("ListInstance is not implemented yet.")`
	`110`	`+func (mockClient) ListInstance() ([]api.Instance, error) {`
	`111`	`+ return nil, errors.Errorf("ListInstance is not implemented yet")`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// CreateInstance creates the instance.`
`115`		`-func (c mockClient) CreateInstance(create api.InstanceCreate) (*api.Instance, error) {`
`116`		`- return nil, errors.Errorf("CreateInstance is not implemented yet.")`
	`115`	`+func (mockClient) CreateInstance(_ api.InstanceCreate) (*api.Instance, error) {`
	`116`	`+ return nil, errors.Errorf("CreateInstance is not implemented yet")`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// GetInstance gets the instance by id.`
`120`		`-func (c mockClient) GetInstance(instanceID int) (api.Instance, error) {`
`121`		`- return nil, errors.Errorf("GetInstance is not implemented yet.")`
	`120`	`+func (mockClient) GetInstance(_ int) (api.Instance, error) {`
	`121`	`+ return nil, errors.Errorf("GetInstance is not implemented yet")`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// UpdateInstance updates the instance.`
`125`		`-func (c mockClient) UpdateInstance(instanceID int, patch api.InstancePatch) (*api.Instance, error) {`
`126`		`- return nil, errors.Errorf("UpdateInstance is not implemented yet.")`
	`125`	`+func (mockClient) UpdateInstance(_ int, _ api.InstancePatch) (*api.Instance, error) {`
	`126`	`+ return nil, errors.Errorf("UpdateInstance is not implemented yet")`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// DeleteInstance deletes the instance.`
`130`		`-func (c *mockClient) DeleteInstance(instanceID int) error {`
`131`		`- return errors.Errorf("DeleteInstance is not implemented yet.")`
	`130`	`+func (*mockClient) DeleteInstance(_ int) error {`
	`131`	`+ return errors.Errorf("DeleteInstance is not implemented yet")`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func TestProvider(t *testing.T) {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-func TestProvider_impl(t *testing.T) {`
	`28`	`+func TestProvider_impl(_ *testing.T) {`
`29`	`29`	`var _ *schema.Provider = NewProvider()`
`30`	`30`	`}`
`31`	`31`