Skip to content

Commit

Permalink
Revert "feat(cli): adds support for polling git hash from Argo CD (#89)"
Browse files Browse the repository at this point in the history
This reverts commit 2c8a7d3.
  • Loading branch information
jmgilman authored Oct 30, 2024
1 parent 2c8a7d3 commit 63bf751
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 41 deletions.
38 changes: 9 additions & 29 deletions lib/project/project/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ package project
import (
"fmt"
"log/slog"
"os"

"github.com/input-output-hk/catalyst-forge/lib/tools/argo"
tg "github.com/input-output-hk/catalyst-forge/lib/tools/git"

"cuelang.org/go/cue"
"github.com/go-git/go-git/v5"
Expand Down Expand Up @@ -59,31 +55,15 @@ func GetDefaultRuntimes(logger *slog.Logger) []RuntimeData {

// getCommitHash returns the commit hash of the HEAD commit.
func getCommitHash(repo *git.Repository) (string, error) {
if tg.InCI() {
v, exists := os.LookupEnv("GITHUB_SHA")
if !exists {
return "", fmt.Errorf("GITHUB_SHA not found in environment")
}

return v, nil
} else if argo.InArgo() {
v, exists := os.LookupEnv("ARGOCD_APP_REVISION")
if !exists {
return "", fmt.Errorf("ARGOCD_APP_REVISION not found in environment")
}

return v, nil
} else {
ref, err := repo.Head()
if err != nil {
return "", fmt.Errorf("failed to get HEAD: %w", err)
}

obj, err := repo.CommitObject(ref.Hash())
if err != nil {
return "", fmt.Errorf("failed to get commit object: %w", err)
}
ref, err := repo.Head()
if err != nil {
return "", fmt.Errorf("failed to get HEAD: %w", err)
}

return obj.Hash.String(), nil
obj, err := repo.CommitObject(ref.Hash())
if err != nil {
return "", fmt.Errorf("failed to get commit object: %w", err)
}

return obj.Hash.String(), nil
}
12 changes: 0 additions & 12 deletions lib/tools/argo/util.go

This file was deleted.

0 comments on commit 63bf751

Please sign in to comment.