fix: lint errors

Author: jianyuan

.github/workflows/test.yml

@@ -5,9 +5,13 @@ name: Tests
 # Optionally, you can turn it on using a schedule for regular testing.
 on:
   pull_request:
+    branches:
+      - main
     paths-ignore:
       - "README.md"
   push:
+    branches:
+      - main
     paths-ignore:
       - "README.md"
   # We test at a regular interval to ensure we are alerted to something breaking due

Makefile renamed to GNUmakefile

@@ -98,7 +98,7 @@ func TestAccOrganizationRepositoryResource_GitHub(t *testing.T) {
 				t.Skip("Skipping test due to missing SENTRY_TEST_GITHUB_REPOSITORY_IDENTIFIER environment variable")
 			}
 
-			testAccOrganizationRepositoryResourcePreCheck()
+			must.Do(testAccOrganizationRepositoryResourcePreCheck())
 		},
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
@@ -150,7 +150,7 @@ func TestAccOrganizationRepositoryResource_GitLab(t *testing.T) {
 				t.Skip("Skipping test due to missing SENTRY_TEST_GITLAB_REPOSITORY_IDENTIFIER environment variable")
 			}
 
-			testAccOrganizationRepositoryResourcePreCheck()
+			must.Do(testAccOrganizationRepositoryResourcePreCheck())
 		},
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
@@ -202,7 +202,7 @@ func TestAccOrganizationRepositoryResource_VSTS(t *testing.T) {
 				t.Skip("Skipping test due to missing SENTRY_TEST_VSTS_REPOSITORY_IDENTIFIER environment variable")
 			}
 
-			testAccOrganizationRepositoryResourcePreCheck()
+			must.Do(testAccOrganizationRepositoryResourcePreCheck())
 		},
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{

internal/provider/resource_organization_repository_test.go

@@ -124,7 +124,9 @@ func (m *ProjectResourceModel) Fill(project apiclient.Project) error {
 	m.ResolveAge = types.Int64Value(project.ResolveAge)
 
 	if m.Filters != nil {
-		m.Filters.Fill(project)
+		if err := m.Filters.Fill(project); err != nil {
+			return err
+		}
 	}
 
 	m.FingerprintingRules = sentrytypes.TrimmedStringValue(project.FingerprintingRules)

internal/provider/resource_project.go

@@ -93,7 +93,9 @@ func resourceSentryOrganizationCodeMappingCreate(ctx context.Context, d *schema.
 	}
 
 	d.SetId(orgCodeMapping.ID)
-	d.Set("internal_id", orgCodeMapping.ID)
+	if err := d.Set("internal_id", orgCodeMapping.ID); err != nil {
+		return diag.FromErr(err)
+	}
 	return resourceSentryOrganizationCodeMappingRead(ctx, d, meta)
 }
 
@@ -178,7 +180,9 @@ func resourceSentryOrganizationCodeMappingUpdate(ctx context.Context, d *schema.
 	}
 
 	d.SetId(orgCodeMapping.ID)
-	d.Set("internal_id", orgCodeMapping.ID)
+	if err := d.Set("internal_id", orgCodeMapping.ID); err != nil {
+		return diag.FromErr(err)
+	}
 
 	return resourceSentryOrganizationCodeMappingRead(ctx, d, meta)
 }
@@ -204,7 +208,9 @@ func importSentryOrganizationCodeMapping(ctx context.Context, d *schema.Resource
 	}
 
 	d.SetId(id)
-	d.Set("organization", org)
+	if err := d.Set("organization", org); err != nil {
+		return nil, err
+	}
 
 	resourceSentryOrganizationCodeMappingRead(ctx, d, meta)
 

sentry/resource_sentry_organization_code_mappings.go

@@ -96,6 +96,9 @@ func resourceSentryOrganizationMemberRead(ctx context.Context, d *schema.Resourc
 	client := meta.(*providerdata.ProviderData).Client
 
 	org, memberID, err := splitSentryOrganizationMemberID(d.Id())
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	tflog.Debug(ctx, "Reading organization member", map[string]interface{}{
 		"org":      org,

sentry/resource_sentry_organization_member.go

@@ -86,7 +86,9 @@ func resourceSentryOrganizationRepositoryGithubCreate(ctx context.Context, d *sc
 	// You can connect multiple GitHub organizations to one Sentry organization, but you cannot connect a single GitHub organization to multiple Sentry organizations.
 	// https://docs.sentry.io/product/integrations/source-code-mgmt/github/
 	d.SetId(identifier)
-	d.Set("internal_id", orgRepo.ID)
+	if err := d.Set("internal_id", orgRepo.ID); err != nil {
+		return diag.FromErr(err)
+	}
 
 	return resourceSentryOrganizationRepositoryGithubRead(ctx, d, meta)
 }
@@ -172,8 +174,13 @@ func importSentryOrganizationRepositoryGithub(ctx context.Context, d *schema.Res
 	}
 
 	d.SetId(id)
-	d.Set("identifier", id)
-	d.Set("organization", org)
+	if err := d.Set("identifier", id); err != nil {
+		return nil, err
+	}
+
+	if err := d.Set("organization", org); err != nil {
+		return nil, err
+	}
 
 	resourceSentryOrganizationRepositoryGithubRead(ctx, d, meta)