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

jianyuan · web-flow · commit 28e22bdf8c2f · 2025-10-24T09:46:39.000+01:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,30 +33,29 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
       - run: go mod download
       - run: go build -v .
       - name: Run linters
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
 
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      # We need the latest version of Terraform for our documentation generation to use
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
+        uses: astral-sh/setup-uv@v7
+      - uses: hashicorp/setup-terraform@v3
         with:
           terraform_wrapper: false
       - run: make generate
@@ -76,36 +75,14 @@ jobs:
       max-parallel: 1
       matrix:
         terraform:
-          - "1.4.*"
-          - "1.5.*"
-          - "1.6.*"
-          - "1.7.*"
-          - "1.8.*"
-          - "1.9.*"
-          - "1.10.*"
-        is-pr:
-          - ${{ github.event_name == 'pull_request' }}
-        # Only run the latest version of Terraform on pull requests
-        exclude:
-          - terraform: "1.4.*"
-            is-pr: true
-          - terraform: "1.5.*"
-            is-pr: true
-          - terraform: "1.6.*"
-            is-pr: true
-          - terraform: "1.7.*"
-            is-pr: true
-          - terraform: "1.8.*"
-            is-pr: true
-          - terraform: "1.9.*"
-            is-pr: true
+          - "1.13.*"
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache: true
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
+      - uses: hashicorp/setup-terraform@v3
         with:
           terraform_version: ${{ matrix.terraform }}
           terraform_wrapper: false
diff --git a/.github/workflows/update-sentrydata.yml b/.github/workflows/update-sentrydata.yml
@@ -19,7 +19,7 @@ jobs:
           go-version-file: "go.mod"
           cache: true
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
       - uses: hashicorp/setup-terraform@v3
         with:
           terraform_wrapper: false
@@ -30,7 +30,6 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           branch: update-sentry-data
           commit-message: Update Sentry data
           title: Update Sentry data
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,7 @@ website/vendor
 *.winfile eol=crlf
 
 # virtualenv
-.venv
+.venv
+
+.env
+.envrc
diff --git a/.tool-versions b/.tool-versions
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jianyuan/terraform-provider-sentry
 
