Merge pull request #34 from openinfradev/main

merge from main

cmd/server/handlers.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
+	"github.com/openinfradev/tks-common/pkg/argowf"
 	"github.com/openinfradev/tks-common/pkg/helper"
 	"github.com/openinfradev/tks-common/pkg/log"
 	pb "github.com/openinfradev/tks-proto/tks_pb"
@@ -74,12 +75,13 @@ func (s *server) CreateContract(ctx context.Context, in *pb.CreateContractReques
 
 	workflowTemplate := "tks-create-contract-repo"
 	nameSpace := "argo"
-	parameters := []string{
+	opts := argowf.SubmitOptions{}
+	opts.Parameters = []string{
 		"contract_id=" + contractId,
 		"revision=" + revision,
 	}
 
-	workflowName, err := argowfClient.SumbitWorkflowFromWftpl(ctx, workflowTemplate, nameSpace, parameters)
+	workflowName, err := argowfClient.SumbitWorkflowFromWftpl(workflowTemplate, nameSpace, opts)
 	if err != nil {
 		log.Error("failed to submit argo workflow template. err : ", err)
 

cmd/server/handlers_test.go

@@ -104,7 +104,7 @@ func TestCreateContract(t *testing.T) {
 				}, nil)
 
 				mockArgoClient.EXPECT().
-					SumbitWorkflowFromWftpl(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
+					SumbitWorkflowFromWftpl(gomock.Any(), gomock.Any(), gomock.Any()).
 					Times(1).
 					Return(randomString("workflowName"), nil)
 			},
@@ -158,7 +158,7 @@ func TestCreateContract(t *testing.T) {
 				}, nil)
 
 				mockArgoClient.EXPECT().
-					SumbitWorkflowFromWftpl(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
+					SumbitWorkflowFromWftpl(gomock.Any(), gomock.Any(), gomock.Any()).
 					Times(1).
 					Return(randomString("workflowName"), errors.New("argo error"))
 			},

cmd/server/main.go

@@ -90,7 +90,7 @@ func main() {
 	contractAccessor = contract.New(db)
 
 	// initialize argo client
-	_argowfClient, err := argowf.New(argoAddress, argoPort)
+	_argowfClient, err := argowf.New(argoAddress, argoPort, false, "")
 	if err != nil {
 		log.Fatal("failed to create argowf client : ", err)
 	}

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/lib/pq v1.10.4
-	github.com/openinfradev/tks-common v0.0.0-20221121042940-4356d48a950b
+	github.com/openinfradev/tks-common v0.0.0-20221124045547-fbf60e9529da
 	github.com/openinfradev/tks-proto v0.0.6-0.20221018052004-85d1b297f865
 	github.com/stretchr/testify v1.7.0
 	google.golang.org/genproto v0.0.0-20211013025323-ce878158c4d4 // indirect