Merge branch 'master' into optimize_vault_error

Author: pkedy

Readme.md

@@ -1,6 +1,5 @@
 # Components Contrib
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/dapr/components-contrib)](https://goreportcard.com/report/github.com/dapr/components-contrib)
 [![Build Status](https://github.com/dapr/components-contrib/workflows/components-contrib/badge.svg?event=push&branch=master)](https://github.com/dapr/components-contrib/actions?workflow=components-contrib)
 [![Discord](https://img.shields.io/discord/778680217417809931)](https://discord.com/channels/778680217417809931/781589820128493598)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

bindings/alicloud/dingtalk/webhook/settings.go

@@ -12,7 +12,7 @@ package webhook
 import (
 	"errors"
 
-	"github.com/dapr/components-contrib/internal/config"
+	"github.com/dapr/kit/config"
 )
 
 type Settings struct {

bindings/alicloud/nacos/settings.go

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/dapr/components-contrib/internal/config"
+	"github.com/dapr/kit/config"
 )
 
 type Settings struct {

bindings/alicloud/rocketmq/rocketmq.go

@@ -19,8 +19,8 @@ import (
 	"github.com/apache/rocketmq-client-go/v2/primitive"
 	mqw "github.com/cinience/go_rocketmq"
 	"github.com/dapr/components-contrib/bindings"
-	"github.com/dapr/components-contrib/internal/retry"
 	"github.com/dapr/kit/logger"
+	"github.com/dapr/kit/retry"
 )
 
 type AliCloudRocketMQ struct {

bindings/alicloud/rocketmq/settings.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	rocketmq "github.com/cinience/go_rocketmq"
-	"github.com/dapr/components-contrib/internal/config"
+	"github.com/dapr/kit/config"
 )
 
 // rocketmq

bindings/graphql/graphql.go

@@ -0,0 +1,169 @@
+// ------------------------------------------------------------
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
+// Licensed under the MIT License.
+// ------------------------------------------------------------
+
+package graphql
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"strings"
+	"time"
+
+	"github.com/dapr/components-contrib/bindings"
+	"github.com/dapr/kit/logger"
+	graphql "github.com/machinebox/graphql"
+)
+
+const (
+	// configurations to connect to GraphQL
+	connectionEndPointKey = "endpoint"
+
+	// keys from request's metadata
+	commandQuery    = "query"
+	commandMutation = "mutation"
+
+	// keys from response's metadata
+	respOpKey        = "operation"
+	respStartTimeKey = "start-time"
+	respEndTimeKey   = "end-time"
+	respDurationKey  = "duration"
+
+	QueryOperation    bindings.OperationKind = "query"
+	MutationOperation bindings.OperationKind = "mutation"
+)
+
+// GraphQL represents GraphQL output bindings
+type GraphQL struct {
+	client *graphql.Client
+	header map[string]string
+	logger logger.Logger
+}
+
+var _ = bindings.OutputBinding(&GraphQL{})
+
+// NewGraphQL returns a new GraphQL binding instance
+func NewGraphQL(logger logger.Logger) *GraphQL {
+	return &GraphQL{logger: logger}
+}
+
+// Init initializes the GraphQL binding
+func (gql *GraphQL) Init(metadata bindings.Metadata) error {
+	gql.logger.Debug("GraphQL Error: Initializing GraphQL binding")
+
+	p := metadata.Properties
+	ep, ok := p[connectionEndPointKey]
+	if !ok || ep == "" {
+		return fmt.Errorf("GraphQL Error: Missing GraphQL URL")
+	}
+
+	// Connect to GraphQL Server
+	client := graphql.NewClient(ep)
+
+	gql.client = client
+	gql.header = make(map[string]string)
+	for k, v := range p {
+		if strings.HasPrefix(k, "header:") {
+			gql.header[strings.TrimPrefix(k, "header:")] = v
+		}
+	}
+
+	return nil
+}
+
+// Operations returns list of operations supported by GraphQL binding
+func (gql *GraphQL) Operations() []bindings.OperationKind {
+	return []bindings.OperationKind{
+		QueryOperation,
+		MutationOperation,
+	}
+}
+
+// Invoke handles all invoke operations
+func (gql *GraphQL) Invoke(req *bindings.InvokeRequest) (*bindings.InvokeResponse, error) {
+	if req == nil {
+		return nil, fmt.Errorf("GraphQL Error: Invoke request required")
+	}
+
+	if req.Metadata == nil {
+		return nil, fmt.Errorf("GraphQL Error: Metadata required")
+	}
+	gql.logger.Debugf("operation: %v", req.Operation)
+
+	startTime := time.Now().UTC()
+
+	resp := &bindings.InvokeResponse{
+		Metadata: map[string]string{
+			respOpKey:        string(req.Operation),
+			respStartTimeKey: startTime.Format(time.RFC3339Nano),
+		},
+		Data: []byte{},
+	}
+
+	var graphqlResponse interface{}
+
+	switch req.Operation { // nolint: exhaustive
+	case QueryOperation:
+		if err := gql.runRequest(commandQuery, req, &graphqlResponse); err != nil {
+			return nil, err
+		}
+
+	case MutationOperation:
+		if err := gql.runRequest(commandMutation, req, &graphqlResponse); err != nil {
+			return nil, err
+		}
+
+	default:
+		return nil, fmt.Errorf("GraphQL Error: invalid operation type: %s. Expected %s or %s",
+			req.Operation, QueryOperation, MutationOperation)
+	}
+
+	b, err := json.Marshal(graphqlResponse)
+	if err != nil {
+		return nil, fmt.Errorf("GraphQL Error: %w", err)
+	}
+
+	resp.Data = b
+
+	endTime := time.Now().UTC()
+	resp.Metadata[respEndTimeKey] = endTime.Format(time.RFC3339Nano)
+	resp.Metadata[respDurationKey] = endTime.Sub(startTime).String()
+
+	return resp, nil
+}
+
+func (gql *GraphQL) runRequest(requestKey string, req *bindings.InvokeRequest, response interface{}) error {
+	requestString, ok := req.Metadata[requestKey]
+	if !ok || requestString == "" {
+		return fmt.Errorf("GraphQL Error: required %q not set", requestKey)
+	}
+
+	// Check that the command is either a query or mutation based on the first keyword.
+	requestString = strings.TrimSpace(requestString)
+	re := regexp.MustCompile(`(?m)` + requestKey + `\b`)
+	matches := re.FindAllStringIndex(requestString, 1)
+	if len(matches) != 1 || matches[0][0] != 0 {
+		return fmt.Errorf("GraphQL Error: command is not a %s", requestKey)
+	}
+
+	request := graphql.NewRequest(requestString)
+
+	for headerKey, headerValue := range gql.header {
+		request.Header.Set(headerKey, headerValue)
+	}
+
+	for k, v := range req.Metadata {
+		if strings.HasPrefix(k, "header:") {
+			request.Header.Set(strings.TrimPrefix(k, "header:"), v)
+		}
+	}
+
+	if err := gql.client.Run(context.Background(), request, response); err != nil {
+		return fmt.Errorf("GraphQL Error: %w", err)
+	}
+
+	return nil
+}

bindings/graphql/graphql_test.go

@@ -0,0 +1,23 @@
+// ------------------------------------------------------------
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
+// Licensed under the MIT License.
+// ------------------------------------------------------------
+
+package graphql
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOperations(t *testing.T) {
+	t.Parallel()
+	t.Run("Get operation list", func(t *testing.T) {
+		t.Parallel()
+		b := NewGraphQL(nil)
+		assert.NotNil(t, b)
+		l := b.Operations()
+		assert.Equal(t, 2, len(l))
+	})
+}

bindings/mqtt/mqtt.go

@@ -22,8 +22,8 @@ import (
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 
 	"github.com/dapr/components-contrib/bindings"
-	"github.com/dapr/components-contrib/internal/retry"
 	"github.com/dapr/kit/logger"
+	"github.com/dapr/kit/retry"
 )
 
 const (

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	cloud.google.com/go v0.65.0
 	cloud.google.com/go/datastore v1.1.0
-	cloud.google.com/go/pubsub v1.3.1
+	cloud.google.com/go/pubsub v1.5.0
 	cloud.google.com/go/storage v1.10.0
 	github.com/Azure/azure-amqp-common-go/v3 v3.1.0 // indirect
 	github.com/Azure/azure-event-hubs-go v1.3.1
@@ -31,16 +31,16 @@ require (
 	github.com/apache/pulsar-client-go v0.1.0
 	github.com/apache/rocketmq-client-go/v2 v2.1.0
 	github.com/apache/thrift v0.14.0 // indirect
-	github.com/aws/aws-sdk-go v1.27.0
+	github.com/aws/aws-sdk-go v1.36.30
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/camunda-cloud/zeebe/clients/go v1.0.0
-	github.com/cenkalti/backoff/v4 v4.1.0
+	github.com/cenkalti/backoff/v4 v4.1.1
 	github.com/cinience/go_rocketmq v0.0.2
 	github.com/coreos/go-oidc v2.1.0+incompatible
 	github.com/cyphar/filepath-securejoin v0.2.2
 	github.com/dancannon/gorethink v4.0.0+incompatible
-	github.com/dapr/kit v0.0.1
+	github.com/dapr/kit v0.0.2-0.20210614175626-b9074b64d233
 	github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73
 	github.com/dghubble/go-twitter v0.0.0-20190719072343-39e5462e111f
 	github.com/dghubble/oauth1 v0.6.0
@@ -50,19 +50,21 @@ require (
 	github.com/eapache/go-resiliency v1.2.0 // indirect
 	github.com/eclipse/paho.mqtt.golang v1.3.2
 	github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5
+	github.com/fatih/color v1.10.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/gavv/httpexpect v2.0.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v0.3.0 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-redis/redis/v8 v8.8.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gocql/gocql v0.0.0-20191018090344-07ace3bab0f8
+	github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556
 	github.com/golang/mock v1.5.0
 	github.com/golang/protobuf v1.4.3
+	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/uuid v1.2.0
 	github.com/googleapis/gnostic v0.5.1 // indirect
-	github.com/gorilla/mux v1.7.3
+	github.com/gorilla/mux v1.8.0
 	github.com/grandcat/zeroconf v0.0.0-20190424104450-85eadb44205c
 	github.com/hashicorp/consul/api v1.3.0
 	github.com/hashicorp/go-multierror v1.0.0
@@ -73,20 +75,25 @@ require (
 	github.com/influxdata/influxdb-client-go v1.4.0
 	github.com/jackc/pgx/v4 v4.6.0
 	github.com/jcmturner/gofork v1.0.0 // indirect
+	github.com/jonboulle/clockwork v0.2.0 // indirect
 	github.com/json-iterator/go v1.1.10
 	github.com/kataras/go-errors v0.0.3 // indirect
 	github.com/kataras/go-serializer v0.0.4 // indirect
 	github.com/keighl/postmark v0.0.0-20190821160221-28358b1a94e3
 	github.com/kr/text v0.2.0 // indirect
+	github.com/machinebox/graphql v0.2.2
+	github.com/matryer/is v1.4.0 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.7 // indirect
-	github.com/mitchellh/mapstructure v1.3.3
+	github.com/miekg/dns v1.1.35 // indirect
+	github.com/mitchellh/mapstructure v1.4.1
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/nacos-group/nacos-sdk-go v1.0.7
 	github.com/nats-io/nats-server/v2 v2.2.1 // indirect
 	github.com/nats-io/nats-streaming-server v0.21.2 // indirect
 	github.com/nats-io/nats.go v1.10.1-0.20210330225420-a0b1f60162f8
 	github.com/nats-io/stan.go v0.8.3
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/open-policy-agent/opa v0.23.2
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -113,8 +120,10 @@ require (
 	go.opencensus.io v0.22.5 // indirect
 	goji.io v2.0.2+incompatible // indirect
 	golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
+	golang.org/x/mod v0.4.1 // indirect
 	golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c
 	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93
+	golang.org/x/text v0.3.5 // indirect
 	google.golang.org/api v0.32.0
 	google.golang.org/genproto v0.0.0-20201204160425-06b3db808446
 	google.golang.org/grpc v1.36.0
@@ -132,6 +141,7 @@ require (
 	gopkg.in/kataras/go-serializer.v0 v0.0.4 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
+	honnef.co/go/tools v0.1.3 // indirect
 	k8s.io/api v0.20.0
 	k8s.io/apiextensions-apiserver v0.20.0
 	k8s.io/apimachinery v0.20.0
@@ -140,3 +150,5 @@ require (
 )
 
 replace k8s.io/client => github.com/kubernetes-client/go v0.0.0-20190928040339-c757968c4c36
+
+replace github.com/dapr/components-contrib => ../components-contrib