Skip to content

feat: pass commit SHA and branch name on validation runs #208

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

Merged
sohankshirsagar merged 2 commits into from
Mar 24, 2026
Merged

feat: pass commit SHA and branch name on validation runs #208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b4a570
feat: pass commit SHA and branch name on validation runs
sohankshirsagar Mar 24, 2026
f3f5f0d
Address pr comments
sohankshirsagar Mar 24, 2026
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
31 changes: 21 additions & 10 deletions cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,12 @@ func runTests(cmd *cobra.Command, args []string) error {
var req *backend.CreateDriftRunRequest

if isValidation {
// Validation mode: no CI metadata needed
req = &backend.CreateDriftRunRequest{
ObservableServiceId: cfg.Service.ID,
CliVersion: version.Version,
IsValidationRun: true,
CommitSha: stringPtr(getCommitSHAFromEnv()),
BranchName: stringPtr(getBranchFromEnv()),
}
} else {
// Regular CI mode: validate and include CI metadata
Expand Down Expand Up @@ -1015,15 +1016,7 @@ func validateCIMetadata(metadata CIMetadata) (CIMetadata, error) {
// Only populate from environment variables if in CI
if inCI {
if metadata.CommitSha == "" {
if isGitHub {
if sha := getGitHubPRHeadSHA(); sha != "" {
metadata.CommitSha = sha
} else {
metadata.CommitSha = os.Getenv("GITHUB_SHA")
}
} else if isGitLab {
metadata.CommitSha = os.Getenv("CI_COMMIT_SHA")
}
metadata.CommitSha = getCommitSHAFromEnv()
}

if metadata.PRNumber == "" {
Expand Down Expand Up @@ -1114,6 +1107,24 @@ func stringPtr(s string) *string {
return &s
}

// getCommitSHAFromEnv returns the commit SHA from CI environment variables.
// Returns empty string if no SHA can be determined from the environment.
func getCommitSHAFromEnv() string {
isGitHub := os.Getenv("GITHUB_ACTIONS") == "true"
isGitLab := os.Getenv("GITLAB_CI") == "true"

if isGitHub {
if sha := getGitHubPRHeadSHA(); sha != "" {
return sha
}
return os.Getenv("GITHUB_SHA")
} else if isGitLab {
return os.Getenv("CI_COMMIT_SHA")
}

return ""
}

// getBranchFromEnv returns the branch name from CI environment variables
// Returns empty string if no branch can be determined from environment
func getBranchFromEnv() string {
Expand Down
Loading