Merge pull request #14 from authzed/barakmich/small-review

barakmich · web-flow · commit 7b88a36c947f · 2025-04-17T14:46:50.000-04:00
Small review for some lints, clean up some examples, and some tighter constraints
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ dist/
 *.dylib
 *.test
 *.out
+# Terraform state
+*.tfstate
+*.tfstate.backup
diff --git a/examples/provider/terraform.tfstate b/examples/provider/terraform.tfstate
diff --git a/examples/provider/terraform.tfstate.backup b/examples/provider/terraform.tfstate.backup
diff --git a/internal/client/cloud_client.go b/internal/client/cloud_client.go
@@ -48,7 +48,7 @@ func NewCloudClient(cfg *CloudClientConfig) *CloudClient {
 }
 
 // NewRequest creates a new HTTP request with the necessary headers
-func (c *CloudClient) NewRequest(method, path string, body interface{}) (*http.Request, error) {
+func (c *CloudClient) NewRequest(method, path string, body any) (*http.Request, error) {
 	// Fix URL construction to handle trailing slashes properly
 	host := c.Host
 	// Remove trailing slash from host if path starts with slash
diff --git a/internal/client/errors.go b/internal/client/errors.go
@@ -28,7 +28,7 @@ func NewAPIError(resp *http.Response) *APIError {
 
 	var errMsg string
 	// Try to parse as JSON if possible
-	var jsonErr map[string]interface{}
+	var jsonErr map[string]any
 	if err := json.Unmarshal(body, &jsonErr); err == nil {
 		if msg, ok := jsonErr["message"].(string); ok {
 			errMsg = msg
diff --git a/internal/client/platform_client.go b/internal/client/platform_client.go
@@ -48,7 +48,7 @@ func NewPlatformClient(cfg *PlatformClientConfig) *PlatformClient {
 }
 
 // NewRequest creates a new HTTP request with the necessary headers
-func (c *PlatformClient) NewRequest(method, path string, body interface{}) (*http.Request, error) {
+func (c *PlatformClient) NewRequest(method, path string, body any) (*http.Request, error) {
 	url := fmt.Sprintf("%s%s", c.Host, path)
 
 	var bodyReader io.Reader
diff --git a/internal/provider/permission_system_data_source.go b/internal/provider/permission_system_data_source.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &permissionsSystemDataSource{}
+var _ datasource.DataSourceWithConfigure = &permissionsSystemDataSource{}
 
 func NewPermissionsSystemDataSource() datasource.DataSource {
 	return &permissionsSystemDataSource{}
diff --git a/internal/provider/permission_systems_data_source.go b/internal/provider/permission_systems_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &permissionsSystemsDataSource{}
+var _ datasource.DataSourceWithConfigure = &permissionsSystemsDataSource{}
 
 func NewPermissionsSystemsDataSource() datasource.DataSource {
 	return &permissionsSystemsDataSource{}
diff --git a/internal/provider/policies_data_source.go b/internal/provider/policies_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &policiesDataSource{}
+var _ datasource.DataSourceWithConfigure = &policiesDataSource{}
 
 func NewPoliciesDataSource() datasource.DataSource {
 	return &policiesDataSource{}
diff --git a/internal/provider/policy_data_source.go b/internal/provider/policy_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &policyDataSource{}
+var _ datasource.DataSourceWithConfigure = &policyDataSource{}
 
 func NewPolicyDataSource() datasource.DataSource {
 	return &policyDataSource{}
diff --git a/internal/provider/role_data_source.go b/internal/provider/role_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &roleDataSource{}
+var _ datasource.DataSourceWithConfigure = &roleDataSource{}
 
 func NewRoleDataSource() datasource.DataSource {
 	return &roleDataSource{}
diff --git a/internal/provider/roles_data_source.go b/internal/provider/roles_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &rolesDataSource{}
+var _ datasource.DataSourceWithConfigure = &rolesDataSource{}
 
 // NewRolesDataSource creates a new data source for listing roles
 func NewRolesDataSource() datasource.DataSource {
diff --git a/internal/provider/service_account_data_source.go b/internal/provider/service_account_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &serviceAccountDataSource{}
+var _ datasource.DataSourceWithConfigure = &serviceAccountDataSource{}
 
 func NewServiceAccountDataSource() datasource.DataSource {
 	return &serviceAccountDataSource{}
diff --git a/internal/provider/service_accounts_data_source.go b/internal/provider/service_accounts_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &serviceAccountsDataSource{}
+var _ datasource.DataSourceWithConfigure = &serviceAccountsDataSource{}
 
 func NewServiceAccountsDataSource() datasource.DataSource {
 	return &serviceAccountsDataSource{}
diff --git a/internal/provider/token_data_source.go b/internal/provider/token_data_source.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &TokenDataSource{}
+var _ datasource.DataSourceWithConfigure = &TokenDataSource{}
 
 func NewTokenDataSource() datasource.DataSource {
 	return &TokenDataSource{}
diff --git a/internal/provider/token_resource.go b/internal/provider/token_resource.go
@@ -117,7 +117,7 @@ func (r *TokenResource) Create(ctx context.Context, req resource.CreateRequest,
 		ServiceAccountID:    plan.ServiceAccountID.ValueString(),
 	}
 
-	tflog.Info(ctx, "Creating token", map[string]interface{}{
+	tflog.Info(ctx, "Creating token", map[string]any{
 		"name":                 token.Name,
 		"permission_system_id": token.PermissionsSystemID,
 		"service_account_id":   token.ServiceAccountID,
diff --git a/internal/provider/tokens_data_source.go b/internal/provider/tokens_data_source.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
-var _ datasource.DataSource = &TokensDataSource{}
+var _ datasource.DataSourceWithConfigure = &TokensDataSource{}
 
 func NewTokensDataSource() datasource.DataSource {
 	return &TokensDataSource{}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func NewCloudClient(cfg CloudClientConfig) CloudClient {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// NewRequest creates a new HTTP request with the necessary headers`
`51`		`-func (c CloudClient) NewRequest(method, path string, body interface{}) (http.Request, error) {`
	`51`	`+func (c CloudClient) NewRequest(method, path string, body any) (http.Request, error) {`
`52`	`52`	`// Fix URL construction to handle trailing slashes properly`
`53`	`53`	`host := c.Host`
`54`	`54`	`// Remove trailing slash from host if path starts with slash`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func NewPlatformClient(cfg PlatformClientConfig) PlatformClient {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// NewRequest creates a new HTTP request with the necessary headers`
`51`		`-func (c PlatformClient) NewRequest(method, path string, body interface{}) (http.Request, error) {`
	`51`	`+func (c PlatformClient) NewRequest(method, path string, body any) (http.Request, error) {`
`52`	`52`	`url := fmt.Sprintf("%s%s", c.Host, path)`
`53`	`53`
`54`	`54`	`var bodyReader io.Reader`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/hashicorp/terraform-plugin-framework/types"`
`13`	`13`	`)`
`14`	`14`
`15`		`-var _ datasource.DataSource = &permissionsSystemDataSource{}`
	`15`	`+var _ datasource.DataSourceWithConfigure = &permissionsSystemDataSource{}`
`16`	`16`
`17`	`17`	`func NewPermissionsSystemDataSource() datasource.DataSource {`
`18`	`18`	`return &permissionsSystemDataSource{}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/hashicorp/terraform-plugin-framework/types"`
`12`	`12`	`)`
`13`	`13`
`14`		`-var _ datasource.DataSource = &permissionsSystemsDataSource{}`
	`14`	`+var _ datasource.DataSourceWithConfigure = &permissionsSystemsDataSource{}`
`15`	`15`
`16`	`16`	`func NewPermissionsSystemsDataSource() datasource.DataSource {`
`17`	`17`	`return &permissionsSystemsDataSource{}`