Merge branch 'main' into linterNoMixins

Author: schristoff

.github/workflows/integ-reuseable-workflow.yml

@@ -8,7 +8,6 @@ on:
             required: true
         registry:
             type: string
-            required: true
             default: ghcr.io
 env:
     GOVERSION: 1.20.7

cmd/porter/bundle_test.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"testing"
 
+	"get.porter.sh/porter/pkg"
 	"get.porter.sh/porter/tests"
 
 	"get.porter.sh/porter/pkg/porter"
@@ -189,6 +190,7 @@ func TestBuildValidate_Driver(t *testing.T) {
 				// noop
 				return nil
 			}
+			p.FileSystem.WriteFile("porter.yaml", []byte(""), pkg.FileModeWritable)
 
 			err := rootCmd.Execute()
 			if tc.wantError == "" {

pkg/porter/build.go

@@ -72,7 +72,16 @@ func (o *BuildOptions) Validate(p *Porter) error {
 		return err
 	}
 
-	return o.BundleDefinitionOptions.Validate(p.Context)
+	err = o.BundleDefinitionOptions.Validate(p.Context)
+	if err != nil {
+		return err
+	}
+
+	if o.File == "" {
+		return fmt.Errorf("could not find porter.yaml in the current directory %s, make sure you are in the right directory or specify the porter manifest with --file", o.Dir)
+	}
+
+	return nil
 }
 
 func stringSliceContains(allowedValues []string, value string) bool {

pkg/porter/build_test.go

@@ -1,8 +1,10 @@
 package porter
 
 import (
+	"fmt"
 	"testing"
 
+	"get.porter.sh/porter/pkg"
 	"get.porter.sh/porter/pkg/manifest"
 	"get.porter.sh/porter/pkg/mixin"
 	"get.porter.sh/porter/pkg/pkgmgmt"
@@ -36,3 +38,28 @@ func TestPorter_GetUsedMixins(t *testing.T) {
 	assert.Len(t, results, 1)
 	assert.Equal(t, 1, testMixins.GetCalled("exec"), "expected the exec mixin to be called once")
 }
+
+func TestPorter_ErrorMessageOnMissingPorterYaml(t *testing.T) {
+	p := NewTestPorter(t)
+	defer p.Close()
+
+	o := BuildOptions{
+		BundleDefinitionOptions: BundleDefinitionOptions{},
+	}
+
+	err := o.Validate(p.Porter)
+	require.ErrorContains(t, err, fmt.Sprintf("could not find porter.yaml in the current directory %s, make sure you are in the right directory or specify the porter manifest with --file", o.Dir))
+}
+
+func TestPorter_NoErrorWhenPorterYamlIsPresent(t *testing.T) {
+	p := NewTestPorter(t)
+	defer p.Close()
+
+	o := BuildOptions{
+		BundleDefinitionOptions: BundleDefinitionOptions{},
+	}
+	p.FileSystem.WriteFile("porter.yaml", []byte(""), pkg.FileModeWritable)
+
+	err := o.Validate(p.Porter)
+	require.NoError(t, err, "validate BuildOptions failed")
+}