-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: remove unnecessary bundle layers and refactor verification (#622)
- Loading branch information
Showing
28 changed files
with
796 additions
and
295 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2023-Present The UDS Authors | ||
|
|
||
| // Package fetcher contains functionality to fetch local and remote Zarf pkgs for local bundling | ||
| package fetcher | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/defenseunicorns/pkg/helpers" | ||
| "github.com/defenseunicorns/uds-cli/src/config" | ||
| "github.com/defenseunicorns/uds-cli/src/pkg/utils" | ||
| "github.com/defenseunicorns/zarf/src/pkg/layout" | ||
| "github.com/defenseunicorns/zarf/src/pkg/packager/filters" | ||
| zarfSources "github.com/defenseunicorns/zarf/src/pkg/packager/sources" | ||
| zarfTypes "github.com/defenseunicorns/zarf/src/types" | ||
| goyaml "github.com/goccy/go-yaml" | ||
| ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
| ) | ||
|
|
||
| // loadPkg loads a package from a tarball source and filters out optional components | ||
| func loadPkg(pkgTmp string, pkgSrc zarfSources.PackageSource, optionalComponents []string) (zarfTypes.ZarfPackage, *layout.PackagePaths, error) { | ||
| // create empty layout and source | ||
| pkgPaths := layout.New(pkgTmp) | ||
|
|
||
| // create filter for optional components | ||
| createFilter := filters.Combine( | ||
| filters.ForDeploy(strings.Join(optionalComponents, ","), false), | ||
| ) | ||
|
|
||
| // load the package with the filter (calling LoadPackage populates the pkgPaths with the files from the tarball) | ||
| pkg, _, err := pkgSrc.LoadPackage(pkgPaths, createFilter, false) | ||
| if err != nil { | ||
| return zarfTypes.ZarfPackage{}, nil, err | ||
| } | ||
| return pkg, pkgPaths, nil | ||
| } | ||
|
|
||
| // getImgLayerDigests grabs the digests of the layers from the images in the image index | ||
| func getImgLayerDigests(manifestsToInclude []ocispec.Descriptor, pkgPaths *layout.PackagePaths) ([]string, error) { | ||
| var includeLayers []string | ||
| for _, manifest := range manifestsToInclude { | ||
| includeLayers = append(includeLayers, manifest.Digest.Hex()) // be sure to include image manifest | ||
| manifestBytes, err := os.ReadFile(filepath.Join(pkgPaths.Images.Base, config.BlobsDir, manifest.Digest.Hex())) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var imgManifest ocispec.Manifest | ||
| err = goyaml.Unmarshal(manifestBytes, &imgManifest) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| includeLayers = append(includeLayers, imgManifest.Config.Digest.Hex()) // don't forget the config | ||
| for _, layer := range imgManifest.Layers { | ||
| includeLayers = append(includeLayers, layer.Digest.Hex()) | ||
| } | ||
| } | ||
| return includeLayers, nil | ||
| } | ||
|
|
||
| // filterPkgPaths grabs paths that either not in the blobs dir or are in includeLayers | ||
| func filterPkgPaths(pkgPaths *layout.PackagePaths, includeLayers []string, optionalComponents []zarfTypes.ZarfComponent) []string { | ||
| var filteredPaths []string | ||
| paths := pkgPaths.Files() | ||
| for _, path := range paths { | ||
| // include all paths that aren't in the blobs dir | ||
| if !strings.Contains(path, config.BlobsDir) { | ||
| // only grab req'd + specified optional components | ||
| if strings.Contains(path, "/components/") { | ||
| if shouldInclude := utils.IncludeComponent(path, optionalComponents); shouldInclude { | ||
| filteredPaths = append(filteredPaths, path) | ||
| continue | ||
| } | ||
| } else { | ||
| filteredPaths = append(filteredPaths, path) | ||
| } | ||
| } | ||
| // include paths that are in the blobs dir and are in includeLayers | ||
| for _, layer := range includeLayers { | ||
| if strings.Contains(path, config.BlobsDir) && strings.Contains(path, layer) { | ||
| filteredPaths = append(filteredPaths, path) | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // ensure zarf.yaml, checksums and SBOMS (if exists) are always included | ||
| // note we may have extra SBOMs because they are not filtered or modified | ||
| alwaysInclude := []string{pkgPaths.ZarfYAML, pkgPaths.Checksums} | ||
| if pkgPaths.SBOMs.Path != "" { | ||
| alwaysInclude = append(alwaysInclude, pkgPaths.SBOMs.Path) | ||
| } | ||
| filteredPaths = helpers.MergeSlices(filteredPaths, alwaysInclude, func(a, b string) bool { | ||
| return a == b | ||
| }) | ||
|
|
||
| return filteredPaths | ||
| } |
Oops, something went wrong.