Fix linter errors

hashicorp · Oct 11, 2023 · 15b67b3 · 15b67b3
1 parent 6aebad1
commit 15b67b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/internal/hcpvalidator/display_name.go b/internal/hcpvalidator/display_name.go
@@ -24,13 +24,13 @@ type displayNameValidator struct {
 }
 
 // Description describes the validation in plain text formatting.
-func (validator displayNameValidator) Description(_ context.Context) string {
+func (v displayNameValidator) Description(_ context.Context) string {
 	return invalidDisplayNameErr
 }
 
 // MarkdownDescription describes the validation in Markdown formatting.
-func (validator displayNameValidator) MarkdownDescription(ctx context.Context) string {
-	return validator.Description(ctx)
+func (v displayNameValidator) MarkdownDescription(ctx context.Context) string {
+	return v.Description(ctx)
 }
 
 // Validate performs the validation.

diff --git a/internal/hcpvalidator/display_name_test.go b/internal/hcpvalidator/display_name_test.go
@@ -59,10 +59,6 @@ func TestDisplayNameValidator(t *testing.T) {
 func TestDisplayNameValidator_Good(t *testing.T) {
 	t.Parallel()
 
-	type testCase struct {
-		val         types.String
-		expectError bool
-	}
 	tests := []string{
 		"goodName", "1goodName", "goodName1", "good-Name", "good1Name2", "goodNamE",
 		"GOODNAME", "GOODNAME1", "GOOD-NAME", "GOOD1NAME2", "GOODNAME",
@@ -91,10 +87,6 @@ func TestDisplayNameValidator_Good(t *testing.T) {
 func TestDisplayNameValidator_Bad(t *testing.T) {
 	t.Parallel()
 
-	type testCase struct {
-		val         types.String
-		expectError bool
-	}
 	tests := []string{
 		"bad@", "bad#", "bad$", "bad%", "bad^", "bad&", "bad*", "bad(", "bad)", "bad/", "bad\\",
 		"a", "1", "-",

diff --git a/internal/hcpvalidator/resource_name_part.go b/internal/hcpvalidator/resource_name_part.go
@@ -24,13 +24,13 @@ type resourceNamePartValidator struct {
 }
 
 // Description describes the validation in plain text formatting.
-func (validator resourceNamePartValidator) Description(_ context.Context) string {
+func (v resourceNamePartValidator) Description(_ context.Context) string {
 	return invalidResourceNamePartErr
 }
 
 // MarkdownDescription describes the validation in Markdown formatting.
-func (validator resourceNamePartValidator) MarkdownDescription(ctx context.Context) string {
-	return validator.Description(ctx)
+func (v resourceNamePartValidator) MarkdownDescription(ctx context.Context) string {
+	return v.Description(ctx)
 }
 
 // Validate performs the validation.

diff --git a/internal/provider/resourcemanager/data_source_project.go b/internal/provider/resourcemanager/data_source_project.go
@@ -84,10 +84,9 @@ func (d *DataSourceProject) Read(ctx context.Context, req datasource.ReadRequest
 
 	// Determine the ID
 	id := data.Project.ValueString()
+	id = strings.TrimPrefix(id, "project/")
 	if id == "" {
 		id = d.client.Config.ProjectID
-	} else if strings.HasPrefix(id, "project/") {
-		id = strings.TrimPrefix(id, "project/")
 	}
 
 	if d.client == nil {