From 77418673408c81884fa001db4499cde57e0ba3e2 Mon Sep 17 00:00:00 2001 From: "eitam.ring@kubemq.io" Date: Sun, 13 Sep 2020 17:48:42 +0300 Subject: [PATCH] Update mod vendor - See https://github.com/Azure/azure-event-hubs-go/issues/186 --- go.mod | 6 +- targets/azure/eventhubs/client_test.go | 163 +------------------------ 2 files changed, 8 insertions(+), 161 deletions(-) diff --git a/go.mod b/go.mod index ba451551..e53114ed 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ require ( cloud.google.com/go/spanner v1.7.0 cloud.google.com/go/storage v1.8.0 firebase.google.com/go/v4 v4.0.0 - github.com/Azure/azure-amqp-common-go/v3 v3.0.1 // indirect - github.com/Azure/azure-event-hubs-go/v3 v3.3.0 // indirect + github.com/Azure/azure-event-hubs-go/v3 v3.3.0 + github.com/Azure/azure-pipeline-go v0.2.2 github.com/Azure/azure-sdk-for-go v46.1.0+incompatible // indirect github.com/Azure/azure-storage-blob-go v0.10.0 - github.com/Azure/go-amqp v0.13.1 // indirect + github.com/Azure/go-amqp v0.12.8 // indirect github.com/Azure/go-autorest/autorest v0.11.6 // indirect github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect diff --git a/targets/azure/eventhubs/client_test.go b/targets/azure/eventhubs/client_test.go index 61936323..dbda9c97 100644 --- a/targets/azure/eventhubs/client_test.go +++ b/targets/azure/eventhubs/client_test.go @@ -22,22 +22,22 @@ type testStructure struct { func getTestStructure() (*testStructure, error) { t := &testStructure{} - dat, err := ioutil.ReadFile("./../../../../credentials/azure/eventhubs/endPoint.txt") + dat, err := ioutil.ReadFile("./../../../credentials/azure/eventhubs/endPoint.txt") if err != nil { return nil, err } t.endPoint = string(dat) - dat, err = ioutil.ReadFile("./../../../../credentials/azure/eventhubs/sharedAccessKeyName.txt") + dat, err = ioutil.ReadFile("./../../../credentials/azure/eventhubs/sharedAccessKeyName.txt") if err != nil { return nil, err } t.sharedAccessKeyName = fmt.Sprintf("%s", dat) - dat, err = ioutil.ReadFile("./../../../../credentials/azure/eventhubs/sharedAccessKey.txt") + dat, err = ioutil.ReadFile("./../../../credentials/azure/eventhubs/sharedAccessKey.txt") if err != nil { return nil, err } t.sharedAccessKey = fmt.Sprintf("%s", dat) - dat, err = ioutil.ReadFile("./../../../../credentials/azure/eventhubs/entityPath.txt") + dat, err = ioutil.ReadFile("./../../../credentials/azure/eventhubs/entityPath.txt") if err != nil { return nil, err } @@ -132,157 +132,4 @@ func TestClient_Send(t *testing.T) { require.NotNil(t, got) }) } -} - -func TestClient_Get_Item(t *testing.T) { - dat, err := getTestStructure() - require.NoError(t, err) - cfg := config.Spec{ - Name: "target-azure-eventhubs", - Kind: "target.azure.eventhubs", - Properties: map[string]string{ - "storage_access_key": dat.storageAccessKey, - "storage_account": dat.storageAccount, - }, - } - tests := []struct { - name string - request *types.Request - wantErr bool - }{ - { - name: "valid get item", - request: types.NewRequest(). - SetMetadataKeyValue("method", "get"). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("service_url", dat.serviceURL), - wantErr: false, - }, { - name: "valid get item with offset and count", - request: types.NewRequest(). - SetMetadataKeyValue("method", "get"). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("offset", "2"). - SetMetadataKeyValue("count", "3"). - SetMetadataKeyValue("service_url", dat.serviceURL), - wantErr: false, - }, { - name: "invalid get item - missing file_name", - request: types.NewRequest(). - SetMetadataKeyValue("method", "get"). - SetMetadataKeyValue("service_url", dat.serviceURL), - wantErr: true, - }, { - name: "invalid get item - missing service_url", - request: types.NewRequest(). - SetMetadataKeyValue("method", "get"). - SetMetadataKeyValue("file_name", dat.fileName), - wantErr: true, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second) - defer cancel() - c := New() - err = c.Init(ctx, cfg) - require.NoError(t, err) - got, err := c.Do(ctx, tt.request) - if tt.wantErr { - require.Error(t, err) - t.Logf("init() error = %v, wantSetErr %v", err, tt.wantErr) - return - } - require.NoError(t, err) - require.NotNil(t, got.Data) - }) - } -} - -func TestClient_Delete_Item(t *testing.T) { - dat, err := getTestStructure() - require.NoError(t, err) - cfg := config.Spec{ - Name: "target-azure-eventhubs", - Kind: "target.azure.eventhubs", - Properties: map[string]string{ - "storage_access_key": dat.storageAccessKey, - "storage_account": dat.storageAccount, - }, - } - tests := []struct { - name string - request *types.Request - wantErr bool - }{ - { - name: "valid delete", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("service_url", dat.serviceURL). - SetMetadataKeyValue("delete_snapshots_option_type", ""), - wantErr: false, - }, - { - name: "invalid delete file does not exists", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("service_url", dat.serviceURL). - SetMetadataKeyValue("delete_snapshots_option_type", ""), - wantErr: true, - }, - { - name: "invalid delete- missing file_name", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("service_url", dat.serviceURL). - SetMetadataKeyValue("delete_snapshots_option_type", ""), - wantErr: true, - }, - { - name: "invalid delete- fake option", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("service_url", dat.serviceURL). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("delete_snapshots_option_type", ""), - wantErr: true, - }, { - name: "invalid delete- fake url", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("service_url", "fakeURL"). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("delete_snapshots_option_type", ""), - wantErr: true, - }, - { - name: "invalid delete- invalid delete_snapshots_option_type", - request: types.NewRequest(). - SetMetadataKeyValue("method", "delete"). - SetMetadataKeyValue("service_url", dat.serviceURL). - SetMetadataKeyValue("file_name", dat.fileName). - SetMetadataKeyValue("delete_snapshots_option_type", "test"), - wantErr: true, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) - defer cancel() - c := New() - err = c.Init(ctx, cfg) - require.NoError(t, err) - got, err := c.Do(ctx, tt.request) - if tt.wantErr { - require.Error(t, err) - t.Logf("init() error = %v, wantSetErr %v", err, tt.wantErr) - return - } - require.NoError(t, err) - require.NotNil(t, got) - }) - } -} +} \ No newline at end of file