Skip to content

Commit

Permalink
Fixed typos Dependenca -> Dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
derkoe authored and ckotzbauer committed Feb 1, 2022
1 parent 1fa44d0 commit 7fbd4c8
Showing 4 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions internal/config.go
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ var (
ConfigKeyGitAuthorEmail = "git-author-email"
ConfigKeyPodLabelSelector = "pod-label-selector"
ConfigKeyNamespaceLabelSelector = "namespace-label-selector"
ConfigKeyDependencaTrackBaseUrl = "dtrack-base-url"
ConfigKeyDependencaTrackApiKey = "dtrack-api-key"
ConfigKeyDependencyTrackBaseUrl = "dtrack-base-url"
ConfigKeyDependencyTrackApiKey = "dtrack-api-key"
)
2 changes: 1 addition & 1 deletion internal/daemon/daemon.go
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ func initTargets(targetKeys []string) []target.Target {
err = t.ValidateConfig()
targets = append(targets, t)
} else if ta == "dtrack" {
t := target.NewDependencaTrackTarget()
t := target.NewDependencyTrackTarget()
err = t.ValidateConfig()
targets = append(targets, t)
} else {
22 changes: 11 additions & 11 deletions internal/target/dtrack_target.go
Original file line number Diff line number Diff line change
@@ -14,32 +14,32 @@ import (
"github.com/ckotzbauer/sbom-operator/internal"
)

type DependencaTrackTarget struct {
type DependencyTrackTarget struct {
baseUrl string
apiKey string
imageToProject map[string]uuid.UUID
}

func NewDependencaTrackTarget() *DependencaTrackTarget {
baseUrl := viper.GetString(internal.ConfigKeyDependencaTrackBaseUrl)
apiKey := viper.GetString(internal.ConfigKeyDependencaTrackApiKey)
return &DependencaTrackTarget{
func NewDependencyTrackTarget() *DependencyTrackTarget {
baseUrl := viper.GetString(internal.ConfigKeyDependencyTrackBaseUrl)
apiKey := viper.GetString(internal.ConfigKeyDependencyTrackApiKey)
return &DependencyTrackTarget{
baseUrl: baseUrl,
apiKey: apiKey,
}
}

func (g *DependencaTrackTarget) ValidateConfig() error {
func (g *DependencyTrackTarget) ValidateConfig() error {
if g.baseUrl == "" {
return fmt.Errorf("%s is empty", internal.ConfigKeyDependencaTrackBaseUrl)
return fmt.Errorf("%s is empty", internal.ConfigKeyDependencyTrackBaseUrl)
}
if g.apiKey == "" {
return fmt.Errorf("%s is empty", internal.ConfigKeyDependencaTrackApiKey)
return fmt.Errorf("%s is empty", internal.ConfigKeyDependencyTrackApiKey)
}
return nil
}

func (g *DependencaTrackTarget) Initialize() {
func (g *DependencyTrackTarget) Initialize() {
client, _ := dtrack.NewClient(g.baseUrl, dtrack.WithAPIKey(g.apiKey))
g.imageToProject = make(map[string]uuid.UUID)

@@ -71,7 +71,7 @@ func (g *DependencaTrackTarget) Initialize() {
}
}

func (g *DependencaTrackTarget) ProcessSbom(imageID, sbom string) {
func (g *DependencyTrackTarget) ProcessSbom(imageID, sbom string) {
if sbom == "" {
logrus.Infof("Empty SBOM - skip image (image=%s)", imageID)
return
@@ -119,6 +119,6 @@ func (g *DependencaTrackTarget) ProcessSbom(imageID, sbom string) {
logrus.Infof("Uploaded SBOM (upload-token=%s)", uploadToken)
}

func (g *DependencaTrackTarget) Cleanup(allImages []string) {
func (g *DependencyTrackTarget) Cleanup(allImages []string) {
g.imageToProject = nil
}
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
@@ -57,8 +57,8 @@ func init() {
rootCmd.PersistentFlags().String(internal.ConfigKeyGitAuthorEmail, "", "Author email to use for Git-Commits.")
rootCmd.PersistentFlags().String(internal.ConfigKeyPodLabelSelector, "", "Kubernetes Label-Selector for pods.")
rootCmd.PersistentFlags().String(internal.ConfigKeyNamespaceLabelSelector, "", "Kubernetes Label-Selector for namespaces.")
rootCmd.PersistentFlags().String(internal.ConfigKeyDependencaTrackBaseUrl, "", "Dependency-Track base URL, e.g. 'https://dtrack.example.com'")
rootCmd.PersistentFlags().String(internal.ConfigKeyDependencaTrackApiKey, "", "Dependency-Track API key")
rootCmd.PersistentFlags().String(internal.ConfigKeyDependencyTrackBaseUrl, "", "Dependency-Track base URL, e.g. 'https://dtrack.example.com'")
rootCmd.PersistentFlags().String(internal.ConfigKeyDependencyTrackApiKey, "", "Dependency-Track API key")
}

func initConfig() {

0 comments on commit 7fbd4c8

Please sign in to comment.