Add fallback pattern for org and project in GenerateDistributionPropertiesTask #1000
Conversation
| val sentryPropertiesFile = variant?.let { SentryPropertiesFileProvider.getPropertiesFilePath(project, it) } | ||
| val sentryProperties = sentryPropertiesFile?.let { PropertiesUtil.loadMaybe(File(it)) } | ||
|
|
||
| // Resolve org slug with fallback chain: ext -> extension -> env -> sentry.properties |
There was a problem hiding this comment.
Happy to discuss a different priority here.
Note: we're not getting .sentryclirc files yet. That can be added later.
…rtiesTask Update GenerateDistributionPropertiesTask to check multiple sources for org and project configuration, following the established pattern used by other tasks. Changes: - Add fallback chain for org: ext -> extension -> env -> sentry.properties - Add fallback chain for project: ext -> extension -> env -> sentry.properties - Auth token remains extension-only (no fallback) - Pass sentryOrg/sentryProject parameters from AndroidComponentsConfig - Add comprehensive tests for all fallback scenarios Resolves EME-397 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
runningcode
force-pushed
the
no/add-fallback-for-org-project
branch
from
3e29cca to
d887e8d
Compare
runningcode
requested review from
adinauer,
chromy,
lcian,
markushi,
rbro112,
romtsn and
stefanosiano
as code owners
| } | ||
| task.projectSlug.set(projectProvider) | ||
|
|
||
| // Auth token only from extension (no fallback) |
There was a problem hiding this comment.
so this is deliberate? 'cause I think you can also set it via env variable (SENTRY_AUTH_TOKEN) and sentry.properties too. But I guess it's not gonna be the one you need for distribution, right?
There was a problem hiding this comment.
yes that’s correct, we’re going to add a separate env variable and extension property for this one in the future which is why it isn’t added here.
| // Load sentry.properties if available | ||
| val sentryPropertiesFile = | ||
| variant?.let { SentryPropertiesFileProvider.getPropertiesFilePath(project, it) } | ||
| val sentryProperties = sentryPropertiesFile?.let { PropertiesUtil.loadMaybe(File(it)) } |
There was a problem hiding this comment.
wondering if that's fine to load it at configuration phase here, or should we move it to the task action?
There was a problem hiding this comment.
Ah good point. This should probably be marked as an input as well.
…mpatible 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
3 participants
Summary
Update
GenerateDistributionPropertiesTaskto check multiple sources fororgandprojectconfiguration, following the established pattern used by other tasks likeSentryUploadProguardMappingsTask.Changes
Fallback Pattern Implementation
For org (organization slug):
ext.sentryOrg)extension.org)SENTRY_ORG)defaults.orgororg)For projectName (project slug):
ext.sentryProject)extension.projectName)SENTRY_PROJECT)defaults.projectorproject)For authToken:
#skip-changelog as this hasn't been released yet
Resolves EME-397
🤖 Generated with Claude Code