Merge branch 'main' into highlight-tags-attr-proj

Author: ottramst

.github/workflows/release.yml

@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Unshallow
         run: git fetch --prune --unshallow
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true

.github/workflows/test.yml

@@ -33,8 +33,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: "go.mod"
           cache: true
@@ -48,8 +48,8 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: "go.mod"
           cache: true
@@ -100,8 +100,8 @@ jobs:
           - terraform: "1.9.*"
             is-pr: true
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: "go.mod"
           cache: true

.github/workflows/update-sentrydata.yml

@@ -13,8 +13,8 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true

docs/resources/project.md

@@ -66,7 +66,7 @@ resource "sentry_project" "default" {
 - `filters` (Attributes) Custom filters for this project. (see [below for nested schema](#nestedatt--filters))
 - `fingerprinting_rules` (String) This can be used to modify the fingerprint rules on the server with custom rules. Rules follow the pattern `matcher:glob -> fingerprint, values`. To learn more about fingerprint rules, [read the docs](https://docs.sentry.io/concepts/data-management/event-grouping/fingerprint-rules/).
 - `grouping_enhancements` (String) This can be used to enhance the grouping algorithm with custom rules. Rules follow the pattern `matcher:glob [v^]?[+-]flag`. To learn more about stack trace rules, [read the docs](https://docs.sentry.io/concepts/data-management/event-grouping/stack-trace-rules/).
-- `platform` (String) The platform for this project. Use `other` for platforms not listed. Valid values are: `other`, `android`, `apple`, `apple-ios`, `apple-macos`, `bun`, `capacitor`, `cordova`, `dart`, `deno`, `dotnet`, `dotnet-aspnet`, `dotnet-aspnetcore`, `dotnet-awslambda`, `dotnet-gcpfunctions`, `dotnet-maui`, `dotnet-uwp`, `dotnet-winforms`, `dotnet-wpf`, `dotnet-xamarin`, `electron`, `elixir`, `flutter`, `go`, `go-echo`, `go-fasthttp`, `go-fiber`, `go-gin`, `go-http`, `go-iris`, `go-martini`, `go-negroni`, `godot`, `ionic`, `java`, `java-log4j2`, `java-logback`, `java-spring`, `java-spring-boot`, `javascript`, `javascript-angular`, `javascript-astro`, `javascript-ember`, `javascript-gatsby`, `javascript-nextjs`, `javascript-nuxt`, `javascript-react`, `javascript-react-router`, `javascript-remix`, `javascript-solid`, `javascript-solidstart`, `javascript-svelte`, `javascript-sveltekit`, `javascript-tanstackstart-react`, `javascript-vue`, `kotlin`, `minidump`, `native`, `native-qt`, `nintendo-switch`, `nintendo-switch-2`, `node`, `node-awslambda`, `node-azurefunctions`, `node-cloudflare-pages`, `node-cloudflare-workers`, `node-connect`, `node-express`, `node-fastify`, `node-gcpfunctions`, `node-hapi`, `node-koa`, `node-nestjs`, `php`, `php-laravel`, `php-symfony`, `playstation`, `powershell`, `python`, `python-aiohttp`, `python-asgi`, `python-awslambda`, `python-bottle`, `python-celery`, `python-chalice`, `python-django`, `python-falcon`, `python-fastapi`, `python-flask`, `python-gcpfunctions`, `python-pylons`, `python-pymongo`, `python-pyramid`, `python-quart`, `python-rq`, `python-sanic`, `python-serverless`, `python-starlette`, `python-tornado`, `python-tryton`, `python-wsgi`, `react-native`, `ruby`, `ruby-rack`, `ruby-rails`, `rust`, `unity`, `unreal`, and `xbox`.
+- `platform` (String) The platform for this project. Use `other` for platforms not listed. Valid values are: `other`, `android`, `apple`, `apple-ios`, `apple-macos`, `bun`, `capacitor`, `cordova`, `dart`, `deno`, `dotnet`, `dotnet-aspnet`, `dotnet-aspnetcore`, `dotnet-awslambda`, `dotnet-gcpfunctions`, `dotnet-maui`, `dotnet-uwp`, `dotnet-winforms`, `dotnet-wpf`, `dotnet-xamarin`, `electron`, `elixir`, `flutter`, `go`, `go-echo`, `go-fasthttp`, `go-fiber`, `go-gin`, `go-http`, `go-iris`, `go-martini`, `go-negroni`, `godot`, `ionic`, `java`, `java-log4j2`, `java-logback`, `java-spring`, `java-spring-boot`, `javascript`, `javascript-angular`, `javascript-astro`, `javascript-ember`, `javascript-gatsby`, `javascript-nextjs`, `javascript-nuxt`, `javascript-react`, `javascript-react-router`, `javascript-remix`, `javascript-solid`, `javascript-solidstart`, `javascript-svelte`, `javascript-sveltekit`, `javascript-tanstackstart-react`, `javascript-vue`, `kotlin`, `minidump`, `native`, `native-qt`, `nintendo-switch`, `node`, `node-awslambda`, `node-azurefunctions`, `node-cloudflare-pages`, `node-cloudflare-workers`, `node-connect`, `node-express`, `node-fastify`, `node-gcpfunctions`, `node-hapi`, `node-hono`, `node-koa`, `node-nestjs`, `php`, `php-laravel`, `php-symfony`, `playstation`, `powershell`, `python`, `python-aiohttp`, `python-asgi`, `python-awslambda`, `python-bottle`, `python-celery`, `python-chalice`, `python-django`, `python-falcon`, `python-fastapi`, `python-flask`, `python-gcpfunctions`, `python-pylons`, `python-pymongo`, `python-pyramid`, `python-quart`, `python-rq`, `python-sanic`, `python-serverless`, `python-starlette`, `python-tornado`, `python-tryton`, `python-wsgi`, `react-native`, `ruby`, `ruby-rack`, `ruby-rails`, `rust`, `unity`, `unreal`, and `xbox`.
 - `resolve_age` (Number) Hours in which an issue is automatically resolve if not seen after this amount of time.
 - `slug` (String) The optional slug for this project.
 

internal/sentrydata/sentrydata.go

@@ -1,6 +1,6 @@
 package sentrydata
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L238-L245
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L246-L253
 var LogLevels = []string{
 	"sample",
 	"debug",
@@ -10,7 +10,7 @@ var LogLevels = []string{
 	"fatal",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L238-L245
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L246-L253
 var LogLevelNameToId = map[string]string{
 	"sample":  "0",
 	"debug":   "10",
@@ -20,7 +20,7 @@ var LogLevelNameToId = map[string]string{
 	"fatal":   "50",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L238-L245
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L246-L253
 var LogLevelIdToName = map[string]string{
 	"0":  "sample",
 	"10": "debug",
@@ -210,7 +210,7 @@ var DashboardWidgetDisplayTypes = []string{
 	"top_n",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/models/project.py#L62-L171
+// https://github.com/getsentry/sentry/blob/master/src/sentry/models/project.py#L61-L170
 var Platforms = []string{
 	"other",
 	"android",
@@ -272,7 +272,6 @@ var Platforms = []string{
 	"native",
 	"native-qt",
 	"nintendo-switch",
-	"nintendo-switch-2",
 	"node",
 	"node-awslambda",
 	"node-azurefunctions",
@@ -283,6 +282,7 @@ var Platforms = []string{
 	"node-fastify",
 	"node-gcpfunctions",
 	"node-hapi",
+	"node-hono",
 	"node-koa",
 	"node-nestjs",
 	"php",

sentry/resource_sentry_organization_member.go

@@ -87,11 +87,18 @@ func resourceSentryOrganizationMemberCreate(ctx context.Context, d *schema.Resou
 		"email": params.Email,
 		"org":   org,
 	})
+
 	httpResp, err := apiClient.CreateOrganizationMemberWithResponse(ctx, org, params)
 	if err != nil {
 		return diag.FromErr(err)
-	} else if httpResp.StatusCode() != http.StatusCreated || httpResp.JSON201 == nil {
-		return diag.FromErr(fmt.Errorf("unexpected status code: %d", httpResp.StatusCode()))
+	}
+
+	if httpResp.StatusCode() != http.StatusCreated {
+		return diag.FromErr(fmt.Errorf("failed to create organization member, got status %d: %s", httpResp.StatusCode(), string(httpResp.Body)))
+	}
+
+	if httpResp.JSON201 == nil {
+		return diag.FromErr(fmt.Errorf("failed to create organization member: empty response body"))
 	}
 
 	member := httpResp.JSON201
@@ -115,11 +122,19 @@ func resourceSentryOrganizationMemberRead(ctx context.Context, d *schema.Resourc
 	httpResp, err := apiClient.GetOrganizationMemberWithResponse(ctx, org, memberID)
 	if err != nil {
 		return diag.FromErr(err)
-	} else if httpResp.StatusCode() == http.StatusNotFound {
+	}
+
+	if httpResp.StatusCode() == http.StatusNotFound {
 		d.SetId("")
 		return nil
-	} else if httpResp.StatusCode() != http.StatusOK || httpResp.JSON200 == nil {
-		return diag.FromErr(fmt.Errorf("unexpected status code: %d", httpResp.StatusCode()))
+	}
+
+	if httpResp.StatusCode() != http.StatusOK {
+		return diag.FromErr(fmt.Errorf("failed to read organization member, got status %d: %s", httpResp.StatusCode(), string(httpResp.Body)))
+	}
+
+	if httpResp.JSON200 == nil {
+		return diag.FromErr(fmt.Errorf("failed to read organization member: empty response body"))
 	}
 
 	member := httpResp.JSON200
@@ -147,8 +162,14 @@ func resourceSentryOrganizationMemberUpdate(ctx context.Context, d *schema.Resou
 	getHttpResp, err := apiClient.GetOrganizationMemberWithResponse(ctx, org, memberID)
 	if err != nil {
 		return diag.FromErr(err)
-	} else if getHttpResp.StatusCode() != http.StatusOK || getHttpResp.JSON200 == nil {
-		return diag.FromErr(fmt.Errorf("unexpected status code: %d", getHttpResp.StatusCode()))
+	}
+
+	if getHttpResp.StatusCode() != http.StatusOK {
+		return diag.FromErr(fmt.Errorf("failed to read organization member for update, got status %d: %s", getHttpResp.StatusCode(), string(getHttpResp.Body)))
+	}
+
+	if getHttpResp.JSON200 == nil {
+		return diag.FromErr(fmt.Errorf("failed to read organization member for update: empty response body"))
 	}
 	orgMember := getHttpResp.JSON200
 
@@ -174,8 +195,14 @@ func resourceSentryOrganizationMemberUpdate(ctx context.Context, d *schema.Resou
 	httpResp, err := apiClient.UpdateOrganizationMemberWithResponse(ctx, org, memberID, params)
 	if err != nil {
 		return diag.FromErr(err)
-	} else if httpResp.StatusCode() != http.StatusOK || httpResp.JSON200 == nil {
-		return diag.FromErr(fmt.Errorf("unexpected status code: %d", httpResp.StatusCode()))
+	}
+
+	if httpResp.StatusCode() != http.StatusOK {
+		return diag.FromErr(fmt.Errorf("failed to update organization member, got status %d: %s", httpResp.StatusCode(), string(httpResp.Body)))
+	}
+
+	if httpResp.JSON200 == nil {
+		return diag.FromErr(fmt.Errorf("failed to update organization member: empty response body"))
 	}
 
 	member := httpResp.JSON200
@@ -199,8 +226,10 @@ func resourceSentryOrganizationMemberDelete(ctx context.Context, d *schema.Resou
 	httpResp, err := apiClient.DeleteOrganizationMemberWithResponse(ctx, org, memberID)
 	if err != nil {
 		return diag.FromErr(err)
-	} else if httpResp.StatusCode() != http.StatusNoContent {
-		return diag.FromErr(fmt.Errorf("unexpected status code: %d", httpResp.StatusCode()))
+	}
+
+	if httpResp.StatusCode() != http.StatusNoContent {
+		return diag.FromErr(fmt.Errorf("failed to delete organization member, got status %d: %s", httpResp.StatusCode(), string(httpResp.Body)))
 	}
 
 	return nil