Skip to content

Commit

Permalink
chore: cleanup more unused functions
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmad-ibra committed Jun 10, 2024
1 parent 42ebda1 commit d76e245
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 61 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

# Images
IMAGE_TAG ?= latest

# TODO: update this image location
CLI_IMG ?= "gcr.io/spectro-common-dev/${USER}/validator:$(IMAGE_TAG)"
CLI_IMG ?= "quay.io/validator-labs/validatorctl:$(IMAGE_TAG)"

# Dependency Versions
BUILDER_GOLANG_VERSION ?= 1.22
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const (

// Embed dirs
Kind string = "kind"
Validator string = "validator" // TODO: should this be an embeded dir?
Validator string = "validator"

// regex
DomainRegex = "([a-zA-Z0-9]{1,63}|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.[a-zA-Z0-9]{1,63}|\\.[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]){0,10}\\.([a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,30}[a-zA-Z0-9]\\.[a-zA-Z]{2,})"
Expand Down Expand Up @@ -97,7 +97,7 @@ var (
ValidatorPluginAws: "v0.0.26",
ValidatorPluginAzure: "v0.0.11",
ValidatorPluginNetwork: "v0.0.16",
ValidatorPluginVsphere: "v0.0.23",
ValidatorPluginVsphere: "v0.0.24",
ValidatorPluginOci: "v0.0.10",
}

Expand Down
1 change: 0 additions & 1 deletion pkg/utils/embed/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
log "github.com/validator-labs/validatorctl/pkg/logging"
)

// TODO: remove any binaries we dont need
var Docker, Helm, Kind, Kubectl string

//go:embed bin/docker
Expand Down
47 changes: 0 additions & 47 deletions tests/integration/common/constants.go

This file was deleted.

8 changes: 0 additions & 8 deletions tests/utils/file/directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ import (

const testDir = "tests"

func VCenterRepoPath() string {
return fmt.Sprintf("%s/%s", HomePath(testDir), "tests/external/repo/vcenter")
}

func HelperTestCasesPath() string {
return fmt.Sprintf("%s/%s", HomePath(testDir), "tests/integration/helper/testcases")
}

func ValidatorTestCasesPath() string {
// note: '_validator' was used here, rather than 'validator', due to: https://github.com/helm/helm/issues/7862
return fmt.Sprintf("%s/%s", HomePath(testDir), "tests/integration/_validator/testcases")
Expand Down

0 comments on commit d76e245

Please sign in to comment.