From 8a65ad58d62fe67a95c15e32f396708116284389 Mon Sep 17 00:00:00 2001 From: Madhan Raj Mookkandy Date: Tue, 8 Sep 2020 13:04:05 -0700 Subject: [PATCH 1/2] Sync --- pkg/client/admin.go | 4 +- pkg/client/client.go | 2 +- pkg/client/cloud.go | 4 +- pkg/client/compute.go | 4 +- pkg/client/network.go | 4 +- pkg/client/security.go | 4 +- pkg/client/storage.go | 4 +- services/admin/logging/client.go | 2 +- services/admin/logging/internal/wssd.go | 6 +- services/cloud/cluster/client.go | 2 +- services/cloud/cluster/cluster.go | 6 +- services/cloud/cluster/cluster_test.go | 2 +- services/cloud/cluster/wssd.go | 8 +-- services/cloud/group/client.go | 2 +- services/cloud/group/group.go | 6 +- services/cloud/group/group_test.go | 2 +- services/cloud/group/wssd.go | 6 +- services/cloud/kubernetes/client.go | 2 +- services/cloud/kubernetes/kubernetes.go | 6 +- services/cloud/kubernetes/kubernetes_test.go | 2 +- services/cloud/kubernetes/wssd.go | 6 +- services/cloud/location/client.go | 2 +- services/cloud/location/location.go | 6 +- services/cloud/location/location_test.go | 2 +- services/cloud/location/wssd.go | 6 +- services/cloud/node/client.go | 2 +- services/cloud/node/node.go | 8 +-- services/cloud/node/node_test.go | 2 +- services/cloud/node/wssd.go | 8 +-- services/compute/galleryimage/client.go | 2 +- services/compute/galleryimage/galleryimage.go | 6 +- services/compute/galleryimage/wssd.go | 8 +-- services/compute/virtualmachine/client.go | 4 +- .../compute/virtualmachine/virtualmachine.go | 10 +-- services/compute/virtualmachine/wssd.go | 6 +- .../compute/virtualmachineimage/client.go | 2 +- .../virtualmachineimage.go | 4 +- services/compute/virtualmachineimage/wssd.go | 8 +-- .../compute/virtualmachinescaleset/client.go | 2 +- .../virtualmachinescaleset.go | 10 +-- .../compute/virtualmachinescaleset/wssd.go | 8 +-- services/compute/vmSizes.go | 2 +- services/network/loadbalancer/client.go | 2 +- services/network/loadbalancer/wssd.go | 10 +-- services/network/macpool/client.go | 2 +- services/network/macpool/wssd.go | 10 +-- services/network/networkinterface/client.go | 2 +- .../networkinterface/networkinterface.go | 8 +-- services/network/networkinterface/wssd.go | 8 +-- services/network/vippool/client.go | 2 +- services/network/vippool/wssd.go | 10 +-- services/network/virtualnetwork/client.go | 2 +- .../network/virtualnetwork/virtualnetwork.go | 8 +-- services/network/virtualnetwork/wssd.go | 8 +-- services/security/authentication/client.go | 2 +- services/security/authentication/wssd.go | 4 +- services/security/certificate/certificate.go | 6 +- services/security/certificate/client.go | 2 +- services/security/certificate/wssd.go | 4 +- services/security/identity/client.go | 2 +- services/security/identity/identity.go | 6 +- services/security/identity/wssd.go | 6 +- services/security/keyvault/client.go | 2 +- services/security/keyvault/key/client.go | 16 ++--- services/security/keyvault/key/key.go | 67 +++++++++++++++---- services/security/keyvault/key/wssd.go | 37 +++++----- services/security/keyvault/keyvault.go | 10 +-- services/security/keyvault/secret/client.go | 2 +- services/security/keyvault/secret/secret.go | 8 +-- services/security/keyvault/secret/wssd.go | 8 +-- services/security/keyvault/wssd.go | 8 +-- services/storage/container/client.go | 2 +- services/storage/container/container.go | 6 +- services/storage/container/wssd.go | 8 +-- services/storage/virtualharddisk/client.go | 4 +- .../virtualharddisk/virtualharddisk.go | 6 +- services/storage/virtualharddisk/wssd.go | 8 +-- 77 files changed, 269 insertions(+), 219 deletions(-) diff --git a/pkg/client/admin.go b/pkg/client/admin.go index a070a49..f6883e7 100644 --- a/pkg/client/admin.go +++ b/pkg/client/admin.go @@ -6,8 +6,8 @@ package client import ( log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - admin_pb "github.com/microsoft/moc-proto/rpc/cloudagent/admin" + "github.com/microsoft/moc/pkg/auth" + admin_pb "github.com/microsoft/moc/rpc/cloudagent/admin" ) // GetLogClient returns the log client to communicate with the wssdcloud agent diff --git a/pkg/client/client.go b/pkg/client/client.go index 5a51353..6b79d74 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/keepalive" log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" + "github.com/microsoft/moc/pkg/auth" ) const ( diff --git a/pkg/client/cloud.go b/pkg/client/cloud.go index ad44699..f24a22b 100644 --- a/pkg/client/cloud.go +++ b/pkg/client/cloud.go @@ -6,8 +6,8 @@ package client import ( log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - cloud_pb "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" + "github.com/microsoft/moc/pkg/auth" + cloud_pb "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // GetLocationClient returns the virtual machine client to comminicate with the wssd agent diff --git a/pkg/client/compute.go b/pkg/client/compute.go index 633cce2..4fd27a6 100644 --- a/pkg/client/compute.go +++ b/pkg/client/compute.go @@ -5,8 +5,8 @@ package client import ( log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - compute_pb "github.com/microsoft/moc-proto/rpc/cloudagent/compute" + "github.com/microsoft/moc/pkg/auth" + compute_pb "github.com/microsoft/moc/rpc/cloudagent/compute" ) // GetGalleryImageClient returns the virtual machine client to comminicate with the wssd agent diff --git a/pkg/client/network.go b/pkg/client/network.go index cc3ded2..3833fc7 100644 --- a/pkg/client/network.go +++ b/pkg/client/network.go @@ -6,8 +6,8 @@ package client import ( log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - network_pb "github.com/microsoft/moc-proto/rpc/cloudagent/network" + "github.com/microsoft/moc/pkg/auth" + network_pb "github.com/microsoft/moc/rpc/cloudagent/network" ) // GetVirtualNetworkClient returns the virtual network client to communicate with the wssdagent diff --git a/pkg/client/security.go b/pkg/client/security.go index bd122de..bab8670 100644 --- a/pkg/client/security.go +++ b/pkg/client/security.go @@ -7,8 +7,8 @@ import ( "google.golang.org/grpc" log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - security_pb "github.com/microsoft/moc-proto/rpc/cloudagent/security" + "github.com/microsoft/moc/pkg/auth" + security_pb "github.com/microsoft/moc/rpc/cloudagent/security" ) // GetKeyVaultClient returns the keyvault client to communicate with the wssdagent diff --git a/pkg/client/storage.go b/pkg/client/storage.go index c4d2729..2fad397 100644 --- a/pkg/client/storage.go +++ b/pkg/client/storage.go @@ -6,8 +6,8 @@ package client import ( log "k8s.io/klog" - "github.com/microsoft/moc-proto/pkg/auth" - storage_pb "github.com/microsoft/moc-proto/rpc/cloudagent/storage" + "github.com/microsoft/moc/pkg/auth" + storage_pb "github.com/microsoft/moc/rpc/cloudagent/storage" ) // GetVirtualHardDiskClient returns the virtual network client to communicate with the wssdagent diff --git a/services/admin/logging/client.go b/services/admin/logging/client.go index 6473327..22fb997 100644 --- a/services/admin/logging/client.go +++ b/services/admin/logging/client.go @@ -5,8 +5,8 @@ package logging import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/admin/logging/internal" + "github.com/microsoft/moc/pkg/auth" ) // Service interfacetype Service interface { diff --git a/services/admin/logging/internal/wssd.go b/services/admin/logging/internal/wssd.go index 2e0bd82..cedaaf1 100644 --- a/services/admin/logging/internal/wssd.go +++ b/services/admin/logging/internal/wssd.go @@ -6,10 +6,10 @@ package internal import ( "context" "errors" - "github.com/microsoft/moc-proto/pkg/auth" - loggingHelpers "github.com/microsoft/moc-proto/pkg/logging" - wssdadmin "github.com/microsoft/moc-proto/rpc/cloudagent/admin" wssdclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + loggingHelpers "github.com/microsoft/moc/pkg/logging" + wssdadmin "github.com/microsoft/moc/rpc/cloudagent/admin" "io" "os" "strconv" diff --git a/services/cloud/cluster/client.go b/services/cloud/cluster/client.go index 4654030..9e75c2d 100644 --- a/services/cloud/cluster/client.go +++ b/services/cloud/cluster/client.go @@ -5,8 +5,8 @@ package cluster import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" ) type Service interface { diff --git a/services/cloud/cluster/cluster.go b/services/cloud/cluster/cluster.go index 86fe4e9..7b39eaf 100644 --- a/services/cloud/cluster/cluster.go +++ b/services/cloud/cluster/cluster.go @@ -4,10 +4,10 @@ package cluster import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // Conversion functions from cloud to wssdcloud diff --git a/services/cloud/cluster/cluster_test.go b/services/cloud/cluster/cluster_test.go index f26432e..bdf2533 100644 --- a/services/cloud/cluster/cluster_test.go +++ b/services/cloud/cluster/cluster_test.go @@ -6,8 +6,8 @@ package cluster import ( "testing" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) var ( diff --git a/services/cloud/cluster/wssd.go b/services/cloud/cluster/wssd.go index aadd34d..61d2349 100644 --- a/services/cloud/cluster/wssd.go +++ b/services/cloud/cluster/wssd.go @@ -8,11 +8,11 @@ import ( "fmt" "github.com/microsoft/moc-sdk-for-go/services/cloud" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/cloud/group/client.go b/services/cloud/group/client.go index f09258e..ec98a26 100644 --- a/services/cloud/group/client.go +++ b/services/cloud/group/client.go @@ -5,8 +5,8 @@ package group import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" ) type Service interface { diff --git a/services/cloud/group/group.go b/services/cloud/group/group.go index 5e90bdb..75c41af 100644 --- a/services/cloud/group/group.go +++ b/services/cloud/group/group.go @@ -4,11 +4,11 @@ package group import ( - "github.com/microsoft/moc-proto/pkg/errors" + "github.com/microsoft/moc/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/status" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // Conversion functions from cloud to wssdcloud diff --git a/services/cloud/group/group_test.go b/services/cloud/group/group_test.go index c040ced..f70ab7c 100644 --- a/services/cloud/group/group_test.go +++ b/services/cloud/group/group_test.go @@ -6,8 +6,8 @@ package group import ( "testing" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) var ( diff --git a/services/cloud/group/wssd.go b/services/cloud/group/wssd.go index df61d53..f4d3905 100644 --- a/services/cloud/group/wssd.go +++ b/services/cloud/group/wssd.go @@ -6,12 +6,12 @@ package group import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/cloud/kubernetes/client.go b/services/cloud/kubernetes/client.go index a182342..e5392bb 100644 --- a/services/cloud/kubernetes/client.go +++ b/services/cloud/kubernetes/client.go @@ -5,8 +5,8 @@ package kubernetes import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/cloud/kubernetes/kubernetes.go b/services/cloud/kubernetes/kubernetes.go index 001a45b..9ffb646 100644 --- a/services/cloud/kubernetes/kubernetes.go +++ b/services/cloud/kubernetes/kubernetes.go @@ -4,10 +4,10 @@ package kubernetes import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // Conversion functions from cloud to wssdcloud diff --git a/services/cloud/kubernetes/kubernetes_test.go b/services/cloud/kubernetes/kubernetes_test.go index 904426f..07eab78 100644 --- a/services/cloud/kubernetes/kubernetes_test.go +++ b/services/cloud/kubernetes/kubernetes_test.go @@ -6,8 +6,8 @@ package kubernetes import ( "testing" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) var ( diff --git a/services/cloud/kubernetes/wssd.go b/services/cloud/kubernetes/wssd.go index 25a0fd0..19a7d39 100644 --- a/services/cloud/kubernetes/wssd.go +++ b/services/cloud/kubernetes/wssd.go @@ -6,12 +6,12 @@ package kubernetes import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" - wssdcloudk8s "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + wssdcloudk8s "github.com/microsoft/moc/rpc/cloudagent/cloud" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/cloud/location/client.go b/services/cloud/location/client.go index 1c65216..85dfd8f 100644 --- a/services/cloud/location/client.go +++ b/services/cloud/location/client.go @@ -5,8 +5,8 @@ package location import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" ) type Service interface { diff --git a/services/cloud/location/location.go b/services/cloud/location/location.go index 7a24202..cad46ac 100644 --- a/services/cloud/location/location.go +++ b/services/cloud/location/location.go @@ -4,11 +4,11 @@ package location import ( - "github.com/microsoft/moc-proto/pkg/errors" + "github.com/microsoft/moc/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/status" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // Conversion functions from cloud to wssdcloud diff --git a/services/cloud/location/location_test.go b/services/cloud/location/location_test.go index fc86a60..2392e3c 100644 --- a/services/cloud/location/location_test.go +++ b/services/cloud/location/location_test.go @@ -6,8 +6,8 @@ package location import ( "testing" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) var ( diff --git a/services/cloud/location/wssd.go b/services/cloud/location/wssd.go index ab0c414..db3168a 100644 --- a/services/cloud/location/wssd.go +++ b/services/cloud/location/wssd.go @@ -6,12 +6,12 @@ package location import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/cloud/node/client.go b/services/cloud/node/client.go index ea75277..94525c9 100644 --- a/services/cloud/node/client.go +++ b/services/cloud/node/client.go @@ -5,8 +5,8 @@ package node import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/cloud" + "github.com/microsoft/moc/pkg/auth" ) type Service interface { diff --git a/services/cloud/node/node.go b/services/cloud/node/node.go index 25b217b..4b8f87d 100644 --- a/services/cloud/node/node.go +++ b/services/cloud/node/node.go @@ -6,10 +6,10 @@ package node import ( "github.com/microsoft/moc-sdk-for-go/services/cloud" - "github.com/microsoft/moc-proto/pkg/convert" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" + "github.com/microsoft/moc/pkg/convert" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) // Conversion functions from cloud to wssdcloud diff --git a/services/cloud/node/node_test.go b/services/cloud/node/node_test.go index deb7112..f58ce05 100644 --- a/services/cloud/node/node_test.go +++ b/services/cloud/node/node_test.go @@ -6,8 +6,8 @@ package node import ( "testing" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" "github.com/microsoft/moc-sdk-for-go/services/cloud" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" ) var ( diff --git a/services/cloud/node/wssd.go b/services/cloud/node/wssd.go index 6cadbb4..f3436dc 100644 --- a/services/cloud/node/wssd.go +++ b/services/cloud/node/wssd.go @@ -8,12 +8,12 @@ import ( "fmt" "github.com/microsoft/moc-sdk-for-go/services/cloud" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" - wssdcloud "github.com/microsoft/moc-proto/rpc/cloudagent/cloud" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + wssdcloud "github.com/microsoft/moc/rpc/cloudagent/cloud" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/compute/galleryimage/client.go b/services/compute/galleryimage/client.go index 81caeff..0c73f09 100644 --- a/services/compute/galleryimage/client.go +++ b/services/compute/galleryimage/client.go @@ -5,8 +5,8 @@ package galleryimage import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/compute/galleryimage/galleryimage.go b/services/compute/galleryimage/galleryimage.go index ddbd273..50d22d1 100644 --- a/services/compute/galleryimage/galleryimage.go +++ b/services/compute/galleryimage/galleryimage.go @@ -5,9 +5,9 @@ package galleryimage import ( "github.com/microsoft/moc-sdk-for-go/services/compute" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" ) // Conversion functions from compute to wssdcloudcompute diff --git a/services/compute/galleryimage/wssd.go b/services/compute/galleryimage/wssd.go index 46456aa..45b35ae 100644 --- a/services/compute/galleryimage/wssd.go +++ b/services/compute/galleryimage/wssd.go @@ -6,12 +6,12 @@ package galleryimage import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/compute/virtualmachine/client.go b/services/compute/virtualmachine/client.go index 43f95e5..d18a775 100644 --- a/services/compute/virtualmachine/client.go +++ b/services/compute/virtualmachine/client.go @@ -8,9 +8,9 @@ import ( "log" "time" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" ) type Service interface { diff --git a/services/compute/virtualmachine/virtualmachine.go b/services/compute/virtualmachine/virtualmachine.go index 1230824..1d9c889 100644 --- a/services/compute/virtualmachine/virtualmachine.go +++ b/services/compute/virtualmachine/virtualmachine.go @@ -4,14 +4,14 @@ package virtualmachine import ( - "github.com/microsoft/moc-proto/pkg/convert" - "github.com/microsoft/moc-proto/pkg/errors" + "github.com/microsoft/moc/pkg/convert" + "github.com/microsoft/moc/pkg/errors" "github.com/microsoft/moc-sdk-for-go/services/compute" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" - wssdcommon "github.com/microsoft/moc-proto/rpc/common" + "github.com/microsoft/moc/pkg/status" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" + wssdcommon "github.com/microsoft/moc/rpc/common" ) func (c *client) getWssdVirtualMachine(vm *compute.VirtualMachine, group string) (*wssdcloudcompute.VirtualMachine, error) { diff --git a/services/compute/virtualmachine/wssd.go b/services/compute/virtualmachine/wssd.go index ee9fdfa..26a5554 100644 --- a/services/compute/virtualmachine/wssd.go +++ b/services/compute/virtualmachine/wssd.go @@ -6,13 +6,13 @@ package virtualmachine import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" - wssdcloudproto "github.com/microsoft/moc-proto/rpc/common" + wssdcloudproto "github.com/microsoft/moc/rpc/common" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" ) type client struct { diff --git a/services/compute/virtualmachineimage/client.go b/services/compute/virtualmachineimage/client.go index c6c82a4..b375277 100644 --- a/services/compute/virtualmachineimage/client.go +++ b/services/compute/virtualmachineimage/client.go @@ -5,8 +5,8 @@ package virtualmachineimage import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/compute/virtualmachineimage/virtualmachineimage.go b/services/compute/virtualmachineimage/virtualmachineimage.go index 580da59..786a834 100644 --- a/services/compute/virtualmachineimage/virtualmachineimage.go +++ b/services/compute/virtualmachineimage/virtualmachineimage.go @@ -5,8 +5,8 @@ package virtualmachineimage import ( "github.com/microsoft/moc-sdk-for-go/services/compute" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" + "github.com/microsoft/moc/pkg/errors" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" ) // Conversion functions from compute to wssdcloudcompute diff --git a/services/compute/virtualmachineimage/wssd.go b/services/compute/virtualmachineimage/wssd.go index aa98076..7a64a45 100644 --- a/services/compute/virtualmachineimage/wssd.go +++ b/services/compute/virtualmachineimage/wssd.go @@ -6,11 +6,11 @@ package virtualmachineimage import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/compute/virtualmachinescaleset/client.go b/services/compute/virtualmachinescaleset/client.go index 13d695e..20eedb6 100644 --- a/services/compute/virtualmachinescaleset/client.go +++ b/services/compute/virtualmachinescaleset/client.go @@ -6,8 +6,8 @@ package virtualmachinescaleset import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/auth" ) type Service interface { diff --git a/services/compute/virtualmachinescaleset/virtualmachinescaleset.go b/services/compute/virtualmachinescaleset/virtualmachinescaleset.go index c07977f..8ded5ee 100644 --- a/services/compute/virtualmachinescaleset/virtualmachinescaleset.go +++ b/services/compute/virtualmachinescaleset/virtualmachinescaleset.go @@ -4,12 +4,12 @@ package virtualmachinescaleset import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcommon "github.com/microsoft/moc-proto/rpc/common" "github.com/microsoft/moc-sdk-for-go/services/compute" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcommon "github.com/microsoft/moc/rpc/common" ) func (c *client) getVirtualMachineScaleSet(vmss *wssdcloudcompute.VirtualMachineScaleSet, group string) (*compute.VirtualMachineScaleSet, error) { diff --git a/services/compute/virtualmachinescaleset/wssd.go b/services/compute/virtualmachinescaleset/wssd.go index 1d75189..47bd778 100644 --- a/services/compute/virtualmachinescaleset/wssd.go +++ b/services/compute/virtualmachinescaleset/wssd.go @@ -7,15 +7,15 @@ import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" - wssdcloudcompute "github.com/microsoft/moc-proto/rpc/cloudagent/compute" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/compute" "github.com/microsoft/moc-sdk-for-go/services/compute/virtualmachine" + wssdcloudcompute "github.com/microsoft/moc/rpc/cloudagent/compute" ) type client struct { diff --git a/services/compute/vmSizes.go b/services/compute/vmSizes.go index 28dce7f..ab193f4 100644 --- a/services/compute/vmSizes.go +++ b/services/compute/vmSizes.go @@ -4,7 +4,7 @@ package compute import ( - cloudcompute "github.com/microsoft/moc-proto/rpc/common" + cloudcompute "github.com/microsoft/moc/rpc/common" ) func GetCloudSdkVirtualMachineSizeFromCloudVirtualMachineSize(size cloudcompute.VirtualMachineSizeType) VirtualMachineSizeTypes { diff --git a/services/network/loadbalancer/client.go b/services/network/loadbalancer/client.go index a59c3f2..30d2d4f 100644 --- a/services/network/loadbalancer/client.go +++ b/services/network/loadbalancer/client.go @@ -6,8 +6,8 @@ package loadbalancer import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/network/loadbalancer/wssd.go b/services/network/loadbalancer/wssd.go index 7db82cc..466f637 100644 --- a/services/network/loadbalancer/wssd.go +++ b/services/network/loadbalancer/wssd.go @@ -10,12 +10,12 @@ import ( "github.com/microsoft/moc-sdk-for-go/services/network" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/network/macpool/client.go b/services/network/macpool/client.go index 9007fcb..e869003 100644 --- a/services/network/macpool/client.go +++ b/services/network/macpool/client.go @@ -6,8 +6,8 @@ package macpool import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/network/macpool/wssd.go b/services/network/macpool/wssd.go index c4672f9..9ef96e0 100644 --- a/services/network/macpool/wssd.go +++ b/services/network/macpool/wssd.go @@ -9,12 +9,12 @@ import ( "github.com/microsoft/moc-sdk-for-go/services/network" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/network/networkinterface/client.go b/services/network/networkinterface/client.go index a3f483e..1f320f3 100644 --- a/services/network/networkinterface/client.go +++ b/services/network/networkinterface/client.go @@ -5,8 +5,8 @@ package networkinterface import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/network/networkinterface/networkinterface.go b/services/network/networkinterface/networkinterface.go index 5a4c3b4..dc2064c 100644 --- a/services/network/networkinterface/networkinterface.go +++ b/services/network/networkinterface/networkinterface.go @@ -3,11 +3,11 @@ package networkinterface import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcommonproto "github.com/microsoft/moc-proto/rpc/common" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcommonproto "github.com/microsoft/moc/rpc/common" ) // Conversion functions from network interface to wssdcloud network interface diff --git a/services/network/networkinterface/wssd.go b/services/network/networkinterface/wssd.go index 5cd193a..ed8417d 100644 --- a/services/network/networkinterface/wssd.go +++ b/services/network/networkinterface/wssd.go @@ -6,12 +6,12 @@ package networkinterface import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/network/vippool/client.go b/services/network/vippool/client.go index 81fbf5a..20d386b 100644 --- a/services/network/vippool/client.go +++ b/services/network/vippool/client.go @@ -6,8 +6,8 @@ package vippool import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/network/vippool/wssd.go b/services/network/vippool/wssd.go index 5a548a7..4d9b230 100644 --- a/services/network/vippool/wssd.go +++ b/services/network/vippool/wssd.go @@ -9,12 +9,12 @@ import ( "github.com/microsoft/moc-sdk-for-go/services/network" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/network/virtualnetwork/client.go b/services/network/virtualnetwork/client.go index 6a071f4..c08046e 100644 --- a/services/network/virtualnetwork/client.go +++ b/services/network/virtualnetwork/client.go @@ -5,8 +5,8 @@ package virtualnetwork import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/network/virtualnetwork/virtualnetwork.go b/services/network/virtualnetwork/virtualnetwork.go index 93ff1b8..a966334 100644 --- a/services/network/virtualnetwork/virtualnetwork.go +++ b/services/network/virtualnetwork/virtualnetwork.go @@ -3,11 +3,11 @@ package virtualnetwork import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcommonproto "github.com/microsoft/moc-proto/rpc/common" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcommonproto "github.com/microsoft/moc/rpc/common" ) // Conversion functions from network to wssdcloudnetwork diff --git a/services/network/virtualnetwork/wssd.go b/services/network/virtualnetwork/wssd.go index f91635c..5970f7e 100644 --- a/services/network/virtualnetwork/wssd.go +++ b/services/network/virtualnetwork/wssd.go @@ -6,13 +6,13 @@ package virtualnetwork import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/errors" "github.com/microsoft/moc-sdk-for-go/services/network" + "github.com/microsoft/moc/pkg/errors" - "github.com/microsoft/moc-proto/pkg/auth" - wssdcloudnetwork "github.com/microsoft/moc-proto/rpc/cloudagent/network" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + wssdcloudnetwork "github.com/microsoft/moc/rpc/cloudagent/network" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/security/authentication/client.go b/services/security/authentication/client.go index 47307f2..e798475 100644 --- a/services/security/authentication/client.go +++ b/services/security/authentication/client.go @@ -5,8 +5,8 @@ package authentication import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/security/authentication/wssd.go b/services/security/authentication/wssd.go index e759896..264a14c 100644 --- a/services/security/authentication/wssd.go +++ b/services/security/authentication/wssd.go @@ -5,10 +5,10 @@ package authentication import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" - wssdsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" wssdclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" + wssdsecurity "github.com/microsoft/moc/rpc/cloudagent/security" //log "k8s.io/klog" ) diff --git a/services/security/certificate/certificate.go b/services/security/certificate/certificate.go index 56c28f7..2f27eed 100644 --- a/services/security/certificate/certificate.go +++ b/services/security/certificate/certificate.go @@ -4,10 +4,10 @@ package certificate import ( - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" ) func getCertificate(cert *wssdcloudsecurity.Certificate) *security.Certificate { diff --git a/services/security/certificate/client.go b/services/security/certificate/client.go index e39358d..a807d80 100644 --- a/services/security/certificate/client.go +++ b/services/security/certificate/client.go @@ -5,8 +5,8 @@ package certificate import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/security/certificate/wssd.go b/services/security/certificate/wssd.go index 872c883..7134cea 100644 --- a/services/security/certificate/wssd.go +++ b/services/security/certificate/wssd.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" log "k8s.io/klog" ) diff --git a/services/security/identity/client.go b/services/security/identity/client.go index e9ed822..eeb78b8 100644 --- a/services/security/identity/client.go +++ b/services/security/identity/client.go @@ -6,8 +6,8 @@ package identity import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/security/identity/identity.go b/services/security/identity/identity.go index 99f10e2..2a7e7cd 100644 --- a/services/security/identity/identity.go +++ b/services/security/identity/identity.go @@ -6,9 +6,9 @@ package identity import ( "github.com/microsoft/moc-sdk-for-go/services/security" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" ) func getIdentity(id *wssdcloudsecurity.Identity) *security.Identity { diff --git a/services/security/identity/wssd.go b/services/security/identity/wssd.go index d2f3b6a..7b87dd1 100644 --- a/services/security/identity/wssd.go +++ b/services/security/identity/wssd.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" log "k8s.io/klog" ) diff --git a/services/security/keyvault/client.go b/services/security/keyvault/client.go index c7aa22a..9c44943 100644 --- a/services/security/keyvault/client.go +++ b/services/security/keyvault/client.go @@ -5,8 +5,8 @@ package keyvault import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/security/keyvault/key/client.go b/services/security/keyvault/key/client.go index ca99d04..19349f3 100644 --- a/services/security/keyvault/key/client.go +++ b/services/security/keyvault/key/client.go @@ -5,9 +5,9 @@ package key import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" + "github.com/microsoft/moc/pkg/auth" ) // Service interface @@ -38,8 +38,8 @@ func NewKeyClient(cloudFQDN string, authorizer auth.Authorizer) (*KeyClient, err } // Get methods invokes the client Get method -func (c *KeyClient) Get(ctx context.Context, group, name, vaultName string) (*[]keyvault.Key, error) { - return c.internal.Get(ctx, group, name, vaultName) +func (c *KeyClient) Get(ctx context.Context, group, vaultName, name string) (*[]keyvault.Key, error) { + return c.internal.Get(ctx, group, vaultName, name) } // CreateOrUpdate methods invokes create or update on the client @@ -49,26 +49,26 @@ func (c *KeyClient) CreateOrUpdate(ctx context.Context, group, vaultName, name s } // Delete methods invokes delete of the keyvault resource -func (c *KeyClient) Delete(ctx context.Context, group, name, vaultName string) error { +func (c *KeyClient) Delete(ctx context.Context, group, vaultName, name string) error { return c.internal.Delete(ctx, group, name, vaultName) } // Encrypt methods invokes encrypt of the keyvault resource func (c *KeyClient) Encrypt(ctx context.Context, group, vaultName, name string, parameters *keyvault.KeyOperationsParameters) (result *keyvault.KeyOperationResult, err error) { - return c.internal.Encrypt(ctx, group, name, vaultName, parameters) + return c.internal.Encrypt(ctx, group, vaultName, name, parameters) } // Decrypt methods invokes encrypt of the keyvault resource func (c *KeyClient) Decrypt(ctx context.Context, group, vaultName, name string, parameters *keyvault.KeyOperationsParameters) (result *keyvault.KeyOperationResult, err error) { - return c.internal.Decrypt(ctx, group, name, vaultName, parameters) + return c.internal.Decrypt(ctx, group, vaultName, name, parameters) } // WrapKey func (c *KeyClient) WrapKey(ctx context.Context, group, vaultName, name string, parameters *keyvault.KeyOperationsParameters) (result *keyvault.KeyOperationResult, err error) { - return c.internal.WrapKey(ctx, group, name, vaultName, parameters) + return c.internal.WrapKey(ctx, group, vaultName, name, parameters) } // UnwrapKey func (c *KeyClient) UnwrapKey(ctx context.Context, group, vaultName, name string, parameters *keyvault.KeyOperationsParameters) (result *keyvault.KeyOperationResult, err error) { - return c.internal.UnwrapKey(ctx, group, name, vaultName, parameters) + return c.internal.UnwrapKey(ctx, group, vaultName, name, parameters) } diff --git a/services/security/keyvault/key/key.go b/services/security/keyvault/key/key.go index 94a7642..33a8f83 100644 --- a/services/security/keyvault/key/key.go +++ b/services/security/keyvault/key/key.go @@ -4,13 +4,14 @@ package key import ( + "encoding/pem" "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" - "github.com/microsoft/moc-proto/pkg/convert" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" + "github.com/microsoft/moc/pkg/convert" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) func getKey(sec *wssdcloudsecurity.Key, vaultName string) (keyvault.Key, error) { @@ -18,11 +19,23 @@ func getKey(sec *wssdcloudsecurity.Key, vaultName string) (keyvault.Key, error) if err != nil { return keyvault.Key{}, errors.Wrapf(err, "INVESTIAGE") } - + value := "" + switch sec.Type { + case wssdcloudcommon.JsonWebKeyType_RSA: + fallthrough + case wssdcloudcommon.JsonWebKeyType_RSA_HSM: + pubBlk := pem.Block{ + Type: "RSA PUBLIC KEY", + Headers: nil, + Bytes: sec.PublicKey, + } + value = string(pem.EncodeToMemory(&pubBlk)) + } return keyvault.Key{ ID: &sec.Id, Name: &sec.Name, Version: &sec.Status.Version.Number, + Value: &value, KeyProperties: &keyvault.KeyProperties{ Statuses: status.GetStatuses(sec.GetStatus()), KeyType: getKeyType(sec.Type), @@ -31,29 +44,39 @@ func getKey(sec *wssdcloudsecurity.Key, vaultName string) (keyvault.Key, error) }, nil } +func getWssdKeyByVaultName(name string, groupName, + vaultName string, opType wssdcloudcommon.Operation) (*wssdcloudsecurity.Key, error) { + key := &wssdcloudsecurity.Key{ + Name: name, + VaultName: vaultName, + GroupName: groupName, + Type: wssdcloudcommon.JsonWebKeyType_EC, + Size: wssdcloudcommon.KeySize_K_UNKNOWN, + KeyOps: []wssdcloudcommon.KeyOperation{}, + Status: status.InitStatus(), + } + + // No Update support + return key, nil +} + func getWssdKey(name string, sec *keyvault.Key, groupName, vaultName string, opType wssdcloudcommon.Operation) (*wssdcloudsecurity.Key, error) { - keysize, err := getMOCKeySize(*sec.KeySize) if err != nil { return nil, err } - keyops, err := getMOCKeyOperations(sec.KeyOps) - if err != nil { - return nil, err - } key := &wssdcloudsecurity.Key{ Name: name, VaultName: vaultName, GroupName: groupName, Type: getMOCKeyType(sec.KeyType), Size: keysize, - KeyOps: keyops, + KeyOps: []wssdcloudcommon.KeyOperation{}, Status: status.InitStatus(), } // No Update support - return key, nil } @@ -69,6 +92,8 @@ func getMOCKeyType(ktype keyvault.JSONWebKeyType) wssdcloudcommon.JsonWebKeyType return wssdcloudcommon.JsonWebKeyType_RSA case keyvault.RSAHSM: return wssdcloudcommon.JsonWebKeyType_RSA_HSM + case keyvault.AES: + return wssdcloudcommon.JsonWebKeyType_AES default: return wssdcloudcommon.JsonWebKeyType_EC } @@ -86,6 +111,8 @@ func getKeyType(ktype wssdcloudcommon.JsonWebKeyType) keyvault.JSONWebKeyType { return keyvault.RSA case wssdcloudcommon.JsonWebKeyType_RSA_HSM: return keyvault.RSAHSM + case wssdcloudcommon.JsonWebKeyType_AES: + return keyvault.AES default: return keyvault.EC } @@ -204,3 +231,17 @@ func getMOCAlgorithm(algo keyvault.JSONWebKeyEncryptionAlgorithm) (wssdcloudcomm } return wssdcloudcommon.Algorithm_A_UNKNOWN, errors.Wrapf(errors.InvalidInput, "Invalid Algorithm [%s]", algo) } + +func GetMOCAlgorithmType(algo string) (keyvault.JSONWebKeyEncryptionAlgorithm, error) { + switch algo { + case "RSA1_5": + return keyvault.RSA15, nil + case "RSA-OAEP": + return keyvault.RSAOAEP, nil + case "RSA-OAEP-256": + return keyvault.RSAOAEP256, nil + case "A-256-KW": + return keyvault.A256KW, nil + } + return keyvault.RSA15, errors.Wrapf(errors.InvalidInput, "Invalid Algorithm [%s]", algo) +} diff --git a/services/security/keyvault/key/wssd.go b/services/security/keyvault/key/wssd.go index c640a7c..29c8719 100644 --- a/services/security/keyvault/key/wssd.go +++ b/services/security/keyvault/key/wssd.go @@ -8,11 +8,11 @@ import ( "fmt" "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { @@ -30,7 +30,7 @@ func newKeyClient(subID string, authorizer auth.Authorizer) (*client, error) { // Get func (c *client) Get(ctx context.Context, group, vaultName, name string) (*[]keyvault.Key, error) { - request, err := getKeyRequest(wssdcloudcommon.Operation_GET, group, vaultName, name, nil) + request, err := getKeyRequestByVaultName(wssdcloudcommon.Operation_GET, group, vaultName, name) if err != nil { return nil, err } @@ -43,7 +43,7 @@ func (c *client) Get(ctx context.Context, group, vaultName, name string) (*[]key // get func (c *client) get(ctx context.Context, group, vaultName, name string) ([]*wssdcloudsecurity.Key, error) { - request, err := getKeyRequest(wssdcloudcommon.Operation_GET, group, vaultName, name, nil) + request, err := getKeyRequestByVaultName(wssdcloudcommon.Operation_GET, group, vaultName, name) if err != nil { return nil, err } @@ -59,11 +59,13 @@ func (c *client) get(ctx context.Context, group, vaultName, name string) ([]*wss // CreateOrUpdate func (c *client) CreateOrUpdate(ctx context.Context, group, vaultName, name string, param *keyvault.Key) (*keyvault.Key, error) { - err := c.validate(ctx, group, vaultName, name, param) if err != nil { return nil, err } + if param.KeySize == nil { + return nil, errors.Wrapf(errors.InvalidInput, "Invalid KeySize - Missing") + } request, err := getKeyRequest(wssdcloudcommon.Operation_POST, group, vaultName, name, param) if err != nil { return nil, err @@ -81,7 +83,6 @@ func (c *client) CreateOrUpdate(ctx context.Context, group, vaultName, name stri if len(*sec) == 0 { return nil, fmt.Errorf("[Key][Create] Unexpected error: Creating a key returned no result") } - return &((*sec)[0]), err } @@ -89,9 +90,6 @@ func (c *client) validate(ctx context.Context, group, vaultName, name string, pa if param == nil { return errors.Wrapf(errors.InvalidInput, "Invalid Configuration") } - if len(vaultName) == 0 { - return errors.Wrapf(errors.InvalidInput, "Missing Vault Name") - } if len(vaultName) == 0 { errors.Wrapf(errors.InvalidInput, "Keyvault name is missing") @@ -99,9 +97,6 @@ func (c *client) validate(ctx context.Context, group, vaultName, name string, pa if len(name) == 0 { errors.Wrapf(errors.InvalidInput, "Keyvault name is missing") } - if param.KeySize == nil { - errors.Wrapf(errors.InvalidInput, "Invalid KeySize - Missing") - } return nil } @@ -189,12 +184,24 @@ func getKeysFromResponse(response *wssdcloudsecurity.KeyResponse, vaultName stri return &tmp, nil } +func getKeyRequestByVaultName(opType wssdcloudcommon.Operation, groupName, vaultName, name string) (*wssdcloudsecurity.KeyRequest, error) { + request := &wssdcloudsecurity.KeyRequest{ + OperationType: opType, + Keys: []*wssdcloudsecurity.Key{}, + } + key, err := getWssdKeyByVaultName(name, groupName, vaultName, opType) + if err != nil { + return nil, err + } + request.Keys = append(request.Keys, key) + return request, nil +} + func getKeyRequest(opType wssdcloudcommon.Operation, groupName, vaultName, name string, param *keyvault.Key) (*wssdcloudsecurity.KeyRequest, error) { request := &wssdcloudsecurity.KeyRequest{ OperationType: opType, Keys: []*wssdcloudsecurity.Key{}, } - key, err := getWssdKey(name, param, groupName, vaultName, opType) if err != nil { return nil, err diff --git a/services/security/keyvault/keyvault.go b/services/security/keyvault/keyvault.go index f8633c3..aaebd3b 100644 --- a/services/security/keyvault/keyvault.go +++ b/services/security/keyvault/keyvault.go @@ -7,10 +7,10 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/date" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" ) type SecretProperties struct { @@ -57,6 +57,8 @@ const ( RSA JSONWebKeyType = "RSA" // RSAHSM RSA with a private key which is not exportable from the HSM. RSAHSM JSONWebKeyType = "RSA-HSM" + // AES Advanced Encrytion Standard. + AES JSONWebKeyType = "AES" ) // JSONWebKeyCurveName enumerates the values for json web key curve name. @@ -77,7 +79,7 @@ const ( type KeyProperties struct { // Exportable - Indicates if the private key can be exported. Exportable *bool `json:"exportable,omitempty"` - // KeyType - The type of key pair to be used for the certificate. Possible values include: 'EC', 'ECHSM', 'RSA', 'RSAHSM', 'Oct' + // KeyType - The type of key pair to be used for the certificate. Possible values include: 'EC', 'ECHSM', 'RSA', 'RSAHSM', 'Oct', 'AES' KeyType JSONWebKeyType `json:"kty,omitempty"` KeyOps *[]JSONWebKeyOperation `json:"key_ops,omitempty"` // KeySize - The key size in bits. For example: 2048, 3072, or 4096 for RSA. diff --git a/services/security/keyvault/secret/client.go b/services/security/keyvault/secret/client.go index f521ff5..4a98012 100644 --- a/services/security/keyvault/secret/client.go +++ b/services/security/keyvault/secret/client.go @@ -5,9 +5,9 @@ package secret import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/security" "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/security/keyvault/secret/secret.go b/services/security/keyvault/secret/secret.go index 63264f4..399e28f 100644 --- a/services/security/keyvault/secret/secret.go +++ b/services/security/keyvault/secret/secret.go @@ -6,10 +6,10 @@ package secret import ( "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) func getSecret(sec *wssdcloudsecurity.Secret, vaultName string) *keyvault.Secret { diff --git a/services/security/keyvault/secret/wssd.go b/services/security/keyvault/secret/wssd.go index 3f1c745..29e7866 100644 --- a/services/security/keyvault/secret/wssd.go +++ b/services/security/keyvault/secret/wssd.go @@ -8,11 +8,11 @@ import ( "fmt" "github.com/microsoft/moc-sdk-for-go/services/security/keyvault" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/security/keyvault/wssd.go b/services/security/keyvault/wssd.go index 4eb4ef5..b8a0f34 100644 --- a/services/security/keyvault/wssd.go +++ b/services/security/keyvault/wssd.go @@ -6,12 +6,12 @@ package keyvault import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudsecurity "github.com/microsoft/moc-proto/rpc/cloudagent/security" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/security" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudsecurity "github.com/microsoft/moc/rpc/cloudagent/security" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/storage/container/client.go b/services/storage/container/client.go index a75c0e8..c36110a 100644 --- a/services/storage/container/client.go +++ b/services/storage/container/client.go @@ -5,8 +5,8 @@ package container import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" "github.com/microsoft/moc-sdk-for-go/services/storage" + "github.com/microsoft/moc/pkg/auth" ) // Service interface diff --git a/services/storage/container/container.go b/services/storage/container/container.go index a8b6bdf..dbe0f65 100644 --- a/services/storage/container/container.go +++ b/services/storage/container/container.go @@ -5,9 +5,9 @@ package container import ( "github.com/microsoft/moc-sdk-for-go/services/storage" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudstorage "github.com/microsoft/moc-proto/rpc/cloudagent/storage" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudstorage "github.com/microsoft/moc/rpc/cloudagent/storage" ) // Conversion functions from storage to wssdcloudstorage diff --git a/services/storage/container/wssd.go b/services/storage/container/wssd.go index 7ee802d..a188cfe 100644 --- a/services/storage/container/wssd.go +++ b/services/storage/container/wssd.go @@ -6,12 +6,12 @@ package container import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudstorage "github.com/microsoft/moc-proto/rpc/cloudagent/storage" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/storage" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudstorage "github.com/microsoft/moc/rpc/cloudagent/storage" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { diff --git a/services/storage/virtualharddisk/client.go b/services/storage/virtualharddisk/client.go index e64154f..b0534bd 100644 --- a/services/storage/virtualharddisk/client.go +++ b/services/storage/virtualharddisk/client.go @@ -5,9 +5,9 @@ package virtualharddisk import ( "context" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" "github.com/microsoft/moc-sdk-for-go/services/storage" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" ) // Service interface diff --git a/services/storage/virtualharddisk/virtualharddisk.go b/services/storage/virtualharddisk/virtualharddisk.go index 3709498..f1bdd00 100644 --- a/services/storage/virtualharddisk/virtualharddisk.go +++ b/services/storage/virtualharddisk/virtualharddisk.go @@ -5,9 +5,9 @@ package virtualharddisk import ( "github.com/microsoft/moc-sdk-for-go/services/storage" - "github.com/microsoft/moc-proto/pkg/errors" - "github.com/microsoft/moc-proto/pkg/status" - wssdcloudstorage "github.com/microsoft/moc-proto/rpc/cloudagent/storage" + "github.com/microsoft/moc/pkg/errors" + "github.com/microsoft/moc/pkg/status" + wssdcloudstorage "github.com/microsoft/moc/rpc/cloudagent/storage" ) // Conversion functions from storage to wssdcloudstorage diff --git a/services/storage/virtualharddisk/wssd.go b/services/storage/virtualharddisk/wssd.go index 96c7934..ba166cb 100644 --- a/services/storage/virtualharddisk/wssd.go +++ b/services/storage/virtualharddisk/wssd.go @@ -6,12 +6,12 @@ package virtualharddisk import ( "context" "fmt" - "github.com/microsoft/moc-proto/pkg/auth" - "github.com/microsoft/moc-proto/pkg/errors" - wssdcloudstorage "github.com/microsoft/moc-proto/rpc/cloudagent/storage" - wssdcloudcommon "github.com/microsoft/moc-proto/rpc/common" wssdcloudclient "github.com/microsoft/moc-sdk-for-go/pkg/client" "github.com/microsoft/moc-sdk-for-go/services/storage" + "github.com/microsoft/moc/pkg/auth" + "github.com/microsoft/moc/pkg/errors" + wssdcloudstorage "github.com/microsoft/moc/rpc/cloudagent/storage" + wssdcloudcommon "github.com/microsoft/moc/rpc/common" ) type client struct { From 1d9b98b56b0535efc598042d3bd0bbe41a4c6f6a Mon Sep 17 00:00:00 2001 From: Madhan Raj Mookkandy Date: Tue, 8 Sep 2020 13:05:19 -0700 Subject: [PATCH 2/2] Vendor --- go.mod | 2 +- go.sum | 98 ++++------------------------------------------------------ 2 files changed, 7 insertions(+), 93 deletions(-) diff --git a/go.mod b/go.mod index 83e5963..3a52cb6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/go-autorest/autorest v0.9.0 github.com/Azure/go-autorest/autorest/date v0.2.0 github.com/golang/protobuf v1.3.3 // indirect - github.com/microsoft/moc-proto v0.1.0-alpha.1 + github.com/microsoft/moc v0.10.1-alpha.2 github.com/satori/go.uuid v1.2.0 github.com/spf13/viper v1.6.2 google.golang.org/grpc v1.27.1 diff --git a/go.sum b/go.sum index 10387f6..eabf190 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,4 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -contrib.go.opencensus.io/exporter/jaeger v0.2.0 h1:nhTv/Ry3lGmqbJ/JGvCjWxBl5ozRfqo86Ngz59UAlfk= -contrib.go.opencensus.io/exporter/jaeger v0.2.0/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= @@ -18,40 +15,28 @@ github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VY github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/KnicKnic/go-windows v0.0.3-0.20200421223124-91aad71334c6/go.mod h1:bq9qyrkvAvMH2HPlkix2bE/eDuRz1kzwyoV/ieVhqK0= -github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/license-bill-of-materials v0.0.0-20190913234955-13baff47494e/go.mod h1:4xMOusJ7xxc84WclVxKT8+lNfGYDwojOUC2OQNCwcj4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -59,17 +44,12 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= @@ -80,34 +60,21 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -118,54 +85,34 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/microsoft/moc v0.8.5 h1:j1tHRyxsadd87djmWFiB4m4AxYlkmoGkDBAuc2ppYaQ= -github.com/microsoft/moc v0.8.5/go.mod h1:u3pjIIl0Xl35cgc5ImC+BTY1F3x6BHi/KuFjCSV01cw= -github.com/microsoft/moc-proto v0.1.0-alpha.1 h1:s0yLgi1+S9BD1VmJij1OBtjcDgY1BiRRCwMBaA6qUic= -github.com/microsoft/moc-proto v0.1.0-alpha.1/go.mod h1:yWVgOMrRBrva/ZLbPp3Jc1KXM5kLjVahFtdTSFgggU0= -github.com/microsoft/wmi v0.2.3/go.mod h1:dCXZgJVjwILNv4HD6VOM356/Yh5MTi393MUbYpUhrHA= -github.com/microsoft/wmi v0.2.8/go.mod h1:dCXZgJVjwILNv4HD6VOM356/Yh5MTi393MUbYpUhrHA= +github.com/microsoft/moc v0.10.1-alpha.2 h1:LQaxvX00vcNafq0TIXibOLHByybo3T+Olo8g9DAAlxg= +github.com/microsoft/moc v0.10.1-alpha.2/go.mod h1:FXDFQa7/tOXZBMSWpVnzVahSpCDVgdSkEdz9rOmT3G0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nwoodmsft/iso9660 v0.0.0-20191211094520-15de0aa41e99/go.mod h1:oIuE6nqRO03jsO5LH16blMV11a3d2WF4mh8jZ19/g2A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -176,10 +123,8 @@ github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= @@ -187,55 +132,40 @@ github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfD github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v3.3.18+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200320181102-891825fb96df/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -244,45 +174,31 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a h1:i47hUS795cOydZI4AwJQCKXOr4BvxzvikwDoDtHhP2Y= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -291,7 +207,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -308,4 +223,3 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=