Skip to content

Commit

Permalink
capitalizes and things I missed
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
  • Loading branch information
AustinAbro321 committed Oct 31, 2024
1 parent 31ed212 commit ef2a807
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/internal/git/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,13 @@ func (r *Repository) Push(ctx context.Context, address, username, password strin
err = repo.FetchContext(ctx, fetchOptions)
if errors.Is(err, transport.ErrRepositoryNotFound) {
message.Debugf("Repo not yet available offline, skipping fetch...")
l.Debug("Repo not yet available offline, skipping fetch")
l.Debug("repo not yet available offline, skipping fetch")
} else if errors.Is(err, git.ErrForceNeeded) {
message.Debugf("Repo fetch requires force, skipping fetch...")
l.Debug("Repo fetch requires force, skipping fetch")
l.Debug("repo fetch requires force, skipping fetch")
} else if errors.Is(err, git.NoErrAlreadyUpToDate) {
message.Debugf("Repo already up-to-date, skipping fetch...")
l.Debug("Repo already up-to-date, skipping fetch")
l.Debug("repo already up-to-date, skipping fetch")
} else if err != nil {
return fmt.Errorf("unable to fetch the git repo prior to push: %w", err)
}
Expand Down
8 changes: 4 additions & 4 deletions src/internal/packager/helm/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ func (h *Helm) InstallOrUpgradeChart(ctx context.Context) (types.ConnectStrings,
if errors.Is(histErr, driver.ErrReleaseNotFound) {
// No prior release, try to install it.
spinner.Updatef("Attempting chart installation")
l.Info("preforming Helm install")
l.Info("preforming Helm install", "chart", h.chart.Name)

release, err = h.installChart(helmCtx, postRender)
} else if histErr == nil && len(releases) > 0 {
// Otherwise, there is a prior release so upgrade it.
spinner.Updatef("Attempting chart upgrade")
l.Info("preforming Helm upgrade")
l.Info("preforming Helm upgrade", "chart", h.chart.Name)

lastRelease := releases[len(releases)-1]

Expand Down Expand Up @@ -125,7 +125,7 @@ func (h *Helm) InstallOrUpgradeChart(ctx context.Context) (types.ConnectStrings,

// Attempt to rollback on a failed upgrade.
spinner.Updatef("Performing chart rollback")
l.Info("preforming chart rollback")
l.Info("preforming Helm rollback", "chart", h.chart.Name)
err = h.rollbackChart(h.chart.ReleaseName, previouslyDeployedVersion)
if err != nil {
return nil, "", fmt.Errorf("%w: unable to rollback: %w", installErr, err)
Expand All @@ -145,7 +145,7 @@ func (h *Helm) InstallOrUpgradeChart(ctx context.Context) (types.ConnectStrings,
if !h.chart.NoWait {
// Ensure we don't go past the timeout by using a context initialized with the helm timeout
spinner.Updatef("Running health checks")
l.Info("running health checks")
l.Info("running health checks", "chart", h.chart.Name)
if err := healthchecks.WaitForReadyRuntime(helmCtx, h.cluster.Watcher, runtimeObjs); err != nil {
return nil, "", err
}
Expand Down
5 changes: 2 additions & 3 deletions src/pkg/packager/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (p *Packager) Deploy(ctx context.Context) error {
}
if len(deployedComponents) == 0 {
message.Warn("No components were selected for deployment. Inspect the package to view the available components and select components interactively or by name with \"--components\"")
l.Warn("No components were selected for deployment. Inspect the package to view the available components and select components interactively or by name with \"--components\"")
l.Warn("no components were selected for deployment. Inspect the package to view the available components and select components interactively or by name with \"--components\"")
}

// Notify all the things about the successful deployment
Expand Down Expand Up @@ -397,7 +397,6 @@ func (p *Packager) deployComponent(ctx context.Context, component v1alpha1.ZarfC
// Move files onto the host of the machine performing the deployment.
func (p *Packager) processComponentFiles(ctx context.Context, component v1alpha1.ZarfComponent, pkgLocation string) error {
l := logger.From(ctx)
l.Handler()
spinner := message.NewProgressSpinner("Copying %d files", len(component.Files))
start := time.Now()
l.Info("copying files", "count", len(component.Files))
Expand Down Expand Up @@ -768,7 +767,7 @@ func (p *Packager) installChartAndManifests(ctx context.Context, componentPaths
connectStrings, installedChartName, err := helmCfg.InstallOrUpgradeChart(ctx)
if err != nil {
return nil, err
}
}
installedCharts = append(installedCharts, types.InstalledChart{Namespace: manifest.Namespace, ChartName: installedChartName, ConnectStrings: connectStrings})
}

Expand Down
4 changes: 2 additions & 2 deletions src/pkg/packager/sources/tarball.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ func (s *TarballSource) LoadPackage(ctx context.Context, dst *layout.PackagePath
if !dst.IsLegacyLayout() {
spinner := message.NewProgressSpinner("Validating full package checksums")
defer spinner.Stop()
l.Info("validating package checksums")
l.Info("validating package checksums", "source", s.PackageSource)

if err := ValidatePackageIntegrity(dst, pkg.Metadata.AggregateChecksum, false); err != nil {
return pkg, nil, err
}

spinner.Success()
l.Debug("done validating package checksums")
l.Debug("done validating package checksums", "source", s.PackageSource)

if !s.SkipSignatureValidation {
if err := ValidatePackageSignature(ctx, dst, s.PublicKeyPath); err != nil {
Expand Down

0 comments on commit ef2a807

Please sign in to comment.