From b2ac115ee4bd825f4024c2fd8f5261aba983d6be Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Wed, 13 Apr 2022 17:31:36 +0200
Subject: [PATCH] Fix csaf_provider integration test

 * Move to using a custom argument list in main for the provider,
   now that we have argument handling.
---
 cmd/csaf_provider/main.go      | 9 +++++++--
 cmd/csaf_provider/main_test.go | 5 ++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmd/csaf_provider/main.go b/cmd/csaf_provider/main.go
index daaefb3..d709699 100644
--- a/cmd/csaf_provider/main.go
+++ b/cmd/csaf_provider/main.go
@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"log"
 	"net/http/cgi"
+	"os"
 
 	"github.com/csaf-poc/csaf_distribution/util"
 	"github.com/jessevdk/go-flags"
@@ -21,7 +22,7 @@ type options struct {
 	Version bool `long:"version" description:"Display version of the binary"`
 }
 
-func main() {
+func realMain(args []string) {
 	cfg, err := loadConfig()
 	if err != nil {
 		log.Fatalf("error: %v\n", err)
@@ -29,7 +30,7 @@ func main() {
 
 	var opts options
 	parser := flags.NewParser(&opts, flags.Default)
-	parser.Parse()
+	parser.ParseArgs(args)
 	if opts.Version {
 		fmt.Println(util.SemVersion)
 		return
@@ -46,3 +47,7 @@ func main() {
 		log.Fatalf("error: %v\n", err)
 	}
 }
+
+func main() {
+	realMain(os.Args[1:])
+}
diff --git a/cmd/csaf_provider/main_test.go b/cmd/csaf_provider/main_test.go
index 703ff06..795c1db 100644
--- a/cmd/csaf_provider/main_test.go
+++ b/cmd/csaf_provider/main_test.go
@@ -5,8 +5,7 @@ import (
 	"testing"
 )
 
-// as main() does not process os.Args, we can call it directly as -test.*
-// parameters will be ignored.
+// call realMain() with Args that skip over params used by "go test"
 //
 // use like
 //   go test -c -vet=off -covermode=atomic -o csaf_provider.debug
@@ -38,5 +37,5 @@ func TestMain(t *testing.T) {
 	if endOfTestParams == 0 {
 		t.Skip("skipping integration test, no `--` parameter found")
 	}
-	main()
+	realMain(os.Args[endOfTestParams+1:])
 }