chore(release): 1.70.0 (#3806)

See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.70.0/CHANGELOG.md)

.all-contributorsrc

@@ -1010,7 +1010,9 @@
       "avatar_url": "https://avatars2.githubusercontent.com/u/5008987?v=4",
       "profile": "https://rybicki.io/",
       "contributions": [
-        "doc"
+        "doc",
+        "bug",
+        "code"
       ]
     },
     {

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.18
@@ -112,7 +112,7 @@ jobs:
         uses: actions/checkout@v3
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.18
@@ -224,18 +224,6 @@ jobs:
             os: ubuntu-latest
             python: '3.7'
           # Test alternate Gos
-          - java: '8'
-            dotnet: '3.1.x'
-            go: '1.16' # EOL since March 15, 2022 (in grace period until end of september 2022)
-            node: '14'
-            os: ubuntu-latest
-            python: '3.7'
-          - java: '8'
-            dotnet: '3.1.x'
-            go: '1.17' # EOL since August 02, 2022 (in grace period until end of september 2022)
-            node: '14'
-            os: ubuntu-latest
-            python: '3.7'
           - java: '8'
             dotnet: '3.1.x'
             go: '1.19'
@@ -286,7 +274,7 @@ jobs:
           rm built-tree.tgz
       # Set up all of our standard runtimes (this is matrix-based)
       - name: Set up .NET ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - name: Set up Go ${{ matrix.go }}
@@ -406,7 +394,7 @@ jobs:
           path: ${{ runner.temp }}/release-package
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.18

.github/workflows/pull-request-lint.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: amannn/action-semantic-pull-request@v4
+      - uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.mergify/config.yml

@@ -14,6 +14,9 @@ queue_rules:
       # One test for each supported dotnet version
       - status-success~=^Test \(.* dotnet 3\.1\.x .*$
       - status-success~=^Test \(.* dotnet 6\.0\.x .*$
+      # One test for each supported go version
+      - status-success~=^Test \(.* go 1.18 .*$
+      - status-success~=^Test \(.* go 1.19 .*$
       # One test for Java 8 and 11
       - status-success~=^Test \(.* java 8 .*$
       - status-success~=^Test \(.* java 11 .*$
@@ -63,6 +66,9 @@ pull_request_rules:
       # One test for each supported dotnet version
       - status-success~=^Test \(.* dotnet 3\.1\.x .*$
       - status-success~=^Test \(.* dotnet 6\.0\.x .*$
+      # One test for each supported go version
+      - status-success~=^Test \(.* go 1.18 .*$
+      - status-success~=^Test \(.* go 1.19 .*$
       # One test for Java 8 and 11
       - status-success~=^Test \(.* java 8 .*$
       - status-success~=^Test \(.* java 11 .*$
@@ -112,6 +118,9 @@ pull_request_rules:
       # One test for each supported dotnet version
       - status-success~=^Test \(.* dotnet 3\.1\.x .*$
       - status-success~=^Test \(.* dotnet 6\.0\.x .*$
+      # One test for each supported go version
+      - status-success~=^Test \(.* go 1.18 .*$
+      - status-success~=^Test \(.* go 1.19 .*$
       # One test for Java 8 and 11
       - status-success~=^Test \(.* java 8 .*$
       - status-success~=^Test \(.* java 11 .*$
@@ -161,6 +170,9 @@ pull_request_rules:
       # One test for each supported dotnet version
       - status-success~=^Test \(.* dotnet 3\.1\.x .*$
       - status-success~=^Test \(.* dotnet 6\.0\.x .*$
+      # One test for each supported go version
+      - status-success~=^Test \(.* go 1.18 .*$
+      - status-success~=^Test \(.* go 1.19 .*$
       # One test for Java 8 and 11
       - status-success~=^Test \(.* java 8 .*$
       - status-success~=^Test \(.* java 11 .*$

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.70.0](https://github.com/aws/jsii/compare/v1.69.0...v1.70.0) (2022-10-19)
+
+
+### Features
+
+* add error awareness to go deserialization ([#3793](https://github.com/aws/jsii/issues/3793)) ([9b6a307](https://github.com/aws/jsii/commit/9b6a3072ae4c95be152196f8fea36237fa2d0f99))
+* **python:** add error differentiation to Python. ([#3772](https://github.com/aws/jsii/issues/3772)) ([e3f7d5e](https://github.com/aws/jsii/commit/e3f7d5e2c9683b13092e4ba05c13ade8b2a5e823))
+* **superchain:** add 'acl' package to support projen GHA ([#3783](https://github.com/aws/jsii/issues/3783)) ([306b248](https://github.com/aws/jsii/commit/306b24845d6b36a7079ddb88aaeab2847f7bb238))
+
+
+### Bug Fixes
+
+* **jsii-reflect:** TypeMember is not SourceLocatable ([#3778](https://github.com/aws/jsii/issues/3778)) ([db809e2](https://github.com/aws/jsii/commit/db809e212735b559d54e96666a2be6b18e432893)), closes [#3777](https://github.com/aws/jsii/issues/3777)
+* **python:** KeyError in type checks when decorating methods ([#3791](https://github.com/aws/jsii/issues/3791)) ([dae724c](https://github.com/aws/jsii/commit/dae724c39ba274c6facd8fb9f4b93cc2db52e311))
+
 ## [1.69.0](https://github.com/aws/jsii/compare/v1.68.0...v1.69.0) (2022-09-27)
 
 

CONTRIBUTING.md

@@ -50,13 +50,15 @@ in your development environment.
   + [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
   + [`wheel`](https://pypi.org/project/wheel/)
   + *Recommended:* [`twine`](https://pypi.org/project/twine/)
+- [Go] `1.18` or newer
 
 [Node `14.6.0`]: https://nodejs.org/download/release/v14.6.0/
 [Yarn `1.19.1`]: https://yarnpkg.com/en/docs/install
 [Oracle's OpenJDK8]: http://openjdk.java.net/install/
 [Amazon Corretto 8]: https://aws.amazon.com/corretto/
 [.NET Core `3.1`]: https://www.microsoft.com/net/download
 [Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
+[Go]: https://go.dev/dl/
 
 ## Getting Started
 ### Bootstrapping

README.md

@@ -95,7 +95,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/cgarvis"><img src="https://avatars.githubusercontent.com/u/213125?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Garvis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=cgarvis" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/ChristopheVico"><img src="https://avatars.githubusercontent.com/u/56592817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christophe Vico</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AChristopheVico+label%3Abug" title="Bug reports">🐛</a></td>
       <td align="center"><a href="https://github.com/christophercurrie"><img src="https://avatars0.githubusercontent.com/u/19510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Currie</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=christophercurrie" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Achristophercurrie+label%3Afeature-request" title="Feature requests">🤔</a></td>
-      <td align="center"><a href="https://rybicki.io/"><img src="https://avatars2.githubusercontent.com/u/5008987?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Rybicki</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Chriscbr" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://rybicki.io/"><img src="https://avatars2.githubusercontent.com/u/5008987?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Rybicki</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Chriscbr" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3AChriscbr+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=Chriscbr" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/CommanderRoot"><img src="https://avatars.githubusercontent.com/u/4395417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CommanderRoot</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=CommanderRoot" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/corymhall"><img src="https://avatars.githubusercontent.com/u/43035978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Hall</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Acorymhall+label%3Abug" title="Bug reports">🐛</a></td>
       <td align="center"><a href="http://mcristi.wordpress.com"><img src="https://avatars.githubusercontent.com/u/95209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristian Măgherușan-Stanciu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACristim+label%3Abug" title="Bug reports">🐛</a></td>

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
-mkdocs~=1.3.1
+mkdocs~=1.4.1
 mkdocs-awesome-pages-plugin~=2.8.0
-mkdocs-material~=8.5.3
+mkdocs-material~=8.5.6
 mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.69.0"
+  "version": "1.70.0"
 }

package.json

@@ -16,22 +16,22 @@
   },
   "devDependencies": {
     "@jest/types": "^28.1.3",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^14.18.29",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
-    "all-contributors-cli": "^6.20.4",
-    "eslint": "^8.23.1",
+    "@types/jest": "^29.2.0",
+    "@types/node": "^14.18.32",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
+    "all-contributors-cli": "^6.24.0",
+    "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.5.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.0.3",
+    "jest": "^29.2.1",
     "jest-circus": "^28.1.3",
     "jest-config": "^28.1.3",
-    "jest-expect-message": "^1.1.2",
-    "lerna": "^5.5.2",
+    "jest-expect-message": "^1.1.3",
+    "lerna": "^6.0.1",
     "prettier": "^2.7.1",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",

packages/@jsii/Directory.Build.targets

@@ -2,15 +2,15 @@
   <ItemGroup>
     <!-- Central configuration of dependency versions for all DotNet packages -->
 
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
     <PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
 
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Update="NSubstitute" Version="4.4.0" />
     <PackageReference Update="xunit" Version="2.4.2" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />

packages/@jsii/check-node/package.json

@@ -37,6 +37,6 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "semver": "^7.3.7"
+    "semver": "^7.3.8"
   }
 }

packages/@jsii/dotnet-runtime/package.json

@@ -41,6 +41,6 @@
     "@jsii/runtime": "^0.0.0",
     "@types/semver": "^7.3.12",
     "jsii-build-tools": "^0.0.0",
-    "semver": "^7.3.7"
+    "semver": "^7.3.8"
   }
 }

packages/@jsii/go-runtime-test/project/compliance_test.go

@@ -1536,15 +1536,13 @@ func (i ImplementsStructReturningDelegate) ReturnStruct() *calc.StructB {
 }
 
 func (suite *ComplianceSuite) TestExceptions() {
-
 	require := suite.Require()
 
 	calc3 := calc.NewCalculator(&calc.CalculatorProps{InitialValue: jsii.Number(20), MaximumValue: jsii.Number(30)})
 	calc3.Add(jsii.Number(3))
 	require.Equal(float64(23), *calc3.Value())
 
-	// TODO: should assert the actual error here - not working for some reasons
-	require.Panics(func() {
+	require.PanicsWithError("Error: Operation 33 exceeded maximum value 30", func() {
 		calc3.Add(jsii.Number(10))
 	})
 

packages/@jsii/go-runtime-test/project/go.mod

@@ -1,6 +1,6 @@
 module github.com/aws/jsii/go-runtime-test
 
-go 1.16
+go 1.18
 
 require (
 	github.com/aws/jsii-runtime-go v0.0.0
@@ -12,6 +12,19 @@ require (
 	golang.org/x/tools v0.1.12
 )
 
+require (
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
 replace (
 	github.com/aws/jsii-runtime-go v0.0.0 => ../../go-runtime/jsii-runtime-go
 	github.com/aws/jsii/jsii-calc/go/jcb v0.0.0 => ../jsii-calc/go/jcb

packages/@jsii/go-runtime/jsii-runtime-go/go.mod

@@ -1,6 +1,6 @@
 module github.com/aws/jsii-runtime-go
 
-go 1.16
+go 1.18
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
@@ -10,4 +10,14 @@ require (
 	golang.org/x/tools v0.1.12
 )
 
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
 retract v1.27.0

packages/@jsii/go-runtime/jsii-runtime-go/go.sum

@@ -16,38 +16,24 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 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/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=