mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-19 03:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76 from ceph/devel

Browse Source 
Sync devel branch with uptream
This commit is contained in:
OpenShift Merge Robot 2022-02-09 02:33:11 -05:00 committed by GitHub
commit 7f59f9999d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 801 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -4,7 +4,7 @@ go 1.17
require (
github.com/IBM/keyprotect-go-client v0.7.0
github.com/aws/aws-sdk-go v1.42.40
github.com/aws/aws-sdk-go v1.42.48
github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000
github.com/ceph/go-ceph v0.13.0
github.com/container-storage-interface/spec v1.5.0
@ -24,7 +24,7 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
google.golang.org/grpc v1.43.0
google.golang.org/grpc v1.44.0
google.golang.org/protobuf v1.27.1
k8s.io/api v0.23.2
k8s.io/apimachinery v0.23.2

8
go.sum
View File

@ -138,8 +138,8 @@ github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.42.40 h1:oZ+hyhorrkYdT23YO8s0eWBp9Fg8k4HsAFL3n0V25WA=
github.com/aws/aws-sdk-go v1.42.40/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
github.com/aws/aws-sdk-go v1.42.48 h1:8ZVBAsA9X2eCpSr/8SrWDk4BOT91wRdqxpAog875+K0=
github.com/aws/aws-sdk-go v1.42.48/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@ -1618,8 +1618,8 @@ google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=

10
internal/cephfs/controllerserver.go
View File

@ -779,10 +779,10 @@ func (cs *ControllerServer) DeleteSnapshot(
// success as deletion is complete
return &csi.DeleteSnapshotResponse{}, nil
case errors.Is(err, cerrors.ErrSnapNotFound):
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.FsSnapshotName, cr)
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.RequestName, cr)
if err != nil {
log.ErrorLog(ctx, "failed to remove reservation for snapname (%s) with backing snap (%s) (%s)",
sid.FsSubvolName, sid.FsSnapshotName, err)
sid.RequestName, sid.FsSnapshotName, err)
return nil, status.Error(codes.Internal, err.Error())
}
@ -792,10 +792,10 @@ func (cs *ControllerServer) DeleteSnapshot(
// if the error is ErrVolumeNotFound, the subvolume is already deleted
// from backend, Hence undo the omap entries and return success
log.ErrorLog(ctx, "Volume not present")
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.FsSnapshotName, cr)
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.RequestName, cr)
if err != nil {
log.ErrorLog(ctx, "failed to remove reservation for snapname (%s) with backing snap (%s) (%s)",
sid.FsSubvolName, sid.FsSnapshotName, err)
sid.RequestName, sid.FsSnapshotName, err)
return nil, status.Error(codes.Internal, err.Error())
}
@ -829,7 +829,7 @@ func (cs *ControllerServer) DeleteSnapshot(
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.FsSnapshotName, cr)
err = core.UndoSnapReservation(ctx, volOpt, *sid, sid.RequestName, cr)
if err != nil {
log.ErrorLog(ctx, "failed to remove reservation for snapname (%s) with backing snap (%s) (%s)",
sid.RequestName, sid.FsSnapshotName, err)

17
internal/kms/keyprotect.go
View File

@ -23,7 +23,6 @@ import (
"fmt"
"github.com/ceph/ceph-csi/internal/util/k8s"
"github.com/ceph/ceph-csi/internal/util/log"
kp "github.com/IBM/keyprotect-go-client"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -31,7 +30,6 @@ import (
const (
kmsTypeKeyProtectMetadata = "ibmkeyprotect"
kmsTypeKeyProtectMetadataOld = "kp-metadata"
// keyProtectMetadataDefaultSecretsName is the default name of the Kubernetes Secret
// that contains the credentials to access the Key Protect KMS. The name of
// the Secret can be configured by setting the `IBM_KP_SECRET_NAME`
@ -63,21 +61,6 @@ var _ = RegisterProvider(Provider{
Initializer: initKeyProtectKMS,
})
// RegisterProvider for kmsTypeKeyProtectMetadataOld is kept here for backward compatibility.
var _ = RegisterProvider(Provider{
UniqueID: kmsTypeKeyProtectMetadataOld,
Initializer: initKeyProtectKMSOld,
})
// initKeyProtectKMSOld is the wrapper with a warning log.
func initKeyProtectKMSOld(args ProviderInitArgs) (EncryptionKMS, error) {
log.WarningLogMsg("%q is deprecated provider for IBM key Protect,"+
"use new provider name %q in the configuration, proceeding with %q",
kmsTypeKeyProtectMetadataOld, kmsTypeKeyProtectMetadata, kmsTypeKeyProtectMetadata)
return initKeyProtectKMS(args)
}
// KeyProtectKMS store the KMS connection information retrieved from the kms configmap.
type keyProtectKMS struct {
// basic options to get the secret

159
vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go generated vendored
View File

@ -4888,6 +4888,9 @@ var awsPartition = partition{
},
"connect": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "af-south-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
@ -7121,6 +7124,15 @@ var awsPartition = partition{
}: endpoint{
Hostname: "elasticfilesystem-fips.ap-southeast-2.amazonaws.com",
},
endpointKey{
Region: "ap-southeast-3",
}: endpoint{},
endpointKey{
Region: "ap-southeast-3",
Variant: fipsVariant,
}: endpoint{
Hostname: "elasticfilesystem-fips.ap-southeast-3.amazonaws.com",
},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
@ -7256,6 +7268,15 @@ var awsPartition = partition{
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-ap-southeast-3",
}: endpoint{
Hostname: "elasticfilesystem-fips.ap-southeast-3.amazonaws.com",
CredentialScope: credentialScope{
Region: "ap-southeast-3",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-ca-central-1",
}: endpoint{
@ -9659,6 +9680,9 @@ var awsPartition = partition{
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
@ -10808,6 +10832,9 @@ var awsPartition = partition{
},
"kafka": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "af-south-1",
}: endpoint{},
endpointKey{
Region: "ap-east-1",
}: endpoint{},
@ -10817,6 +10844,9 @@ var awsPartition = partition{
endpointKey{
Region: "ap-northeast-2",
}: endpoint{},
endpointKey{
Region: "ap-northeast-3",
}: endpoint{},
endpointKey{
Region: "ap-south-1",
}: endpoint{},
@ -17560,6 +17590,21 @@ var awsPartition = partition{
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "secretsmanager-fips.ca-central-1.amazonaws.com",
},
endpointKey{
Region: "ca-central-1-fips",
}: endpoint{
Hostname: "secretsmanager-fips.ca-central-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "ca-central-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
@ -20060,6 +20105,76 @@ var awsPartition = partition{
},
},
},
"synthetics": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "af-south-1",
}: endpoint{},
endpointKey{
Region: "ap-east-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
endpointKey{
Region: "ap-northeast-2",
}: endpoint{},
endpointKey{
Region: "ap-northeast-3",
}: endpoint{},
endpointKey{
Region: "ap-south-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ap-southeast-3",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
endpointKey{
Region: "eu-north-1",
}: endpoint{},
endpointKey{
Region: "eu-south-1",
}: endpoint{},
endpointKey{
Region: "eu-west-1",
}: endpoint{},
endpointKey{
Region: "eu-west-2",
}: endpoint{},
endpointKey{
Region: "eu-west-3",
}: endpoint{},
endpointKey{
Region: "me-south-1",
}: endpoint{},
endpointKey{
Region: "sa-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
endpointKey{
Region: "us-east-2",
}: endpoint{},
endpointKey{
Region: "us-west-1",
}: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
},
},
"tagging": service{
Endpoints: serviceEndpoints{
endpointKey{
@ -22057,6 +22172,16 @@ var awscnPartition = partition{
}: endpoint{},
},
},
"codepipeline": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "cn-north-1",
}: endpoint{},
endpointKey{
Region: "cn-northwest-1",
}: endpoint{},
},
},
"cognito-identity": service{
Endpoints: serviceEndpoints{
endpointKey{
@ -23120,6 +23245,16 @@ var awscnPartition = partition{
}: endpoint{},
},
},
"synthetics": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "cn-north-1",
}: endpoint{},
endpointKey{
Region: "cn-northwest-1",
}: endpoint{},
},
},
"tagging": service{
Endpoints: serviceEndpoints{
endpointKey{
@ -27514,6 +27649,16 @@ var awsusgovPartition = partition{
},
},
},
"synthetics": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "us-gov-east-1",
}: endpoint{},
endpointKey{
Region: "us-gov-west-1",
}: endpoint{},
},
},
"tagging": service{
Endpoints: serviceEndpoints{
endpointKey{
@ -28498,6 +28643,13 @@ var awsisoPartition = partition{
}: endpoint{},
},
},
"synthetics": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "us-iso-east-1",
}: endpoint{},
},
},
"transcribe": service{
Defaults: endpointDefaults{
defaultKey{}: endpoint{
@ -29008,6 +29160,13 @@ var awsisobPartition = partition{
}: endpoint{},
},
},
"synthetics": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "us-isob-east-1",
}: endpoint{},
},
},
"tagging": service{
Endpoints: serviceEndpoints{
endpointKey{

9
vendor/github.com/aws/aws-sdk-go/aws/request/request.go generated vendored
View File

@ -4,6 +4,7 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"reflect"
@ -525,6 +526,14 @@ func (r *Request) GetBody() io.ReadSeeker {
// Send will not close the request.Request's body.
func (r *Request) Send() error {
defer func() {
// Ensure a non-nil HTTPResponse parameter is set to ensure handlers
// checking for HTTPResponse values, don't fail.
if r.HTTPResponse == nil {
r.HTTPResponse = &http.Response{
Header: http.Header{},
Body: ioutil.NopCloser(&bytes.Buffer{}),
}
}
// Regardless of success or failure of the request trigger the Complete
// request handlers.
r.Handlers.Complete.Run(r)

2
vendor/github.com/aws/aws-sdk-go/aws/version.go generated vendored
View File

@ -5,4 +5,4 @@ package aws
const SDKName = "aws-sdk-go"
// SDKVersion is the version of this SDK
const SDKVersion = "1.42.40"
const SDKVersion = "1.42.48"

576
vendor/github.com/aws/aws-sdk-go/service/ec2/api.go generated vendored
View File

@ -5039,6 +5039,12 @@ func (c *EC2) CreateImageRequest(input *CreateImageInput) (req *request.Request,
// Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance that
// is either running or stopped.
//
// By default, Amazon EC2 shuts down and reboots the instance before creating
// the AMI to ensure that everything on the instance is stopped and in a consistent
// state during the creation process. If you're confident that your instance
// is in a consistent state appropriate for AMI creation, use the NoReboot parameter
// to prevent Amazon EC2 from shutting down and rebooting the instance.
//
// If you customized your instance with instance store volumes or Amazon EBS
// volumes in addition to the root device volume, the new AMI contains block
// device mapping information for those volumes. When you launch an instance
@ -14806,9 +14812,16 @@ func (c *EC2) DeregisterImageRequest(input *DeregisterImageInput) (req *request.
// DeregisterImage API operation for Amazon Elastic Compute Cloud.
//
// Deregisters the specified AMI. After you deregister an AMI, it can't be used
// to launch new instances; however, it doesn't affect any instances that you've
// already launched from the AMI. You'll continue to incur usage costs for those
// instances until you terminate them.
// to launch new instances.
//
// If you deregister an AMI that matches a Recycle Bin retention rule, the AMI
// is retained in the Recycle Bin for the specified retention period. For more
// information, see Recycle Bin (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html)
// in the Amazon Elastic Compute Cloud User Guide.
//
// When you deregister an AMI, it doesn't affect any instances that you've already
// launched from the AMI. You'll continue to incur usage costs for those instances
// until you terminate them.
//
// When you deregister an Amazon EBS-backed AMI, it doesn't affect the snapshot
// that was created for the root volume of the instance during the AMI creation
@ -31680,6 +31693,8 @@ func (c *EC2) DisableFastLaunchRequest(input *DisableFastLaunchInput) (req *requ
// process for each instance. All pre-provisioned snapshots must be removed
// before you can enable faster launching again.
//
// To change these settings, you must own the AMI.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@ -33323,6 +33338,8 @@ func (c *EC2) EnableFastLaunchRequest(input *EnableFastLaunchInput) (req *reques
// used for subsequent launches. The reserved snapshots are automatically replenished
// as they are used, depending on your settings for launch frequency.
//
// To change these settings, you must own the AMI.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@ -38420,6 +38437,140 @@ func (c *EC2) ImportVolumeWithContext(ctx aws.Context, input *ImportVolumeInput,
return out, req.Send()
}
const opListImagesInRecycleBin = "ListImagesInRecycleBin"
// ListImagesInRecycleBinRequest generates a "aws/request.Request" representing the
// client's request for the ListImagesInRecycleBin operation. The "output" return
// value will be populated with the request's response once the request completes
// successfully.
//
// Use "Send" method on the returned Request to send the API call to the service.
// the "output" return value is not valid until after Send returns without error.
//
// See ListImagesInRecycleBin for more information on using the ListImagesInRecycleBin
// API call, and error handling.
//
// This method is useful when you want to inject custom logic or configuration
// into the SDK's request lifecycle. Such as custom headers, or retry logic.
//
//
// // Example sending a request using the ListImagesInRecycleBinRequest method.
// req, resp := client.ListImagesInRecycleBinRequest(params)
//
// err := req.Send()
// if err == nil { // resp is now filled
// fmt.Println(resp)
// }
//
// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ListImagesInRecycleBin
func (c *EC2) ListImagesInRecycleBinRequest(input *ListImagesInRecycleBinInput) (req *request.Request, output *ListImagesInRecycleBinOutput) {
op := &request.Operation{
Name: opListImagesInRecycleBin,
HTTPMethod: "POST",
HTTPPath: "/",
Paginator: &request.Paginator{
InputTokens: []string{"NextToken"},
OutputTokens: []string{"NextToken"},
LimitToken: "MaxResults",
TruncationToken: "",
},
}
if input == nil {
input = &ListImagesInRecycleBinInput{}
}
output = &ListImagesInRecycleBinOutput{}
req = c.newRequest(op, input, output)
return
}
// ListImagesInRecycleBin API operation for Amazon Elastic Compute Cloud.
//
// Lists one or more AMIs that are currently in the Recycle Bin. For more information,
// see Recycle Bin (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html)
// in the Amazon Elastic Compute Cloud User Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
//
// See the AWS API reference guide for Amazon Elastic Compute Cloud's
// API operation ListImagesInRecycleBin for usage and error information.
// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ListImagesInRecycleBin
func (c *EC2) ListImagesInRecycleBin(input *ListImagesInRecycleBinInput) (*ListImagesInRecycleBinOutput, error) {
req, out := c.ListImagesInRecycleBinRequest(input)
return out, req.Send()
}
// ListImagesInRecycleBinWithContext is the same as ListImagesInRecycleBin with the addition of
// the ability to pass a context and additional request options.
//
// See ListImagesInRecycleBin for details on how to use this API operation.
//
// The context must be non-nil and will be used for request cancellation. If
// the context is nil a panic will occur. In the future the SDK may create
// sub-contexts for http.Requests. See https://golang.org/pkg/context/
// for more information on using Contexts.
func (c *EC2) ListImagesInRecycleBinWithContext(ctx aws.Context, input *ListImagesInRecycleBinInput, opts ...request.Option) (*ListImagesInRecycleBinOutput, error) {
req, out := c.ListImagesInRecycleBinRequest(input)
req.SetContext(ctx)
req.ApplyOptions(opts...)
return out, req.Send()
}
// ListImagesInRecycleBinPages iterates over the pages of a ListImagesInRecycleBin operation,
// calling the "fn" function with the response data for each page. To stop
// iterating, return false from the fn function.
//
// See ListImagesInRecycleBin method for more information on how to use this operation.
//
// Note: This operation can generate multiple requests to a service.
//
// // Example iterating over at most 3 pages of a ListImagesInRecycleBin operation.
// pageNum := 0
// err := client.ListImagesInRecycleBinPages(params,
// func(page *ec2.ListImagesInRecycleBinOutput, lastPage bool) bool {
// pageNum++
// fmt.Println(page)
// return pageNum <= 3
// })
//
func (c *EC2) ListImagesInRecycleBinPages(input *ListImagesInRecycleBinInput, fn func(*ListImagesInRecycleBinOutput, bool) bool) error {
return c.ListImagesInRecycleBinPagesWithContext(aws.BackgroundContext(), input, fn)
}
// ListImagesInRecycleBinPagesWithContext same as ListImagesInRecycleBinPages except
// it takes a Context and allows setting request options on the pages.
//
// The context must be non-nil and will be used for request cancellation. If
// the context is nil a panic will occur. In the future the SDK may create
// sub-contexts for http.Requests. See https://golang.org/pkg/context/
// for more information on using Contexts.
func (c *EC2) ListImagesInRecycleBinPagesWithContext(ctx aws.Context, input *ListImagesInRecycleBinInput, fn func(*ListImagesInRecycleBinOutput, bool) bool, opts ...request.Option) error {
p := request.Pagination{
NewRequest: func() (*request.Request, error) {
var inCpy *ListImagesInRecycleBinInput
if input != nil {
tmp := *input
inCpy = &tmp
}
req, _ := c.ListImagesInRecycleBinRequest(inCpy)
req.SetContext(ctx)
req.ApplyOptions(opts...)
return req, nil
},
}
for p.Next() {
if !fn(p.Page().(*ListImagesInRecycleBinOutput), !p.HasNextPage()) {
break
}
}
return p.Err()
}
const opListSnapshotsInRecycleBin = "ListSnapshotsInRecycleBin"
// ListSnapshotsInRecycleBinRequest generates a "aws/request.Request" representing the
@ -46150,6 +46301,82 @@ func (c *EC2) RestoreAddressToClassicWithContext(ctx aws.Context, input *Restore
return out, req.Send()
}
const opRestoreImageFromRecycleBin = "RestoreImageFromRecycleBin"
// RestoreImageFromRecycleBinRequest generates a "aws/request.Request" representing the
// client's request for the RestoreImageFromRecycleBin operation. The "output" return
// value will be populated with the request's response once the request completes
// successfully.
//
// Use "Send" method on the returned Request to send the API call to the service.
// the "output" return value is not valid until after Send returns without error.
//
// See RestoreImageFromRecycleBin for more information on using the RestoreImageFromRecycleBin
// API call, and error handling.
//
// This method is useful when you want to inject custom logic or configuration
// into the SDK's request lifecycle. Such as custom headers, or retry logic.
//
//
// // Example sending a request using the RestoreImageFromRecycleBinRequest method.
// req, resp := client.RestoreImageFromRecycleBinRequest(params)
//
// err := req.Send()
// if err == nil { // resp is now filled
// fmt.Println(resp)
// }
//
// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RestoreImageFromRecycleBin
func (c *EC2) RestoreImageFromRecycleBinRequest(input *RestoreImageFromRecycleBinInput) (req *request.Request, output *RestoreImageFromRecycleBinOutput) {
op := &request.Operation{
Name: opRestoreImageFromRecycleBin,
HTTPMethod: "POST",
HTTPPath: "/",
}
if input == nil {
input = &RestoreImageFromRecycleBinInput{}
}
output = &RestoreImageFromRecycleBinOutput{}
req = c.newRequest(op, input, output)
return
}
// RestoreImageFromRecycleBin API operation for Amazon Elastic Compute Cloud.
//
// Restores an AMI from the Recycle Bin. For more information, see Recycle Bin
// (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html) in
// the Amazon Elastic Compute Cloud User Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
//
// See the AWS API reference guide for Amazon Elastic Compute Cloud's
// API operation RestoreImageFromRecycleBin for usage and error information.
// See also, https://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RestoreImageFromRecycleBin
func (c *EC2) RestoreImageFromRecycleBin(input *RestoreImageFromRecycleBinInput) (*RestoreImageFromRecycleBinOutput, error) {
req, out := c.RestoreImageFromRecycleBinRequest(input)
return out, req.Send()
}
// RestoreImageFromRecycleBinWithContext is the same as RestoreImageFromRecycleBin with the addition of
// the ability to pass a context and additional request options.
//
// See RestoreImageFromRecycleBin for details on how to use this API operation.
//
// The context must be non-nil and will be used for request cancellation. If
// the context is nil a panic will occur. In the future the SDK may create
// sub-contexts for http.Requests. See https://golang.org/pkg/context/
// for more information on using Contexts.
func (c *EC2) RestoreImageFromRecycleBinWithContext(ctx aws.Context, input *RestoreImageFromRecycleBinInput, opts ...request.Option) (*RestoreImageFromRecycleBinOutput, error) {
req, out := c.RestoreImageFromRecycleBinRequest(input)
req.SetContext(ctx)
req.ApplyOptions(opts...)
return out, req.Send()
}
const opRestoreManagedPrefixListVersion = "RestoreManagedPrefixListVersion"
// RestoreManagedPrefixListVersionRequest generates a "aws/request.Request" representing the
@ -57435,11 +57662,22 @@ func (s *ClientData) SetUploadStart(v time.Time) *ClientData {
return s
}
// Options for enabling a customizable text banner that will be displayed on
// Amazon Web Services provided clients when a VPN session is established.
type ClientLoginBannerOptions struct {
_ struct{} `type:"structure"`
// Customizable text that will be displayed in a banner on Amazon Web Services
// provided clients when a VPN session is established. UTF-8 encoded characters
// only. Maximum of 1400 characters.
BannerText *string `type:"string"`
// Enable or disable a customizable text banner that will be displayed on Amazon
// Web Services provided clients when a VPN session is established.
//
// Valid values: true | false
//
// Default value: false
Enabled *bool `type:"boolean"`
}
@ -57473,11 +57711,19 @@ func (s *ClientLoginBannerOptions) SetEnabled(v bool) *ClientLoginBannerOptions
return s
}
// Current state of options for customizable text banner that will be displayed
// on Amazon Web Services provided clients when a VPN session is established.
type ClientLoginBannerResponseOptions struct {
_ struct{} `type:"structure"`
// Customizable text that will be displayed in a banner on Amazon Web Services
// provided clients when a VPN session is established. UTF-8 encoded characters
// only. Maximum of 1400 characters.
BannerText *string `locationName:"bannerText" type:"string"`
// Current state of text banner feature.
//
// Valid values: true | false
Enabled *bool `locationName:"enabled" type:"boolean"`
}
@ -57890,6 +58136,8 @@ type ClientVpnEndpoint struct {
// The options for managing connection authorization for new client connections.
ClientConnectOptions *ClientConnectResponseOptions `locationName:"clientConnectOptions" type:"structure"`
// Options for enabling a customizable text banner that will be displayed on
// Amazon Web Services provided clients when a VPN session is established.
ClientLoginBannerOptions *ClientLoginBannerResponseOptions `locationName:"clientLoginBannerOptions" type:"structure"`
// The ID of the Client VPN endpoint.
@ -57923,6 +58171,11 @@ type ClientVpnEndpoint struct {
// The ARN of the server certificate.
ServerCertificateArn *string `locationName:"serverCertificateArn" type:"string"`
// The maximum VPN session duration time in hours.
//
// Valid values: 8 | 10 | 12 | 24
//
// Default value: 24
SessionTimeoutHours *int64 `locationName:"sessionTimeoutHours" type:"integer"`
// Indicates whether split-tunnel is enabled in the Client VPN endpoint.
@ -60195,6 +60448,8 @@ type CreateClientVpnEndpointInput struct {
// The options for managing connection authorization for new client connections.
ClientConnectOptions *ClientConnectOptions `type:"structure"`
// Options for enabling a customizable text banner that will be displayed on
// Amazon Web Services provided clients when a VPN session is established.
ClientLoginBannerOptions *ClientLoginBannerOptions `type:"structure"`
// Unique, case-sensitive identifier that you provide to ensure the idempotency
@ -60246,6 +60501,11 @@ type CreateClientVpnEndpointInput struct {
// ServerCertificateArn is a required field
ServerCertificateArn *string `type:"string" required:"true"`
// The maximum VPN session duration time in hours.
//
// Valid values: 8 | 10 | 12 | 24
//
// Default value: 24
SessionTimeoutHours *int64 `type:"integer"`
// Indicates whether split-tunnel is enabled on the Client VPN endpoint.
@ -100122,6 +100382,7 @@ type EnableFastLaunchInput struct {
LaunchTemplate *FastLaunchLaunchTemplateSpecificationRequest `type:"structure"`
// The maximum number of parallel instances to launch for creating resources.
// Value must be 6 or greater.
MaxParallelLaunches *int64 `type:"integer"`
// The type of resource to use for pre-provisioning the Windows AMI for faster
@ -110961,6 +111222,75 @@ func (s *ImageDiskContainer) SetUserBucket(v *UserBucket) *ImageDiskContainer {
return s
}
// Information about an AMI that is currently in the Recycle Bin.
type ImageRecycleBinInfo struct {
_ struct{} `type:"structure"`
// The description of the AMI.
Description *string `locationName:"description" type:"string"`
// The ID of the AMI.
ImageId *string `locationName:"imageId" type:"string"`
// The name of the AMI.
Name *string `locationName:"name" type:"string"`
// The date and time when the AMI entered the Recycle Bin.
RecycleBinEnterTime *time.Time `locationName:"recycleBinEnterTime" type:"timestamp"`
// The date and time when the AMI is to be permanently deleted from the Recycle
// Bin.
RecycleBinExitTime *time.Time `locationName:"recycleBinExitTime" type:"timestamp"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ImageRecycleBinInfo) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ImageRecycleBinInfo) GoString() string {
return s.String()
}
// SetDescription sets the Description field's value.
func (s *ImageRecycleBinInfo) SetDescription(v string) *ImageRecycleBinInfo {
s.Description = &v
return s
}
// SetImageId sets the ImageId field's value.
func (s *ImageRecycleBinInfo) SetImageId(v string) *ImageRecycleBinInfo {
s.ImageId = &v
return s
}
// SetName sets the Name field's value.
func (s *ImageRecycleBinInfo) SetName(v string) *ImageRecycleBinInfo {
s.Name = &v
return s
}
// SetRecycleBinEnterTime sets the RecycleBinEnterTime field's value.
func (s *ImageRecycleBinInfo) SetRecycleBinEnterTime(v time.Time) *ImageRecycleBinInfo {
s.RecycleBinEnterTime = &v
return s
}
// SetRecycleBinExitTime sets the RecycleBinExitTime field's value.
func (s *ImageRecycleBinInfo) SetRecycleBinExitTime(v time.Time) *ImageRecycleBinInfo {
s.RecycleBinExitTime = &v
return s
}
type ImportClientVpnClientCertificateRevocationListInput struct {
_ struct{} `type:"structure"`
@ -121820,6 +122150,126 @@ func (s *LicenseConfigurationRequest) SetLicenseConfigurationArn(v string) *Lice
return s
}
type ListImagesInRecycleBinInput struct {
_ struct{} `type:"structure"`
// Checks whether you have the required permissions for the action, without
// actually making the request, and provides an error response. If you have
// the required permissions, the error response is DryRunOperation. Otherwise,
// it is UnauthorizedOperation.
DryRun *bool `type:"boolean"`
// The IDs of the AMIs to list. Omit this parameter to list all of the AMIs
// that are in the Recycle Bin. You can specify up to 20 IDs in a single request.
ImageIds []*string `locationName:"ImageId" locationNameList:"ImageId" type:"list"`
// The maximum number of results to return with a single call. To retrieve the
// remaining results, make another call with the returned nextToken value.
//
// If you do not specify a value for MaxResults, the request returns 1,000 items
// per page by default. For more information, see Pagination (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination).
MaxResults *int64 `min:"1" type:"integer"`
// The token for the next page of results.
NextToken *string `type:"string"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ListImagesInRecycleBinInput) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ListImagesInRecycleBinInput) GoString() string {
return s.String()
}
// Validate inspects the fields of the type to determine if they are valid.
func (s *ListImagesInRecycleBinInput) Validate() error {
invalidParams := request.ErrInvalidParams{Context: "ListImagesInRecycleBinInput"}
if s.MaxResults != nil && *s.MaxResults < 1 {
invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1))
}
if invalidParams.Len() > 0 {
return invalidParams
}
return nil
}
// SetDryRun sets the DryRun field's value.
func (s *ListImagesInRecycleBinInput) SetDryRun(v bool) *ListImagesInRecycleBinInput {
s.DryRun = &v
return s
}
// SetImageIds sets the ImageIds field's value.
func (s *ListImagesInRecycleBinInput) SetImageIds(v []*string) *ListImagesInRecycleBinInput {
s.ImageIds = v
return s
}
// SetMaxResults sets the MaxResults field's value.
func (s *ListImagesInRecycleBinInput) SetMaxResults(v int64) *ListImagesInRecycleBinInput {
s.MaxResults = &v
return s
}
// SetNextToken sets the NextToken field's value.
func (s *ListImagesInRecycleBinInput) SetNextToken(v string) *ListImagesInRecycleBinInput {
s.NextToken = &v
return s
}
type ListImagesInRecycleBinOutput struct {
_ struct{} `type:"structure"`
// Information about the AMIs.
Images []*ImageRecycleBinInfo `locationName:"imageSet" locationNameList:"item" type:"list"`
// The token to use to retrieve the next page of results. This value is null
// when there are no more results to return.
NextToken *string `locationName:"nextToken" type:"string"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ListImagesInRecycleBinOutput) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s ListImagesInRecycleBinOutput) GoString() string {
return s.String()
}
// SetImages sets the Images field's value.
func (s *ListImagesInRecycleBinOutput) SetImages(v []*ImageRecycleBinInfo) *ListImagesInRecycleBinOutput {
s.Images = v
return s
}
// SetNextToken sets the NextToken field's value.
func (s *ListImagesInRecycleBinOutput) SetNextToken(v string) *ListImagesInRecycleBinOutput {
s.NextToken = &v
return s
}
type ListSnapshotsInRecycleBinInput struct {
_ struct{} `type:"structure"`
@ -123562,6 +124012,8 @@ type ModifyClientVpnEndpointInput struct {
// The options for managing connection authorization for new client connections.
ClientConnectOptions *ClientConnectOptions `type:"structure"`
// Options for enabling a customizable text banner that will be displayed on
// Amazon Web Services provided clients when a VPN session is established.
ClientLoginBannerOptions *ClientLoginBannerOptions `type:"structure"`
// The ID of the Client VPN endpoint to modify.
@ -123606,6 +124058,11 @@ type ModifyClientVpnEndpointInput struct {
// be provisioned in Certificate Manager (ACM).
ServerCertificateArn *string `type:"string"`
// The maximum VPN session duration time in hours.
//
// Valid values: 8 | 10 | 12 | 24
//
// Default value: 24
SessionTimeoutHours *int64 `type:"integer"`
// Indicates whether the VPN is split-tunnel.
@ -142435,6 +142892,95 @@ func (s *RestoreAddressToClassicOutput) SetStatus(v string) *RestoreAddressToCla
return s
}
type RestoreImageFromRecycleBinInput struct {
_ struct{} `type:"structure"`
// Checks whether you have the required permissions for the action, without
// actually making the request, and provides an error response. If you have
// the required permissions, the error response is DryRunOperation. Otherwise,
// it is UnauthorizedOperation.
DryRun *bool `type:"boolean"`
// The ID of the AMI to restore.
//
// ImageId is a required field
ImageId *string `type:"string" required:"true"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s RestoreImageFromRecycleBinInput) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s RestoreImageFromRecycleBinInput) GoString() string {
return s.String()
}
// Validate inspects the fields of the type to determine if they are valid.
func (s *RestoreImageFromRecycleBinInput) Validate() error {
invalidParams := request.ErrInvalidParams{Context: "RestoreImageFromRecycleBinInput"}
if s.ImageId == nil {
invalidParams.Add(request.NewErrParamRequired("ImageId"))
}
if invalidParams.Len() > 0 {
return invalidParams
}
return nil
}
// SetDryRun sets the DryRun field's value.
func (s *RestoreImageFromRecycleBinInput) SetDryRun(v bool) *RestoreImageFromRecycleBinInput {
s.DryRun = &v
return s
}
// SetImageId sets the ImageId field's value.
func (s *RestoreImageFromRecycleBinInput) SetImageId(v string) *RestoreImageFromRecycleBinInput {
s.ImageId = &v
return s
}
type RestoreImageFromRecycleBinOutput struct {
_ struct{} `type:"structure"`
// Returns true if the request succeeds; otherwise, it returns an error.
Return *bool `locationName:"return" type:"boolean"`
}
// String returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s RestoreImageFromRecycleBinOutput) String() string {
return awsutil.Prettify(s)
}
// GoString returns the string representation.
//
// API parameter values that are decorated as "sensitive" in the API will not
// be included in the string output. The member name will be present, but the
// value will be replaced with "sensitive".
func (s RestoreImageFromRecycleBinOutput) GoString() string {
return s.String()
}
// SetReturn sets the Return field's value.
func (s *RestoreImageFromRecycleBinOutput) SetReturn(v bool) *RestoreImageFromRecycleBinOutput {
s.Return = &v
return s
}
type RestoreManagedPrefixListVersionInput struct {
_ struct{} `type:"structure"`
@ -163212,6 +163758,24 @@ const (
// InstanceTypeX1e32xlarge is a InstanceType enum value
InstanceTypeX1e32xlarge = "x1e.32xlarge"
// InstanceTypeX2iezn2xlarge is a InstanceType enum value
InstanceTypeX2iezn2xlarge = "x2iezn.2xlarge"
// InstanceTypeX2iezn4xlarge is a InstanceType enum value
InstanceTypeX2iezn4xlarge = "x2iezn.4xlarge"
// InstanceTypeX2iezn6xlarge is a InstanceType enum value
InstanceTypeX2iezn6xlarge = "x2iezn.6xlarge"
// InstanceTypeX2iezn8xlarge is a InstanceType enum value
InstanceTypeX2iezn8xlarge = "x2iezn.8xlarge"
// InstanceTypeX2iezn12xlarge is a InstanceType enum value
InstanceTypeX2iezn12xlarge = "x2iezn.12xlarge"
// InstanceTypeX2ieznMetal is a InstanceType enum value
InstanceTypeX2ieznMetal = "x2iezn.metal"
// InstanceTypeX2gdMedium is a InstanceType enum value
InstanceTypeX2gdMedium = "x2gd.medium"
@ -163727,6 +164291,12 @@ func InstanceType_Values() []string {
InstanceTypeX1e8xlarge,
InstanceTypeX1e16xlarge,
InstanceTypeX1e32xlarge,
InstanceTypeX2iezn2xlarge,
InstanceTypeX2iezn4xlarge,
InstanceTypeX2iezn6xlarge,
InstanceTypeX2iezn8xlarge,
InstanceTypeX2iezn12xlarge,
InstanceTypeX2ieznMetal,
InstanceTypeX2gdMedium,
InstanceTypeX2gdLarge,
InstanceTypeX2gdXlarge,

4
vendor/google.golang.org/grpc/attributes/attributes.go generated vendored
View File

@ -69,7 +69,9 @@ func (a *Attributes) Value(key interface{}) interface{} {
// bool' is implemented for a value in the attributes, it is called to
// determine if the value matches the one stored in the other attributes. If
// Equal is not implemented, standard equality is used to determine if the two
// values are equal.
// values are equal. Note that some types (e.g. maps) aren't comparable by
// default, so they must be wrapped in a struct, or in an alias type, with Equal
// defined.
func (a *Attributes) Equal(o *Attributes) bool {
if a == nil && o == nil {
return true

5
vendor/google.golang.org/grpc/credentials/insecure/insecure.go generated vendored
View File

@ -18,11 +18,6 @@
// Package insecure provides an implementation of the
// credentials.TransportCredentials interface which disables transport security.
//
// Experimental
//
// Notice: This package is EXPERIMENTAL and may be changed or removed in a
// later release.
package insecure
import (

4
vendor/google.golang.org/grpc/dialoptions.go generated vendored
View File

@ -272,7 +272,7 @@ func withBackoff(bs internalbackoff.Strategy) DialOption {
})
}
// WithBlock returns a DialOption which makes caller of Dial blocks until the
// WithBlock returns a DialOption which makes callers of Dial block until the
// underlying connection is up. Without this, Dial returns immediately and
// connecting the server happens in background.
func WithBlock() DialOption {
@ -304,7 +304,7 @@ func WithReturnConnectionError() DialOption {
// WithCredentialsBundle or WithPerRPCCredentials) which require transport
// security is incompatible and will cause grpc.Dial() to fail.
//
// Deprecated: use insecure.NewCredentials() instead.
// Deprecated: use WithTransportCredentials and insecure.NewCredentials() instead.
// Will be supported throughout 1.x.
func WithInsecure() DialOption {
return newFuncDialOption(func(o *dialOptions) {

8
vendor/google.golang.org/grpc/grpclog/loggerv2.go generated vendored
View File

@ -248,12 +248,12 @@ func (g *loggerT) V(l int) bool {
// later release.
type DepthLoggerV2 interface {
LoggerV2
// InfoDepth logs to INFO log at the specified depth. Arguments are handled in the manner of fmt.Print.
// InfoDepth logs to INFO log at the specified depth. Arguments are handled in the manner of fmt.Println.
InfoDepth(depth int, args ...interface{})
// WarningDepth logs to WARNING log at the specified depth. Arguments are handled in the manner of fmt.Print.
// WarningDepth logs to WARNING log at the specified depth. Arguments are handled in the manner of fmt.Println.
WarningDepth(depth int, args ...interface{})
// ErrorDetph logs to ERROR log at the specified depth. Arguments are handled in the manner of fmt.Print.
// ErrorDepth logs to ERROR log at the specified depth. Arguments are handled in the manner of fmt.Println.
ErrorDepth(depth int, args ...interface{})
// FatalDepth logs to FATAL log at the specified depth. Arguments are handled in the manner of fmt.Print.
// FatalDepth logs to FATAL log at the specified depth. Arguments are handled in the manner of fmt.Println.
FatalDepth(depth int, args ...interface{})
}

2
vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go generated vendored
View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.1.0
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.14.0
// source: grpc/health/v1/health.proto

7
vendor/google.golang.org/grpc/internal/envconfig/xds.go generated vendored
View File

@ -42,6 +42,7 @@ const (
aggregateAndDNSSupportEnv = "GRPC_XDS_EXPERIMENTAL_ENABLE_AGGREGATE_AND_LOGICAL_DNS_CLUSTER"
rbacSupportEnv = "GRPC_XDS_EXPERIMENTAL_RBAC"
federationEnv = "GRPC_EXPERIMENTAL_XDS_FEDERATION"
rlsInXDSEnv = "GRPC_EXPERIMENTAL_XDS_RLS_LB"
c2pResolverTestOnlyTrafficDirectorURIEnv = "GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI"
)
@ -85,6 +86,12 @@ var (
// XDSFederation indicates whether federation support is enabled.
XDSFederation = strings.EqualFold(os.Getenv(federationEnv), "true")
// XDSRLS indicates whether processing of Cluster Specifier plugins and
// support for the RLS CLuster Specifier is enabled, which can be enabled by
// setting the environment variable "GRPC_EXPERIMENTAL_XDS_RLS_LB" to
// "true".
XDSRLS = strings.EqualFold(os.Getenv(rlsInXDSEnv), "true")
// C2PResolverTestOnlyTrafficDirectorURI is the TD URI for testing.
C2PResolverTestOnlyTrafficDirectorURI = os.Getenv(c2pResolverTestOnlyTrafficDirectorURIEnv)
)

8
vendor/google.golang.org/grpc/internal/grpclog/grpclog.go generated vendored
View File

@ -115,12 +115,12 @@ type LoggerV2 interface {
// Notice: This type is EXPERIMENTAL and may be changed or removed in a
// later release.
type DepthLoggerV2 interface {
// InfoDepth logs to INFO log at the specified depth. Arguments are handled in the manner of fmt.Print.
// InfoDepth logs to INFO log at the specified depth. Arguments are handled in the manner of fmt.Println.
InfoDepth(depth int, args ...interface{})
// WarningDepth logs to WARNING log at the specified depth. Arguments are handled in the manner of fmt.Print.
// WarningDepth logs to WARNING log at the specified depth. Arguments are handled in the manner of fmt.Println.
WarningDepth(depth int, args ...interface{})
// ErrorDetph logs to ERROR log at the specified depth. Arguments are handled in the manner of fmt.Print.
// ErrorDepth logs to ERROR log at the specified depth. Arguments are handled in the manner of fmt.Println.
ErrorDepth(depth int, args ...interface{})
// FatalDepth logs to FATAL log at the specified depth. Arguments are handled in the manner of fmt.Print.
// FatalDepth logs to FATAL log at the specified depth. Arguments are handled in the manner of fmt.Println.
FatalDepth(depth int, args ...interface{})
}

13
vendor/google.golang.org/grpc/internal/grpcutil/regex.go generated vendored
View File

@ -20,9 +20,12 @@ package grpcutil
import "regexp"
// FullMatchWithRegex returns whether the full string matches the regex provided.
func FullMatchWithRegex(re *regexp.Regexp, string string) bool {
re.Longest()
rem := re.FindString(string)
return len(rem) == len(string)
// FullMatchWithRegex returns whether the full text matches the regex provided.
func FullMatchWithRegex(re *regexp.Regexp, text string) bool {
if len(text) == 0 {
return re.MatchString(text)
}
re.Longest()
rem := re.FindString(text)
return len(rem) == len(text)
}

2
vendor/google.golang.org/grpc/reflection/grpc_reflection_v1alpha/reflection_grpc.pb.go generated vendored
View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.1.0
// - protoc-gen-go-grpc v1.2.0
// - protoc v3.14.0
// source: reflection/grpc_reflection_v1alpha/reflection.proto

18
vendor/google.golang.org/grpc/regenerate.sh generated vendored
View File

@ -76,7 +76,21 @@ SOURCES=(
# These options of the form 'Mfoo.proto=bar' instruct the codegen to use an
# import path of 'bar' in the generated code when 'foo.proto' is imported in
# one of the sources.
OPTS=Mgrpc/service_config/service_config.proto=/internal/proto/grpc_service_config,Mgrpc/core/stats.proto=google.golang.org/grpc/interop/grpc_testing/core
#
# Note that the protos listed here are all for testing purposes. All protos to
# be used externally should have a go_package option (and they don't need to be
# listed here).
OPTS=Mgrpc/service_config/service_config.proto=/internal/proto/grpc_service_config,\
Mgrpc/core/stats.proto=google.golang.org/grpc/interop/grpc_testing/core,\
Mgrpc/testing/benchmark_service.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/stats.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/report_qps_scenario_service.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/messages.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/worker_service.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/control.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/test.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/payloads.proto=google.golang.org/grpc/interop/grpc_testing,\
Mgrpc/testing/empty.proto=google.golang.org/grpc/interop/grpc_testing
for src in ${SOURCES[@]}; do
echo "protoc ${src}"
@ -85,7 +99,6 @@ for src in ${SOURCES[@]}; do
-I${WORKDIR}/grpc-proto \
-I${WORKDIR}/googleapis \
-I${WORKDIR}/protobuf/src \
-I${WORKDIR}/istio \
${src}
done
@ -96,7 +109,6 @@ for src in ${LEGACY_SOURCES[@]}; do
-I${WORKDIR}/grpc-proto \
-I${WORKDIR}/googleapis \
-I${WORKDIR}/protobuf/src \
-I${WORKDIR}/istio \
${src}
done

2
vendor/google.golang.org/grpc/version.go generated vendored
View File

@ -19,4 +19,4 @@
package grpc
// Version is the current grpc version.
const Version = "1.43.0"
const Version = "1.44.1-dev"

4
vendor/modules.txt vendored
View File

@ -8,7 +8,7 @@ github.com/armon/go-metrics
# github.com/armon/go-radix v1.0.0
## explicit
github.com/armon/go-radix
# github.com/aws/aws-sdk-go v1.42.40
# github.com/aws/aws-sdk-go v1.42.48
## explicit; go 1.11
github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/awserr
@ -589,7 +589,7 @@ google.golang.org/appengine/urlfetch
google.golang.org/genproto/googleapis/api/httpbody
google.golang.org/genproto/googleapis/rpc/status
google.golang.org/genproto/protobuf/field_mask
# google.golang.org/grpc v1.43.0
# google.golang.org/grpc v1.44.0
## explicit; go 1.14
google.golang.org/grpc
google.golang.org/grpc/attributes