From 169afcf5c46a109ee9bbd5c089623a0f1f8dfe66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:32:24 +0000 Subject: [PATCH] Bump github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue Bumps [github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue](https://github.com/aws/aws-sdk-go-v2) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/config/v1.15.4/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.15.3...config/v1.15.4) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 7 +- go.sum | 73 +------ vendor/github.com/apex/log/.gitignore | 1 - vendor/github.com/apex/log/History.md | 75 -------- vendor/github.com/apex/log/LICENSE | 22 --- vendor/github.com/apex/log/Makefile | 2 - vendor/github.com/apex/log/Readme.md | 61 ------ vendor/github.com/apex/log/context.go | 19 -- vendor/github.com/apex/log/default.go | 45 ----- vendor/github.com/apex/log/doc.go | 10 - vendor/github.com/apex/log/entry.go | 182 ------------------ .../github.com/apex/log/handlers/text/text.go | 80 -------- vendor/github.com/apex/log/interface.go | 22 --- vendor/github.com/apex/log/levels.go | 81 -------- vendor/github.com/apex/log/logger.go | 156 --------------- vendor/github.com/apex/log/pkg.go | 108 ----------- vendor/github.com/apex/log/stack.go | 8 - .../dynamodb/attributevalue/CHANGELOG.md | 4 + .../attributevalue/go_module_metadata.go | 2 +- .../service/dynamodb/CHANGELOG.md | 4 + .../service/dynamodb/api_client.go | 38 +--- .../service/dynamodb/endpoints.go | 4 - .../service/dynamodb/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/dynamodb/options.go | 3 - vendor/modules.txt | 10 +- 25 files changed, 31 insertions(+), 988 deletions(-) delete mode 100644 vendor/github.com/apex/log/.gitignore delete mode 100644 vendor/github.com/apex/log/History.md delete mode 100644 vendor/github.com/apex/log/LICENSE delete mode 100644 vendor/github.com/apex/log/Makefile delete mode 100644 vendor/github.com/apex/log/Readme.md delete mode 100644 vendor/github.com/apex/log/context.go delete mode 100644 vendor/github.com/apex/log/default.go delete mode 100644 vendor/github.com/apex/log/doc.go delete mode 100644 vendor/github.com/apex/log/entry.go delete mode 100644 vendor/github.com/apex/log/handlers/text/text.go delete mode 100644 vendor/github.com/apex/log/interface.go delete mode 100644 vendor/github.com/apex/log/levels.go delete mode 100644 vendor/github.com/apex/log/logger.go delete mode 100644 vendor/github.com/apex/log/pkg.go delete mode 100644 vendor/github.com/apex/log/stack.go diff --git a/go.mod b/go.mod index 130164c..ca6b6c4 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,11 @@ go 1.22 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/alicebob/miniredis v2.5.0+incompatible - github.com/apex/log v1.9.0 github.com/aws/aws-sdk-go-v2 v1.30.5 github.com/aws/aws-sdk-go-v2/config v1.27.35 github.com/aws/aws-sdk-go-v2/credentials v1.17.33 - github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.3 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 + github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.4 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 github.com/aws/aws-sdk-go-v2/service/kinesis v1.29.7 github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486 github.com/go-sql-driver/mysql v1.8.1 @@ -28,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.7 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.8 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect diff --git a/go.sum b/go.sum index d056da5..845f39b 100644 --- a/go.sum +++ b/go.sum @@ -6,12 +6,6 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZp github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= -github.com/apex/log v1.9.0 h1:FHtw/xuaM8AgmvDDTI9fiwoAL25Sq2cxojnZICUU8l0= -github.com/apex/log v1.9.0/go.mod h1:m82fZlWIuiWzWP04XCTXmnX0xRkYYbCdYn8jbJeLBEA= -github.com/apex/logs v1.0.0/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= -github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= -github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= -github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v1.9.0/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g= github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= @@ -21,8 +15,8 @@ github.com/aws/aws-sdk-go-v2/config v1.27.35 h1:jeFgiWYNV0vrgdZqB4kZBjYNdy0IKkwr github.com/aws/aws-sdk-go-v2/config v1.27.35/go.mod h1:qnpEvTq8ZfjrCqmJGRfWZuF+lGZ/vG8LK2K0L/TY1gQ= github.com/aws/aws-sdk-go-v2/credentials v1.17.33 h1:lBHAQQznENv0gLHAZ73ONiTSkCtr8q3pSqWrpbBBZz0= github.com/aws/aws-sdk-go-v2/credentials v1.17.33/go.mod h1:MBuqCUOT3ChfLuxNDGyra67eskx7ge9e3YKYBce7wpI= -github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.3 h1:/BPXKQ6n1cDWPmc5FWF6fCSaUtK+dWkWd0x9dI4dgaI= -github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.3/go.mod h1:qabLXChRlJREypX5RN/Z47GU+RaMsjotNCZfZ85oD0M= +github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.4 h1:m7h6UwsHIyx0L8K7T17aYeDcevwd6hGrbQiAid2XyKA= +github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.4/go.mod h1:Hkre8GbTJ7Y6IKDVMoWRD12pIHQ6GH4JNEwzKiz6xyw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ= @@ -31,10 +25,10 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF4 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 h1:jbqgtdKfAXebx2/l2UhDEe/jmmCIhaCO3HFK71M7VzM= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9/go.mod h1:N3YdUYxyxhiuAelUgCpSVBuBI1klobJxZrDtL+olu10= -github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.7 h1:VTBHXWkSeFgT3sfYB4U92qMgzHl0nz9H1tYNHHutLg0= -github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.7/go.mod h1:F/ybU7YfgFcktSp+biKgiHjyscGhlZxOz4QFFQqHXGw= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 h1:ozHHSE9Hflrf2DZmJEoqIO+bK6E6rAfID8PSCv2rgG8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10/go.mod h1:N3YdUYxyxhiuAelUgCpSVBuBI1klobJxZrDtL+olu10= +github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.8 h1:lje864O92lma0+TnDNHAMpiehauR02sTo+xfoSsw3DE= +github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.8/go.mod h1:F/ybU7YfgFcktSp+biKgiHjyscGhlZxOz4QFFQqHXGw= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18 h1:GACdEPdpBE59I7pbfvu0/Mw1wzstlP3QtPHklUxybFE= @@ -55,7 +49,6 @@ github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486 h1:266Pq6JfxdphziJ1LiqU68OJrKiTxyF8hbiceQWX3Cs= github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486/go.mod h1:0Qr1uMHFmHsIYMcG4T7BJ9yrJtWadhOmpABCX69dwuc= -github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= @@ -69,13 +62,8 @@ 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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -87,33 +75,17 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -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= @@ -128,56 +100,23 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= -github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= -github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= -github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= -github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= -github.com/tj/go-buffer v1.1.0/go.mod h1:iyiJpfFcR2B9sXu7KvjbT9fpM4mOelRSDTbntVj52Uc= -github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= -github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/vendor/github.com/apex/log/.gitignore b/vendor/github.com/apex/log/.gitignore deleted file mode 100644 index 7a6353d..0000000 --- a/vendor/github.com/apex/log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.envrc diff --git a/vendor/github.com/apex/log/History.md b/vendor/github.com/apex/log/History.md deleted file mode 100644 index a303177..0000000 --- a/vendor/github.com/apex/log/History.md +++ /dev/null @@ -1,75 +0,0 @@ - -v1.9.0 / 2020-08-18 -=================== - - * add `WithDuration()` method to record a duration as milliseconds - * add: ignore nil errors in `WithError()` - * change trace duration to milliseconds (arguably a breaking change) - -v1.8.0 / 2020-08-05 -=================== - - * refactor apexlogs handler to not make the AddEvents() call if there are no events to flush - -v1.7.1 / 2020-08-05 -=================== - - * fix potential nil panic in apexlogs handler - -v1.7.0 / 2020-08-03 -=================== - - * add FlushSync() to apexlogs handler - -v1.6.0 / 2020-07-13 -=================== - - * update apex/logs dep to v1.0.0 - * docs: mention that Flush() is non-blocking now, use Close() - -v1.5.0 / 2020-07-11 -=================== - - * add buffering to Apex Logs handler - -v1.4.0 / 2020-06-16 -=================== - - * add AuthToken to apexlogs handler - -v1.3.0 / 2020-05-26 -=================== - - * change FromContext() to always return a logger - -v1.2.0 / 2020-05-26 -=================== - - * add log.NewContext() and log.FromContext(). Closes #78 - -v1.1.4 / 2020-04-22 -=================== - - * add apexlogs HTTPClient support - -v1.1.3 / 2020-04-22 -=================== - - * add events len check before flushing to apexlogs handler - -v1.1.2 / 2020-01-29 -=================== - - * refactor apexlogs handler to use github.com/apex/logs client - -v1.1.1 / 2019-06-24 -=================== - - * add go.mod - * add rough pass at apexlogs handler - -v1.1.0 / 2018-10-11 -=================== - - * fix: cli handler to show non-string fields appropriately - * fix: cli using fatih/color to better support windows diff --git a/vendor/github.com/apex/log/LICENSE b/vendor/github.com/apex/log/LICENSE deleted file mode 100644 index af71800..0000000 --- a/vendor/github.com/apex/log/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -(The MIT License) - -Copyright (c) 2015 TJ Holowaychuk tj@tjholowaychuk.com - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/github.com/apex/log/Makefile b/vendor/github.com/apex/log/Makefile deleted file mode 100644 index f948e88..0000000 --- a/vendor/github.com/apex/log/Makefile +++ /dev/null @@ -1,2 +0,0 @@ - -include github.com/tj/make/golang diff --git a/vendor/github.com/apex/log/Readme.md b/vendor/github.com/apex/log/Readme.md deleted file mode 100644 index aa5c621..0000000 --- a/vendor/github.com/apex/log/Readme.md +++ /dev/null @@ -1,61 +0,0 @@ - -![Structured logging for golang](assets/title.png) - -Package log implements a simple structured logging API inspired by Logrus, designed with centralization in mind. Read more on [Medium](https://medium.com/@tjholowaychuk/apex-log-e8d9627f4a9a#.rav8yhkud). - -## Handlers - -- __apexlogs__ – handler for [Apex Logs](https://apex.sh/logs/) -- __cli__ – human-friendly CLI output -- __discard__ – discards all logs -- __es__ – Elasticsearch handler -- __graylog__ – Graylog handler -- __json__ – JSON output handler -- __kinesis__ – AWS Kinesis handler -- __level__ – level filter handler -- __logfmt__ – logfmt plain-text formatter -- __memory__ – in-memory handler for tests -- __multi__ – fan-out to multiple handlers -- __papertrail__ – Papertrail handler -- __text__ – human-friendly colored output -- __delta__ – outputs the delta between log calls and spinner - -## Example - -Example using the [Apex Logs](https://apex.sh/logs/) handler. - -```go -package main - -import ( - "errors" - "time" - - "github.com/apex/log" -) - -func main() { - ctx := log.WithFields(log.Fields{ - "file": "something.png", - "type": "image/png", - "user": "tobi", - }) - - for range time.Tick(time.Millisecond * 200) { - ctx.Info("upload") - ctx.Info("upload complete") - ctx.Warn("upload retry") - ctx.WithError(errors.New("unauthorized")).Error("upload failed") - ctx.Errorf("failed to upload %s", "img.png") - } -} -``` - ---- - -[![Build Status](https://semaphoreci.com/api/v1/projects/d8a8b1c0-45b0-4b89-b066-99d788d0b94c/642077/badge.svg)](https://semaphoreci.com/tj/log) -[![GoDoc](https://godoc.org/github.com/apex/log?status.svg)](https://godoc.org/github.com/apex/log) -![](https://img.shields.io/badge/license-MIT-blue.svg) -![](https://img.shields.io/badge/status-stable-green.svg) - - diff --git a/vendor/github.com/apex/log/context.go b/vendor/github.com/apex/log/context.go deleted file mode 100644 index 290ae41..0000000 --- a/vendor/github.com/apex/log/context.go +++ /dev/null @@ -1,19 +0,0 @@ -package log - -import "context" - -// logKey is a private context key. -type logKey struct{} - -// NewContext returns a new context with logger. -func NewContext(ctx context.Context, v Interface) context.Context { - return context.WithValue(ctx, logKey{}, v) -} - -// FromContext returns the logger from context, or log.Log. -func FromContext(ctx context.Context) Interface { - if v, ok := ctx.Value(logKey{}).(Interface); ok { - return v - } - return Log -} diff --git a/vendor/github.com/apex/log/default.go b/vendor/github.com/apex/log/default.go deleted file mode 100644 index 2213486..0000000 --- a/vendor/github.com/apex/log/default.go +++ /dev/null @@ -1,45 +0,0 @@ -package log - -import ( - "bytes" - "fmt" - "log" - "sort" -) - -// field used for sorting. -type field struct { - Name string - Value interface{} -} - -// by sorts fields by name. -type byName []field - -func (a byName) Len() int { return len(a) } -func (a byName) Swap(i, j int) { a[i], a[j] = a[j], a[i] } -func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name } - -// handleStdLog outpouts to the stlib log. -func handleStdLog(e *Entry) error { - level := levelNames[e.Level] - - var fields []field - - for k, v := range e.Fields { - fields = append(fields, field{k, v}) - } - - sort.Sort(byName(fields)) - - var b bytes.Buffer - fmt.Fprintf(&b, "%5s %-25s", level, e.Message) - - for _, f := range fields { - fmt.Fprintf(&b, " %s=%v", f.Name, f.Value) - } - - log.Println(b.String()) - - return nil -} diff --git a/vendor/github.com/apex/log/doc.go b/vendor/github.com/apex/log/doc.go deleted file mode 100644 index 0331e8e..0000000 --- a/vendor/github.com/apex/log/doc.go +++ /dev/null @@ -1,10 +0,0 @@ -/* -Package log implements a simple structured logging API designed with few assumptions. Designed for -centralized logging solutions such as Kinesis which require encoding and decoding before fanning-out -to handlers. - -You may use this package with inline handlers, much like Logrus, however a centralized solution -is recommended so that apps do not need to be re-deployed to add or remove logging service -providers. -*/ -package log diff --git a/vendor/github.com/apex/log/entry.go b/vendor/github.com/apex/log/entry.go deleted file mode 100644 index d898295..0000000 --- a/vendor/github.com/apex/log/entry.go +++ /dev/null @@ -1,182 +0,0 @@ -package log - -import ( - "fmt" - "os" - "strings" - "time" -) - -// assert interface compliance. -var _ Interface = (*Entry)(nil) - -// Now returns the current time. -var Now = time.Now - -// Entry represents a single log entry. -type Entry struct { - Logger *Logger `json:"-"` - Fields Fields `json:"fields"` - Level Level `json:"level"` - Timestamp time.Time `json:"timestamp"` - Message string `json:"message"` - start time.Time - fields []Fields -} - -// NewEntry returns a new entry for `log`. -func NewEntry(log *Logger) *Entry { - return &Entry{ - Logger: log, - } -} - -// WithFields returns a new entry with `fields` set. -func (e *Entry) WithFields(fields Fielder) *Entry { - f := []Fields{} - f = append(f, e.fields...) - f = append(f, fields.Fields()) - return &Entry{ - Logger: e.Logger, - fields: f, - } -} - -// WithField returns a new entry with the `key` and `value` set. -func (e *Entry) WithField(key string, value interface{}) *Entry { - return e.WithFields(Fields{key: value}) -} - -// WithDuration returns a new entry with the "duration" field set -// to the given duration in milliseconds. -func (e *Entry) WithDuration(d time.Duration) *Entry { - return e.WithField("duration", d.Milliseconds()) -} - -// WithError returns a new entry with the "error" set to `err`. -// -// The given error may implement .Fielder, if it does the method -// will add all its `.Fields()` into the returned entry. -func (e *Entry) WithError(err error) *Entry { - if err == nil { - return e - } - - ctx := e.WithField("error", err.Error()) - - if s, ok := err.(stackTracer); ok { - frame := s.StackTrace()[0] - - name := fmt.Sprintf("%n", frame) - file := fmt.Sprintf("%+s", frame) - line := fmt.Sprintf("%d", frame) - - parts := strings.Split(file, "\n\t") - if len(parts) > 1 { - file = parts[1] - } - - ctx = ctx.WithField("source", fmt.Sprintf("%s: %s:%s", name, file, line)) - } - - if f, ok := err.(Fielder); ok { - ctx = ctx.WithFields(f.Fields()) - } - - return ctx -} - -// Debug level message. -func (e *Entry) Debug(msg string) { - e.Logger.log(DebugLevel, e, msg) -} - -// Info level message. -func (e *Entry) Info(msg string) { - e.Logger.log(InfoLevel, e, msg) -} - -// Warn level message. -func (e *Entry) Warn(msg string) { - e.Logger.log(WarnLevel, e, msg) -} - -// Error level message. -func (e *Entry) Error(msg string) { - e.Logger.log(ErrorLevel, e, msg) -} - -// Fatal level message, followed by an exit. -func (e *Entry) Fatal(msg string) { - e.Logger.log(FatalLevel, e, msg) - os.Exit(1) -} - -// Debugf level formatted message. -func (e *Entry) Debugf(msg string, v ...interface{}) { - e.Debug(fmt.Sprintf(msg, v...)) -} - -// Infof level formatted message. -func (e *Entry) Infof(msg string, v ...interface{}) { - e.Info(fmt.Sprintf(msg, v...)) -} - -// Warnf level formatted message. -func (e *Entry) Warnf(msg string, v ...interface{}) { - e.Warn(fmt.Sprintf(msg, v...)) -} - -// Errorf level formatted message. -func (e *Entry) Errorf(msg string, v ...interface{}) { - e.Error(fmt.Sprintf(msg, v...)) -} - -// Fatalf level formatted message, followed by an exit. -func (e *Entry) Fatalf(msg string, v ...interface{}) { - e.Fatal(fmt.Sprintf(msg, v...)) -} - -// Trace returns a new entry with a Stop method to fire off -// a corresponding completion log, useful with defer. -func (e *Entry) Trace(msg string) *Entry { - e.Info(msg) - v := e.WithFields(e.Fields) - v.Message = msg - v.start = time.Now() - return v -} - -// Stop should be used with Trace, to fire off the completion message. When -// an `err` is passed the "error" field is set, and the log level is error. -func (e *Entry) Stop(err *error) { - if err == nil || *err == nil { - e.WithDuration(time.Since(e.start)).Info(e.Message) - } else { - e.WithDuration(time.Since(e.start)).WithError(*err).Error(e.Message) - } -} - -// mergedFields returns the fields list collapsed into a single map. -func (e *Entry) mergedFields() Fields { - f := Fields{} - - for _, fields := range e.fields { - for k, v := range fields { - f[k] = v - } - } - - return f -} - -// finalize returns a copy of the Entry with Fields merged. -func (e *Entry) finalize(level Level, msg string) *Entry { - return &Entry{ - Logger: e.Logger, - Fields: e.mergedFields(), - Level: level, - Message: msg, - Timestamp: Now(), - } -} diff --git a/vendor/github.com/apex/log/handlers/text/text.go b/vendor/github.com/apex/log/handlers/text/text.go deleted file mode 100644 index 3ff5963..0000000 --- a/vendor/github.com/apex/log/handlers/text/text.go +++ /dev/null @@ -1,80 +0,0 @@ -// Package text implements a development-friendly textual handler. -package text - -import ( - "fmt" - "io" - "os" - "sync" - "time" - - "github.com/apex/log" -) - -// Default handler outputting to stderr. -var Default = New(os.Stderr) - -// start time. -var start = time.Now() - -// colors. -const ( - none = 0 - red = 31 - green = 32 - yellow = 33 - blue = 34 - gray = 37 -) - -// Colors mapping. -var Colors = [...]int{ - log.DebugLevel: gray, - log.InfoLevel: blue, - log.WarnLevel: yellow, - log.ErrorLevel: red, - log.FatalLevel: red, -} - -// Strings mapping. -var Strings = [...]string{ - log.DebugLevel: "DEBUG", - log.InfoLevel: "INFO", - log.WarnLevel: "WARN", - log.ErrorLevel: "ERROR", - log.FatalLevel: "FATAL", -} - -// Handler implementation. -type Handler struct { - mu sync.Mutex - Writer io.Writer -} - -// New handler. -func New(w io.Writer) *Handler { - return &Handler{ - Writer: w, - } -} - -// HandleLog implements log.Handler. -func (h *Handler) HandleLog(e *log.Entry) error { - color := Colors[e.Level] - level := Strings[e.Level] - names := e.Fields.Names() - - h.mu.Lock() - defer h.mu.Unlock() - - ts := time.Since(start) / time.Second - fmt.Fprintf(h.Writer, "\033[%dm%6s\033[0m[%04d] %-25s", color, level, ts, e.Message) - - for _, name := range names { - fmt.Fprintf(h.Writer, " \033[%dm%s\033[0m=%v", color, name, e.Fields.Get(name)) - } - - fmt.Fprintln(h.Writer) - - return nil -} diff --git a/vendor/github.com/apex/log/interface.go b/vendor/github.com/apex/log/interface.go deleted file mode 100644 index 9daa046..0000000 --- a/vendor/github.com/apex/log/interface.go +++ /dev/null @@ -1,22 +0,0 @@ -package log - -import "time" - -// Interface represents the API of both Logger and Entry. -type Interface interface { - WithFields(Fielder) *Entry - WithField(string, interface{}) *Entry - WithDuration(time.Duration) *Entry - WithError(error) *Entry - Debug(string) - Info(string) - Warn(string) - Error(string) - Fatal(string) - Debugf(string, ...interface{}) - Infof(string, ...interface{}) - Warnf(string, ...interface{}) - Errorf(string, ...interface{}) - Fatalf(string, ...interface{}) - Trace(string) *Entry -} diff --git a/vendor/github.com/apex/log/levels.go b/vendor/github.com/apex/log/levels.go deleted file mode 100644 index 7d43a43..0000000 --- a/vendor/github.com/apex/log/levels.go +++ /dev/null @@ -1,81 +0,0 @@ -package log - -import ( - "bytes" - "errors" - "strings" -) - -// ErrInvalidLevel is returned if the severity level is invalid. -var ErrInvalidLevel = errors.New("invalid level") - -// Level of severity. -type Level int - -// Log levels. -const ( - InvalidLevel Level = iota - 1 - DebugLevel - InfoLevel - WarnLevel - ErrorLevel - FatalLevel -) - -var levelNames = [...]string{ - DebugLevel: "debug", - InfoLevel: "info", - WarnLevel: "warn", - ErrorLevel: "error", - FatalLevel: "fatal", -} - -var levelStrings = map[string]Level{ - "debug": DebugLevel, - "info": InfoLevel, - "warn": WarnLevel, - "warning": WarnLevel, - "error": ErrorLevel, - "fatal": FatalLevel, -} - -// String implementation. -func (l Level) String() string { - return levelNames[l] -} - -// MarshalJSON implementation. -func (l Level) MarshalJSON() ([]byte, error) { - return []byte(`"` + l.String() + `"`), nil -} - -// UnmarshalJSON implementation. -func (l *Level) UnmarshalJSON(b []byte) error { - v, err := ParseLevel(string(bytes.Trim(b, `"`))) - if err != nil { - return err - } - - *l = v - return nil -} - -// ParseLevel parses level string. -func ParseLevel(s string) (Level, error) { - l, ok := levelStrings[strings.ToLower(s)] - if !ok { - return InvalidLevel, ErrInvalidLevel - } - - return l, nil -} - -// MustParseLevel parses level string or panics. -func MustParseLevel(s string) Level { - l, err := ParseLevel(s) - if err != nil { - panic("invalid log level") - } - - return l -} diff --git a/vendor/github.com/apex/log/logger.go b/vendor/github.com/apex/log/logger.go deleted file mode 100644 index c7d9b73..0000000 --- a/vendor/github.com/apex/log/logger.go +++ /dev/null @@ -1,156 +0,0 @@ -package log - -import ( - stdlog "log" - "sort" - "time" -) - -// assert interface compliance. -var _ Interface = (*Logger)(nil) - -// Fielder is an interface for providing fields to custom types. -type Fielder interface { - Fields() Fields -} - -// Fields represents a map of entry level data used for structured logging. -type Fields map[string]interface{} - -// Fields implements Fielder. -func (f Fields) Fields() Fields { - return f -} - -// Get field value by name. -func (f Fields) Get(name string) interface{} { - return f[name] -} - -// Names returns field names sorted. -func (f Fields) Names() (v []string) { - for k := range f { - v = append(v, k) - } - - sort.Strings(v) - return -} - -// The HandlerFunc type is an adapter to allow the use of ordinary functions as -// log handlers. If f is a function with the appropriate signature, -// HandlerFunc(f) is a Handler object that calls f. -type HandlerFunc func(*Entry) error - -// HandleLog calls f(e). -func (f HandlerFunc) HandleLog(e *Entry) error { - return f(e) -} - -// Handler is used to handle log events, outputting them to -// stdio or sending them to remote services. See the "handlers" -// directory for implementations. -// -// It is left up to Handlers to implement thread-safety. -type Handler interface { - HandleLog(*Entry) error -} - -// Logger represents a logger with configurable Level and Handler. -type Logger struct { - Handler Handler - Level Level -} - -// WithFields returns a new entry with `fields` set. -func (l *Logger) WithFields(fields Fielder) *Entry { - return NewEntry(l).WithFields(fields.Fields()) -} - -// WithField returns a new entry with the `key` and `value` set. -// -// Note that the `key` should not have spaces in it - use camel -// case or underscores -func (l *Logger) WithField(key string, value interface{}) *Entry { - return NewEntry(l).WithField(key, value) -} - -// WithDuration returns a new entry with the "duration" field set -// to the given duration in milliseconds. -func (l *Logger) WithDuration(d time.Duration) *Entry { - return NewEntry(l).WithDuration(d) -} - -// WithError returns a new entry with the "error" set to `err`. -func (l *Logger) WithError(err error) *Entry { - return NewEntry(l).WithError(err) -} - -// Debug level message. -func (l *Logger) Debug(msg string) { - NewEntry(l).Debug(msg) -} - -// Info level message. -func (l *Logger) Info(msg string) { - NewEntry(l).Info(msg) -} - -// Warn level message. -func (l *Logger) Warn(msg string) { - NewEntry(l).Warn(msg) -} - -// Error level message. -func (l *Logger) Error(msg string) { - NewEntry(l).Error(msg) -} - -// Fatal level message, followed by an exit. -func (l *Logger) Fatal(msg string) { - NewEntry(l).Fatal(msg) -} - -// Debugf level formatted message. -func (l *Logger) Debugf(msg string, v ...interface{}) { - NewEntry(l).Debugf(msg, v...) -} - -// Infof level formatted message. -func (l *Logger) Infof(msg string, v ...interface{}) { - NewEntry(l).Infof(msg, v...) -} - -// Warnf level formatted message. -func (l *Logger) Warnf(msg string, v ...interface{}) { - NewEntry(l).Warnf(msg, v...) -} - -// Errorf level formatted message. -func (l *Logger) Errorf(msg string, v ...interface{}) { - NewEntry(l).Errorf(msg, v...) -} - -// Fatalf level formatted message, followed by an exit. -func (l *Logger) Fatalf(msg string, v ...interface{}) { - NewEntry(l).Fatalf(msg, v...) -} - -// Trace returns a new entry with a Stop method to fire off -// a corresponding completion log, useful with defer. -func (l *Logger) Trace(msg string) *Entry { - return NewEntry(l).Trace(msg) -} - -// log the message, invoking the handler. We clone the entry here -// to bypass the overhead in Entry methods when the level is not -// met. -func (l *Logger) log(level Level, e *Entry, msg string) { - if level < l.Level { - return - } - - if err := l.Handler.HandleLog(e.finalize(level, msg)); err != nil { - stdlog.Printf("error logging: %s", err) - } -} diff --git a/vendor/github.com/apex/log/pkg.go b/vendor/github.com/apex/log/pkg.go deleted file mode 100644 index 872eae6..0000000 --- a/vendor/github.com/apex/log/pkg.go +++ /dev/null @@ -1,108 +0,0 @@ -package log - -import "time" - -// singletons ftw? -var Log Interface = &Logger{ - Handler: HandlerFunc(handleStdLog), - Level: InfoLevel, -} - -// SetHandler sets the handler. This is not thread-safe. -// The default handler outputs to the stdlib log. -func SetHandler(h Handler) { - if logger, ok := Log.(*Logger); ok { - logger.Handler = h - } -} - -// SetLevel sets the log level. This is not thread-safe. -func SetLevel(l Level) { - if logger, ok := Log.(*Logger); ok { - logger.Level = l - } -} - -// SetLevelFromString sets the log level from a string, panicing when invalid. This is not thread-safe. -func SetLevelFromString(s string) { - if logger, ok := Log.(*Logger); ok { - logger.Level = MustParseLevel(s) - } -} - -// WithFields returns a new entry with `fields` set. -func WithFields(fields Fielder) *Entry { - return Log.WithFields(fields) -} - -// WithField returns a new entry with the `key` and `value` set. -func WithField(key string, value interface{}) *Entry { - return Log.WithField(key, value) -} - -// WithDuration returns a new entry with the "duration" field set -// to the given duration in milliseconds. -func WithDuration(d time.Duration) *Entry { - return Log.WithDuration(d) -} - -// WithError returns a new entry with the "error" set to `err`. -func WithError(err error) *Entry { - return Log.WithError(err) -} - -// Debug level message. -func Debug(msg string) { - Log.Debug(msg) -} - -// Info level message. -func Info(msg string) { - Log.Info(msg) -} - -// Warn level message. -func Warn(msg string) { - Log.Warn(msg) -} - -// Error level message. -func Error(msg string) { - Log.Error(msg) -} - -// Fatal level message, followed by an exit. -func Fatal(msg string) { - Log.Fatal(msg) -} - -// Debugf level formatted message. -func Debugf(msg string, v ...interface{}) { - Log.Debugf(msg, v...) -} - -// Infof level formatted message. -func Infof(msg string, v ...interface{}) { - Log.Infof(msg, v...) -} - -// Warnf level formatted message. -func Warnf(msg string, v ...interface{}) { - Log.Warnf(msg, v...) -} - -// Errorf level formatted message. -func Errorf(msg string, v ...interface{}) { - Log.Errorf(msg, v...) -} - -// Fatalf level formatted message, followed by an exit. -func Fatalf(msg string, v ...interface{}) { - Log.Fatalf(msg, v...) -} - -// Trace returns a new entry with a Stop method to fire off -// a corresponding completion log, useful with defer. -func Trace(msg string) *Entry { - return Log.Trace(msg) -} diff --git a/vendor/github.com/apex/log/stack.go b/vendor/github.com/apex/log/stack.go deleted file mode 100644 index 57efe32..0000000 --- a/vendor/github.com/apex/log/stack.go +++ /dev/null @@ -1,8 +0,0 @@ -package log - -import "github.com/pkg/errors" - -// stackTracer interface. -type stackTracer interface { - StackTrace() errors.StackTrace -} diff --git a/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/CHANGELOG.md index 287fb0f..9d1bbeb 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.15.4 (2024-09-17) + +* **Dependency Update**: Updated to the latest SDK module versions + # v1.15.3 (2024-09-09) * **Dependency Update**: Updated to the latest SDK module versions diff --git a/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/go_module_metadata.go index 03e8299..76dae59 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue/go_module_metadata.go @@ -3,4 +3,4 @@ package attributevalue // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.15.3" +const goModuleVersion = "1.15.4" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/CHANGELOG.md index bc65177..4cbbfa5 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.34.10 (2024-09-17) + +* **Bug Fix**: **BREAKFIX**: Only generate AccountIDEndpointMode config for services that use it. This is a compiler break, but removes no actual functionality, as no services currently use the account ID in endpoint resolution. + # v1.34.9 (2024-09-09) * **Documentation**: Doc-only update for DynamoDB. Added information about async behavior for TagResource and UntagResource APIs and updated the description of ResourceInUseException. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/api_client.go b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/api_client.go index 2bb5801..225de6c 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/api_client.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/api_client.go @@ -253,16 +253,15 @@ func setResolvedDefaultsMode(o *Options) { // NewFromConfig returns a new client from the provided config. func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { opts := Options{ - Region: cfg.Region, - DefaultsMode: cfg.DefaultsMode, - RuntimeEnvironment: cfg.RuntimeEnvironment, - HTTPClient: cfg.HTTPClient, - Credentials: cfg.Credentials, - APIOptions: cfg.APIOptions, - Logger: cfg.Logger, - ClientLogMode: cfg.ClientLogMode, - AppID: cfg.AppID, - AccountIDEndpointMode: cfg.AccountIDEndpointMode, + Region: cfg.Region, + DefaultsMode: cfg.DefaultsMode, + RuntimeEnvironment: cfg.RuntimeEnvironment, + HTTPClient: cfg.HTTPClient, + Credentials: cfg.Credentials, + APIOptions: cfg.APIOptions, + Logger: cfg.Logger, + ClientLogMode: cfg.ClientLogMode, + AppID: cfg.AppID, } resolveAWSRetryerProvider(cfg, &opts) resolveAWSRetryMaxAttempts(cfg, &opts) @@ -646,25 +645,6 @@ func initializeTimeOffsetResolver(c *Client) { c.timeOffset = new(atomic.Int64) } -func checkAccountID(identity smithyauth.Identity, mode aws.AccountIDEndpointMode) error { - switch mode { - case aws.AccountIDEndpointModeUnset: - case aws.AccountIDEndpointModePreferred: - case aws.AccountIDEndpointModeDisabled: - case aws.AccountIDEndpointModeRequired: - if ca, ok := identity.(*internalauthsmithy.CredentialsAdapter); !ok { - return fmt.Errorf("accountID is required but not set") - } else if ca.Credentials.AccountID == "" { - return fmt.Errorf("accountID is required but not set") - } - // default check in case invalid mode is configured through request config - default: - return fmt.Errorf("invalid accountID endpoint mode %s, must be preferred/required/disabled", mode) - } - - return nil -} - func addUserAgentRetryMode(stack *middleware.Stack, options Options) error { ua, err := getOrAddRequestUserAgent(stack) if err != nil { diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/endpoints.go b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/endpoints.go index 5c948dd..a9d226a 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/endpoints.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/endpoints.go @@ -537,10 +537,6 @@ func (m *resolveEndpointV2Middleware) HandleFinalize(ctx context.Context, in mid return next.HandleFinalize(ctx, in) } - if err := checkAccountID(getIdentity(ctx), m.options.AccountIDEndpointMode); err != nil { - return out, metadata, fmt.Errorf("invalid accountID set: %w", err) - } - req, ok := in.Request.(*smithyhttp.Request) if !ok { return out, metadata, fmt.Errorf("unknown transport type %T", in.Request) diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/go_module_metadata.go index 3a1c1e9..4365ea3 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/go_module_metadata.go @@ -3,4 +3,4 @@ package dynamodb // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.34.9" +const goModuleVersion = "1.34.10" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/options.go b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/options.go index 4380a50..199f2cf 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/options.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/dynamodb/options.go @@ -24,9 +24,6 @@ type Options struct { // modify this list for per operation behavior. APIOptions []func(*middleware.Stack) error - // Indicates how aws account ID is applied in endpoint2.0 routing - AccountIDEndpointMode aws.AccountIDEndpointMode - // The optional application specific identifier appended to the User-Agent header. AppID string diff --git a/vendor/modules.txt b/vendor/modules.txt index bbb5ae4..e823986 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -12,10 +12,6 @@ github.com/alicebob/gopher-json ## explicit github.com/alicebob/miniredis github.com/alicebob/miniredis/server -# github.com/apex/log v1.9.0 -## explicit; go 1.12 -github.com/apex/log -github.com/apex/log/handlers/text # github.com/aws/aws-sdk-go-v2 v1.30.5 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/aws @@ -60,7 +56,7 @@ github.com/aws/aws-sdk-go-v2/credentials/endpointcreds/internal/client github.com/aws/aws-sdk-go-v2/credentials/processcreds github.com/aws/aws-sdk-go-v2/credentials/ssocreds github.com/aws/aws-sdk-go-v2/credentials/stscreds -# github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.3 +# github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.4 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue # github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 @@ -76,13 +72,13 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 # github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/internal/ini -# github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 +# github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/dynamodb github.com/aws/aws-sdk-go-v2/service/dynamodb/internal/customizations github.com/aws/aws-sdk-go-v2/service/dynamodb/internal/endpoints github.com/aws/aws-sdk-go-v2/service/dynamodb/types -# github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.7 +# github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.22.8 ## explicit; go 1.21 github.com/aws/aws-sdk-go-v2/service/dynamodbstreams/types # github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4