Merge pull request #19 from evilmonkeyinc/fix/option_error

fix: fail is option used twice

Author: evilmonkeyinc

.github/workflows/pull_request.yaml

@@ -61,5 +61,5 @@ jobs:
         id: changes
         run: |
           echo "::set-output name=changes::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep 'go.mod\|.go$' | grep -v _test.go$ | xargs)"
-          echo "${{ steps.changes.outputs.changes}}"
+          echo ${{ steps.changes.outputs.changes}}
 

.github/workflows/push_main.yaml

@@ -82,7 +82,7 @@ jobs:
       - name: Get changed files
         id: changes
         run: |
-          echo "::set-output name=changes::$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep 'go.mod\|.go$' | grep -v _test.go$ | xargs)"
+          echo "::set-output name=changes::$(git diff --name-only --diff-filter=ACMRT origin/main origin/${GITHUB_HEAD_REF} | grep 'go.mod\|.go$' | grep -v _test.go$ | xargs)"
   release:
     runs-on: ubuntu-latest
     needs: [release_check]

errors.go

@@ -9,6 +9,7 @@ import (
 
 var (
 	errDataIsUnexpectedTypeOrNil error = fmt.Errorf("unexpected type or nil")
+	errOptionAlreadySet          error = fmt.Errorf("option already set")
 )
 
 func getInvalidJSONData(reason error) error {

options.go

@@ -34,7 +34,8 @@ func QueryOptions(options *option.QueryOptions) Option {
 	return OptionFunction(func(selector *Selector) error {
 		if selector.Options == nil {
 			selector.Options = options
+			return nil
 		}
-		return nil
+		return errOptionAlreadySet
 	})
 }

options_test.go

@@ -100,7 +100,7 @@ func Test_QueryOptions(t *testing.T) {
 		assert.Nil(t, err)
 
 		err = option2.Apply(selector)
-		assert.Nil(t, err)
+		assert.EqualError(t, err, "option already set")
 
 		assert.Equal(t, input1, selector.Options)
 		assert.NotEqual(t, input2, selector.Options)