image-builder: add experimental "skip-priv-checks" option

This commit adds support to skip the priviledges checks when
preparing for running osbuild. This is needed so that we can
still run our (fake) integration tests.

Author: mvo5

cmd/image-builder/main_test.go

@@ -159,6 +159,7 @@ func TestManifestIntegrationSmoke(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -359,6 +360,7 @@ func TestBuildIntegrationHappy(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -420,6 +422,7 @@ func TestBuildIntegrationArgs(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -509,6 +512,7 @@ func TestBuildIntegrationErrorsProgressVerbose(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -543,6 +547,7 @@ func TestBuildIntegrationErrorsProgressVerboseWithBuildlog(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -592,6 +597,7 @@ func TestBuildIntegrationErrorsProgressTerm(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -821,6 +827,7 @@ func TestBuildCrossArchSmoke(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()
@@ -873,6 +880,7 @@ func TestBuildIntegrationOutputFilename(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	restore := main.MockNewRepoRegistry(testrepos.New)
 	defer restore()

cmd/image-builder/upload_test.go

@@ -128,6 +128,7 @@ func TestBuildAndUploadWithAWSMock(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	var regionName, bucketName, amiName string
 	var fa fakeAwsUploader
@@ -177,6 +178,7 @@ func TestBuildAmiButNotUpload(t *testing.T) {
 	if !hasDepsolveDnf() {
 		t.Skip("no osbuild-depsolve-dnf binary found")
 	}
+	t.Setenv("IMAGE_BUILDER_EXPERIMENTAL", "skip-priv-checks")
 
 	fa := fakeAwsUploader{
 		uploadAndRegisterErr: fmt.Errorf("upload should not be called"),

pkg/progress/run.go

@@ -33,6 +33,10 @@ type OSBuildOptions struct {
 // enoughPrivsForOsbuild() returns true if the current process does
 // has enough priviledges to run osbuild
 var enoughPrivsForOsbuild = func() (bool, error) {
+	if experimentalflags.Bool("skip-priv-checks") {
+		return true, nil
+	}
+
 	if os.Getuid() != 0 {
 		return false, nil
 	}