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.

Sign up for GitHub

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

Jump to bottom

fix: ensure manifest config is included with pulls #503

Merged
merged 1 commit into from
Mar 13, 2024
Merged

fix: ensure manifest config is included with pulls #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/pkg/bundle/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ func (op *ociProvider) LoadBundle(opts types.BundlePullOptions, _ int) (*types.U
return nil, nil, err
}

// grab root manifest config
layersToPull = append(layersToPull, rootManifest.Config)

for _, pkg := range bundle.Packages {

// grab sha of zarf image manifest and pull it down
Expand Down
36 changes: 25 additions & 11 deletions src/test/e2e/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ func TestBundleWithLocalAndRemotePkgs(t *testing.T) {
deployZarfInit(t)
e2e.SetupDockerRegistry(t, 888)
defer e2e.TeardownRegistry(t, 888)
e2e.SetupDockerRegistry(t, 889)
defer e2e.TeardownRegistry(t, 889)
e2e.CreateZarfPkg(t, "src/test/packages/podinfo", false)

bundleDir := "src/test/bundles/03-local-and-remote"
Expand All @@ -86,10 +88,22 @@ func TestBundleWithLocalAndRemotePkgs(t *testing.T) {
}
createLocal(t, bundleDir, e2e.Arch)
inspectLocal(t, bundlePath)
publishInsecure(t, bundlePath, bundleRef.Registry)
pull(t, bundleRef.String(), tarballPath)
deploy(t, tarballPath)
remove(t, tarballPath)
deploy(t, bundlePath)
remove(t, bundlePath)

t.Run("Test pulling and deploying from the same registry", func(t *testing.T) {
publishInsecure(t, bundlePath, bundleRef.Registry)
pull(t, bundleRef.String(), tarballPath) // note that pull pulls the bundle into the build dir
deploy(t, filepath.Join("build", filepath.Base(bundlePath)))
remove(t, filepath.Join("build", filepath.Base(bundlePath)))
})

t.Run(" Test publishing and deploying from different registries", func(t *testing.T) {
publishInsecure(t, bundlePath, bundleRef.Registry)
pull(t, bundleRef.String(), tarballPath) // note that pull pulls the bundle into the build dir
publishInsecure(t, filepath.Join("build", filepath.Base(bundlePath)), "oci://localhost:889")
deployAndRemoveRemoteInsecure(t, bundleRef.String())
})
}

func TestLocalBundleWithRemotePkgs(t *testing.T) {
Expand Down Expand Up @@ -263,14 +277,14 @@ func TestRemoteBundleWithRemotePkgs(t *testing.T) {
pull(t, bundleRef.String(), tarballPath)
inspectRemoteInsecure(t, bundleRef.String())
inspectRemoteAndSBOMExtract(t, bundleRef.String())
deployAndRemoveRemote(t, bundleRef.String(), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, bundleRef.String(), tarballPath)

bundleRef = registry.Reference{
Registry: "oci://localhost:888",
Repository: "example-remote",
Reference: "0.0.1",
}
deployAndRemoveRemote(t, bundleRef.String(), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, bundleRef.String(), tarballPath)
}

func TestBundleWithGitRepo(t *testing.T) {
Expand Down Expand Up @@ -370,7 +384,7 @@ func TestPackageNaming(t *testing.T) {

// Test create -o with zarf package names that don't match the zarf package name in the bundle
createRemoteInsecure(t, bundleDir, bundleRef.Registry, e2e.Arch)
deployAndRemoveRemote(t, bundleRef.String(), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, bundleRef.String(), tarballPath)
}

func TestBundleIndexInRemoteOnPublish(t *testing.T) {
Expand All @@ -396,7 +410,7 @@ func TestBundleIndexInRemoteOnPublish(t *testing.T) {

inspectRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName))
pull(t, fmt.Sprintf("localhost:888/%s:0.0.1", bundleName), tarballPath) // test no oci prefix
deployAndRemoveRemote(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)

// now test by running 'create -o' over the bundle that was published
createRemoteInsecure(t, bundleDir, "oci://localhost:888", e2e.Arch)
Expand All @@ -405,7 +419,7 @@ func TestBundleIndexInRemoteOnPublish(t *testing.T) {
validateMultiArchIndex(t, index)
inspectRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName))
pull(t, fmt.Sprintf("localhost:888/%s:0.0.1", bundleName), tarballPath) // test no oci prefix
deployAndRemoveRemote(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
}

func TestBundleIndexInRemoteOnCreate(t *testing.T) {
Expand All @@ -427,7 +441,7 @@ func TestBundleIndexInRemoteOnCreate(t *testing.T) {

inspectRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName))
pull(t, fmt.Sprintf("localhost:888/%s:0.0.1", bundleName), tarballPath) // test no oci prefix
deployAndRemoveRemote(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)

// now test by publishing over the bundle that was created with 'create -o'
createLocal(t, bundleDir, e2e.Arch)
Expand All @@ -437,7 +451,7 @@ func TestBundleIndexInRemoteOnCreate(t *testing.T) {
validateMultiArchIndex(t, index)
inspectRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName))
pull(t, fmt.Sprintf("localhost:888/%s:0.0.1", bundleName), tarballPath) // test no oci prefix
deployAndRemoveRemote(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
deployAndRemoveLocalAndRemoteInsecure(t, fmt.Sprintf("oci://localhost:888/%s:0.0.1", bundleName), tarballPath)
}

func validateMultiArchIndex(t *testing.T, index ocispec.Index) {
Expand Down
8 changes: 7 additions & 1 deletion src/test/e2e/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@ func removePackagesFlag(tarballPath string, packages string) (stdout string, std
return stdout, stderr
}

func deployAndRemoveRemote(t *testing.T, ref string, tarballPath string) {
func deployAndRemoveRemoteInsecure(t *testing.T, ref string) {
cmd := strings.Split(fmt.Sprintf("deploy %s --insecure --oci-concurrency=10 --confirm", ref), " ")
_, _, err := e2e.UDS(cmd...)
require.NoError(t, err)
}

func deployAndRemoveLocalAndRemoteInsecure(t *testing.T, ref string, tarballPath string) {
var cmd []string
// test both paths because we want to test that the pulled tarball works as well
t.Run(
Expand Down