Skip to content

fix(android/plugin): use BITDRIFT_API_KEY as default env var name #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kattrali wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(android/plugin): use BITDRIFT_API_KEY as default env var name #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

**Added**

- Nothing yet!
- Added support for using `BITDRIFT_API_KEY` as an environment variable when uploading symbols using capture-plugin

**Changed**

Expand Down
16 changes: 8 additions & 8 deletions platform/jvm/capture-plugin/src/main/kotlin/io/bitdrift/capture/task/CLITask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,18 @@ abstract class CLIUploadMappingTask : CLITask() {
val versionCode = manifest.getAttribute("android:versionCode")
val versionName = manifest.getAttribute("android:versionName")

// retrieve key using preferred or legacy fallback env var if set
val apiKey = System.getenv("BITDRIFT_API_KEY") ?: System.getenv("API_KEY")
if (apiKey == null) {
throw IllegalStateException("Environment variable BITDRIFT_API_KEY must be set to your Bitdrift API key before running this task")
}

runBDCLI(
listOf(
"debug-files",
"upload-proguard",
"--api-key",
apiKey,
"--app-id",
appId,
"--app-version",
Expand Down Expand Up @@ -66,7 +74,6 @@ abstract class CLITask : DefaultTask() {
val downloader = BDCLIDownloader(bdcliFile)

fun runBDCLI(args: List<String>) {
checkEnvironment()
downloader.downloadIfNeeded()
runCommand(listOf(bdcliFile.absolutePath) + args)
}
Expand All @@ -81,13 +88,6 @@ abstract class CLITask : DefaultTask() {
throw RuntimeException("Command $command failed")
}
}

private fun checkEnvironment() {
val apiKeyEnvName = "API_KEY"
if (System.getenv(apiKeyEnvName) == null) {
throw IllegalStateException("Environment variable $apiKeyEnvName must be set to your Bitdrift API key before running this task")
}
}
}

class BDCLIDownloader(
Expand Down
Loading