-go 1.23.5
+go 1.25.3
 
 require (
 	github.com/google/go-cmp v0.7.0
diff --git a/go.sum b/go.sum
diff --git a/internal/sentrydata/generate.py b/internal/sentrydata/generate.py
@@ -8,6 +8,8 @@
 import httpx
 import jinja2
 
+REPO = "getsentry/sentry"
+BRANCH = "master"
 TEMPLATE = """package sentrydata
 
 {% for key, value in result.items() %}
@@ -46,33 +48,20 @@ def is_list(value: Any) -> TypeGuard[list[Any]]:
 
 def get_text(path: str) -> str:
     r = httpx.get(
-        f"https://raw.githubusercontent.com/getsentry/sentry/refs/heads/master/{path}"
+        f"https://raw.githubusercontent.com/{REPO}/refs/heads/{BRANCH}/{path}"
     )
     r.raise_for_status()
     return r.text
 
 
-class GitHubUrl(str):
-    def for_stmt(self, stmt: ast.stmt) -> GitHubUrl:
-        return self.lineno(stmt.lineno).end_lineno(stmt.end_lineno)
-
-    def lineno(self, lineno: int) -> GitHubUrl:
-        return GitHubUrl(f"{self}#L{lineno}")
-
-    def end_lineno(self, lineno: int | None) -> GitHubUrl:
-        if lineno is None:
-            return self
-        return GitHubUrl(f"{self}-L{lineno}")
-
-
 class FileData(NamedTuple):
-    github_url: GitHubUrl
+    github_url: str
     tree: ast.Module
 
 
 def get_file_data(path: str) -> FileData:
     return FileData(
-        github_url=GitHubUrl(f"https://github.com/getsentry/sentry/blob/master/{path}"),
+        github_url=f"https://github.com/{REPO}/blob/{BRANCH}/{path}",
         tree=ast.parse(get_text(path)),
     )
 
@@ -97,15 +86,15 @@ def parse_constants() -> dict[str, ResultData[Any]]:
                 value=ast.Dict(keys=keys, values=values),
             ):
                 out["LogLevels"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=[],
                 )
                 out["LogLevelNameToId"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 out["LogLevelIdToName"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 for key, value in zip(keys, values):
@@ -127,15 +116,15 @@ def parse_issues_grouptype() -> dict[str, ResultData[Any]]:
         match node:
             case ast.ClassDef(name="GroupCategory", body=body):
                 out["IssueGroupCategories"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=[],
                 )
                 out["IssueGroupCategoryNameToId"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 out["IssueGroupCategoryIdToName"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 for node in body:
@@ -167,7 +156,7 @@ def parse_rules_conditions_event_attribute() -> dict[str, ResultData[Any]]:
                 value=ast.Dict(keys=keys),
             ):
                 out["EventAttributes"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=[],
                 )
                 for key in keys:
@@ -185,15 +174,15 @@ def parse_rules_match() -> dict[str, ResultData[Any]]:
         match node:
             case ast.ClassDef(name="MatchType", body=body):
                 out["MatchTypes"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=[],
                 )
                 out["MatchTypeNameToId"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 out["MatchTypeIdToName"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=OrderedDict(),
                 )
                 for node in body:
@@ -214,7 +203,7 @@ def parse_rules_match() -> dict[str, ResultData[Any]]:
                 value=ast.Dict(keys=keys),
             ):
                 out["LevelMatchTypes"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=[],
                 )
                 for key in keys:
@@ -254,7 +243,7 @@ def extract_types(classdef: ast.ClassDef) -> list[str]:
                 types = extract_types(node)
                 if types:
                     out[name] = ResultData(
-                        github_url=data.github_url.for_stmt(node),
+                        github_url=data.github_url,
                         result=types,
                     )
             case _:
@@ -272,7 +261,7 @@ def parse_models_project() -> dict[str, ResultData[Any]]:
                 value=ast.List(elts=elts),
             ):
                 out["Platforms"] = ResultData(
-                    github_url=data.github_url.for_stmt(node),
+                    github_url=data.github_url,
                     result=["other"],
                 )
                 for elt in elts:
diff --git a/internal/sentrydata/sentrydata.go b/internal/sentrydata/sentrydata.go
@@ -1,6 +1,6 @@
 package sentrydata
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L246-L253
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py
 var LogLevels = []string{
 	"sample",
 	"debug",
@@ -10,7 +10,7 @@ var LogLevels = []string{
 	"fatal",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py#L246-L253
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py
 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#L246-L253
+// https://github.com/getsentry/sentry/blob/master/src/sentry/constants.py
 var LogLevelIdToName = map[string]string{
 	"0":  "sample",
 	"10": "debug",
@@ -30,7 +30,7 @@ var LogLevelIdToName = map[string]string{
 	"50": "fatal",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py#L30-L67
+// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py
 var IssueGroupCategories = []string{
 	"Error",
 	"Performance",
@@ -49,7 +49,7 @@ var IssueGroupCategories = []string{
 	"Mobile",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py#L30-L67
+// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py
 var IssueGroupCategoryNameToId = map[string]string{
 	"Error":             "1",
 	"Performance":       "2",
@@ -68,7 +68,7 @@ var IssueGroupCategoryNameToId = map[string]string{
 	"Mobile":            "15",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py#L30-L67
+// https://github.com/getsentry/sentry/blob/master/src/sentry/issues/grouptype.py
 var IssueGroupCategoryIdToName = map[string]string{
 	"1":  "Error",
 	"2":  "Performance",
@@ -87,7 +87,7 @@ var IssueGroupCategoryIdToName = map[string]string{
 	"15": "Mobile",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/conditions/event_attribute.py#L41-L72
+// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/conditions/event_attribute.py
 var EventAttributes = []string{
 	"message",
 	"platform",
@@ -121,7 +121,7 @@ var EventAttributes = []string{
 	"ota_updates.update_id",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py#L6-L22
+// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py
 var MatchTypes = []string{
 	"CONTAINS",
 	"ENDS_WITH",
@@ -141,7 +141,7 @@ var MatchTypes = []string{
 	"STARTS_WITH",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py#L6-L22
+// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py
 var MatchTypeNameToId = map[string]string{
 	"CONTAINS":         "co",
 	"ENDS_WITH":        "ew",
@@ -161,7 +161,7 @@ var MatchTypeNameToId = map[string]string{
 	"STARTS_WITH":      "sw",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py#L6-L22
+// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py
 var MatchTypeIdToName = map[string]string{
 	"co":  "CONTAINS",
 	"ew":  "ENDS_WITH",
@@ -181,14 +181,14 @@ var MatchTypeIdToName = map[string]string{
 	"sw":  "STARTS_WITH",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py#L25-L29
+// https://github.com/getsentry/sentry/blob/master/src/sentry/rules/match.py
 var LevelMatchTypes = []string{
 	"EQUAL",
 	"GREATER_OR_EQUAL",
 	"LESS_OR_EQUAL",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/models/dashboard_widget.py#L49-L83
+// https://github.com/getsentry/sentry/blob/master/src/sentry/models/dashboard_widget.py
 var DashboardWidgetTypes = []string{
 	"discover",
 	"issue",
@@ -199,7 +199,7 @@ var DashboardWidgetTypes = []string{
 	"logs",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/models/dashboard_widget.py#L133-L150
+// https://github.com/getsentry/sentry/blob/master/src/sentry/models/dashboard_widget.py
 var DashboardWidgetDisplayTypes = []string{
 	"line",
 	"area",
@@ -210,7 +210,7 @@ var DashboardWidgetDisplayTypes = []string{
 	"top_n",
 }
 
-// https://github.com/getsentry/sentry/blob/master/src/sentry/models/project.py#L61-L170
+// https://github.com/getsentry/sentry/blob/master/src/sentry/models/project.py
 var Platforms = []string{
 	"other",
 	"android",
