Skip to content
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.

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

refactor: remove unused constants and variables #2633

Merged
merged 1 commit into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions src/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package config

import (
"embed"
"fmt"
"os"
"path/filepath"
Expand All @@ -20,9 +19,6 @@ import (
const (
GithubProject = "defenseunicorns/zarf"

// ZarfMaxChartNameLength limits helm chart name size to account for K8s/helm limits and zarf prefix
ZarfMaxChartNameLength = 40

ZarfAgentHost = "agent-hook.zarf.svc"

ZarfConnectLabelName = "zarf.dev/connect-name"
Expand Down Expand Up @@ -77,7 +73,6 @@ var (
NoColor bool

CosignPublicKey string
ZarfSchema embed.FS

// Timestamp of when the CLI was started
operationStartTime = time.Now().Unix()
Expand Down
15 changes: 0 additions & 15 deletions src/config/lang/english.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import (
const (
ErrLoadState = "Failed to load the Zarf State from the cluster."
ErrSaveState = "Failed to save the Zarf State to the cluster."
ErrLoadPackageSecret = "Failed to load %s's secret from the cluster"
ErrNoClusterConnection = "Failed to connect to the cluster."
ErrTunnelFailed = "Failed to create a tunnel to the cluster."
ErrUnmarshal = "failed to unmarshal file: %w"
ErrWritingFile = "failed to write file %s: %s"
ErrDownloading = "failed to download %s: %s"
Expand Down Expand Up @@ -316,8 +313,6 @@ $ zarf package mirror-resources <your-package.tar.zst> \
CmdPackageRemoveShort = "Removes a Zarf package that has been deployed already (runs offline)"
CmdPackageRemoveFlagConfirm = "REQUIRED. Confirm the removal action to prevent accidental deletions"
CmdPackageRemoveFlagComponents = "Comma-separated list of components to remove. This list will be respected regardless of a component's 'required' or 'default' status. Globbing component names with '*' and deselecting components with a leading '-' are also supported."
CmdPackageRemoveTarballErr = "Invalid tarball path provided"
CmdPackageRemoveExtractErr = "Unable to extract the package contents"
CmdPackageRemoveErr = "Unable to remove the package with an error of: %s"

CmdPackageRegistryPrefixErr = "Registry must be prefixed with 'oci://'"
Expand Down Expand Up @@ -397,7 +392,6 @@ $ zarf package pull oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0 -a sk

CmdDevLintShort = "Lints the given package for valid schema and recommended practices"
CmdDevLintLong = "Verifies the package schema, checks if any variables won't be evaluated, and checks for unpinned images/repos/files"
CmdDevLintErr = "Unable to lint package: %s"

// zarf tools
CmdToolsShort = "Collection of additional tools to make airgap easier"
Expand Down Expand Up @@ -556,7 +550,6 @@ zarf tools yq e '.a.b = "cool"' -i file.yaml
CmdToolsGenKeySuccess = "Generated key pair and written to %s and %s"

CmdToolsSbomShort = "Generates a Software Bill of Materials (SBOM) for the given package"
CmdToolsSbomErr = "Unable to create SBOM (Syft) CLI"

CmdToolsWaitForShort = "Waits for a given Kubernetes resource to be ready"
CmdToolsWaitForLong = "By default Zarf will wait for all Kubernetes resources to be ready before completion of a component during a deployment.\n" +
Expand Down Expand Up @@ -658,7 +651,6 @@ $ zarf tools update-creds artifact --artifact-push-username={USERNAME} --artifac
// These are only seen in the Kubernetes logs.
const (
AgentInfoWebhookAllowed = "Webhook [%s - %s] - Allowed: %t"
AgentInfoShutdown = "Shutdown gracefully..."
AgentInfoPort = "Server running in port: %s"

AgentErrBadRequest = "could not read request body: %s"
Expand All @@ -674,8 +666,6 @@ const (
AgentErrMarshallJSONPatch = "unable to marshall the json patch"
AgentErrMarshalResponse = "unable to marshal the response"
AgentErrNilReq = "malformed admission review: request is nil"
AgentErrShutdown = "unable to properly shutdown the web server"
AgentErrStart = "Failed to start the web server"
AgentErrUnableTransform = "unable to transform the provided request; see zarf http proxy logs for more details"
)

Expand All @@ -690,7 +680,6 @@ const (
PkgValidateTemplateDeprecation = "Package template %q is using the deprecated syntax ###ZARF_PKG_VAR_%s###. This will be removed in Zarf v1.0.0. Please update to ###ZARF_PKG_TMPL_%s###."
PkgValidateMustBeUppercase = "variable name %q must be all uppercase and contain no special characters except _"
PkgValidateErrAction = "invalid action: %w"
PkgValidateErrActionVariables = "component %q cannot contain setVariables outside of onDeploy in actions"
PkgValidateErrActionCmdWait = "action %q cannot be both a command and wait action"
PkgValidateErrActionClusterNetwork = "a single wait action must contain only one of cluster or network"
PkgValidateErrChart = "invalid chart definition: %w"
Expand All @@ -703,10 +692,8 @@ const (
PkgValidateErrComponentName = "component name %q must be all lowercase and contain no special characters except '-' and cannot start with a '-'"
PkgValidateErrComponentLocalOS = "component %q contains a localOS value that is not supported: %s (supported: %s)"
PkgValidateErrComponentNameNotUnique = "component name %q is not unique"
PkgValidateErrComponent = "invalid component %q: %w"
PkgValidateErrComponentReqDefault = "component %q cannot be both required and default"
PkgValidateErrComponentReqGrouped = "component %q cannot be both required and grouped"
PkgValidateErrComponentYOLO = "component %q incompatible with the online-only package flag (metadata.yolo): %w"
PkgValidateErrGroupMultipleDefaults = "group %q has multiple defaults (%q, %q)"
PkgValidateErrGroupOneComponent = "group %q only has one component (%q)"
PkgValidateErrConstant = "invalid package constant: %w"
Expand All @@ -717,7 +704,6 @@ const (
PkgValidateErrManifestNameLength = "manifest %q exceed the maximum length of %d characters"
PkgValidateErrManifestNameMissing = "manifest must include a name"
PkgValidateErrManifestNameNotUnique = "manifest name %q is not unique"
PkgValidateErrName = "invalid package name: %w"
PkgValidateErrPkgConstantName = "constant name %q must be all uppercase and contain no special characters except _"
PkgValidateErrPkgConstantPattern = "provided value for constant %q does not match pattern %q"
PkgValidateErrPkgName = "package name %q must be all lowercase and contain no special characters except '-' and cannot start with a '-'"
Expand All @@ -732,7 +718,6 @@ const (
var (
ErrInitNotFound = errors.New("this command requires a zarf-init package, but one was not found on the local system. Re-run the last command again without '--confirm' to download the package")
ErrUnableToCheckArch = errors.New("unable to get the configured cluster's architecture")
ErrInterrupt = errors.New("execution cancelled due to an interrupt")
ErrUnableToGetPackages = errors.New("unable to load the Zarf Package data from the cluster")
)

Expand Down
11 changes: 5 additions & 6 deletions src/pkg/cluster/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ import (

// Zarf Cluster Constants.
const (
ZarfManagedByLabel = "app.kubernetes.io/managed-by"
ZarfNamespaceName = "zarf"
ZarfStateSecretName = "zarf-state"
ZarfStateDataKey = "state"
ZarfPackageInfoLabel = "package-deploy-info"
ZarfInitPackageInfoName = "zarf-package-init"
ZarfManagedByLabel = "app.kubernetes.io/managed-by"
ZarfNamespaceName = "zarf"
ZarfStateSecretName = "zarf-state"
ZarfStateDataKey = "state"
ZarfPackageInfoLabel = "package-deploy-info"
)

// InitZarfState initializes the Zarf state with the given temporary directory and init configs.
Expand Down
4 changes: 0 additions & 4 deletions src/pkg/layout/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ const (

IndexJSON = "index.json"
OCILayout = "oci-layout"

SeedImagesDir = "seed-images"
InjectorBinary = "zarf-injector"
InjectorPayloadTarGz = "payload.tgz"
)

var (
Expand Down
Loading