Skip to content

Commit

Permalink
chore(release): 1.66.0 (#3732)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Aug 29, 2022
2 parents b0947e4 + b36b81b commit 3c9512b
Show file tree
Hide file tree
Showing 83 changed files with 15,404 additions and 3,263 deletions.
8 changes: 0 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ updates:
ignore:
- dependency-name: "setuptools"

- package-ecosystem: gomod
directory: '/packages/@jsii/go-runtime'
schedule:
interval: daily
labels:
- dependencies
- language/go

- package-ecosystem: gomod
directory: '/packages/@jsii/go-runtime/jsii-runtime-go'
schedule:
Expand Down
45 changes: 32 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
- name: Set up Go 1.16
- name: Set up Go 1.18
uses: actions/setup-go@v3
with:
go-version: '1.16'
go-version: '1.18'
- name: Set up Java 8
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -126,10 +126,10 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
- name: Set up Go 1.16
- name: Set up Go 1.18
uses: actions/setup-go@v3
with:
go-version: '1.16'
go-version: '1.18'
- name: Set up Java 8
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -207,14 +207,14 @@ jobs:
test:
permissions:
contents: none
name: Test (${{ matrix.os }} / dotnet ${{ matrix.dotnet }} / java ${{ matrix.java }} / node ${{ matrix.node }} / python ${{ matrix.python }})
name: Test (${{ matrix.os }} / dotnet ${{ matrix.dotnet }} / go ${{ matrix.go }} / java ${{ matrix.java }} / node ${{ matrix.node }} / python ${{ matrix.python }})
needs: build
strategy:
fail-fast: false
matrix:
# All currently supported node versions (Maintenance LTS, Active LTS, Current)
dotnet: ['3.1.x']
go: ['1.16']
go: ['1.18']
java: ['8']
node:
- '14' # EOL 2023-04-30
Expand All @@ -227,47 +227,66 @@ jobs:
# Test using Windows
- os: windows-latest
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
java: '8'
node: '14'
python: '3.7'
# Test using macOS
- os: macos-latest
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
java: '8'
node: '14'
python: '3.7'
# Test alternate .NETs
- java: '8'
dotnet: '6.0.x'
go: '1.16'
go: '1.18'
node: '14'
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'
node: '14'
os: ubuntu-latest
python: '3.7'
# Test alternate Javas
- java: '11'
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
node: '14'
os: ubuntu-latest
python: '3.7'
# Test alternate Pythons
- python: '3.8'
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
java: '8'
node: '14'
os: ubuntu-latest
- python: '3.9'
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
java: '8'
node: '14'
os: ubuntu-latest
- python: '3.10'
dotnet: '3.1.x'
go: '1.16'
go: '1.18'
java: '8'
node: '14'
os: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ jobs:
body: |-
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
labels: contribution/core,dependencies,auto-approve
team-reviewers: aws-cdk-team
# Privileged token so automated PR validation happens
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.66.0](https://github.com/aws/jsii/compare/v1.65.1...v1.66.0) (2022-08-29)


### Features

* **go:** emit deprecation warning when using go1.16 and go1.17 ([#3718](https://github.com/aws/jsii/issues/3718)) ([3cf5c28](https://github.com/aws/jsii/commit/3cf5c28b26e189db1a05f9543a5f6f38583e8868))
* **go:** runtime type check type unions ([#3712](https://github.com/aws/jsii/issues/3712)) ([c73c2ee](https://github.com/aws/jsii/commit/c73c2ee6d973ea8ff14b320a5f97ae017107ebab))


### Bug Fixes

* **.net:** missing dynamic type checking for collection-nested unions ([#3720](https://github.com/aws/jsii/issues/3720)) ([362326e](https://github.com/aws/jsii/commit/362326e989e1d9f2a032d4c15c34f3d60e712051))
* **rosetta:** rosetta reader expects default tablet file to be uncompressed ([#3723](https://github.com/aws/jsii/issues/3723)) ([9768e2a](https://github.com/aws/jsii/commit/9768e2a7f2eb8847d8d06e3f40deeedac0c7dec4))
* type unions in variadic position leads to invalid code-gen ([#3722](https://github.com/aws/jsii/issues/3722)) ([93aec85](https://github.com/aws/jsii/commit/93aec85ada9fd9e505591766b8e87ee53c0bde6b))

## [1.65.1](https://github.com/aws/jsii/compare/v1.65.0...v1.65.1) (2022-08-29)


Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/user-guides/lib-author/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ to produce releasable artifacts.
| Language/Platform | SDK Requirement |
| ----------------- | ---------------------------- |
| .NET | .NET Core ≥ 3.1 / .NET ≥ 5.0 |
| Go | Go ≥ 1.16 |
| Go | Go ≥ 1.18 |
| Java | JDK ≥ 8 *and* Maven ≥ 3.6 |
| Python | Python ≥ 3.7 |

Expand Down
2 changes: 1 addition & 1 deletion gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.3.1
mkdocs-awesome-pages-plugin~=2.8.0
mkdocs-material~=8.4.0
mkdocs-material~=8.4.1
mkdocs-git-revision-date-plugin~=0.3.2
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.65.1"
"version": "1.66.0"
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
},
"devDependencies": {
"@jest/types": "^28.1.3",
"@types/jest": "^28.1.6",
"@types/node": "^14.18.23",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"@types/jest": "^28.1.7",
"@types/node": "^14.18.24",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"all-contributors-cli": "^6.20.0",
"eslint": "^8.21.0",
"eslint": "^8.22.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.4.0",
"eslint-import-resolver-typescript": "^3.4.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^28.1.3",
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.0.2",
"lerna": "^5.4.0",
"lerna": "^5.4.3",
"prettier": "^2.7.1",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/benchmarks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"fs-extra": "^10.1.0",
"jsii": "^0.0.0",
"npm": "^8.16.0",
"npm": "^8.17.0",
"tar": "^6.1.11",
"typescript": "~3.9.10",
"yargs": "^16.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,42 @@ public void AnonymousObjectIsValid()
Assert.IsType<AnonymousObject>(anonymousObject);
Assert.Equal("A", UseOptions.Consume(anonymousObject));
}

[Fact(DisplayName = Prefix + nameof(NestedUnion))]
public void NestedUnion()
{
var exception1 = Assert.Throws<System.ArgumentException>(() =>
new ClassWithNestedUnion(new object[] { 1337.42 }));
Assert.Equal("Expected argument unionProperty[0] to be one of: System.Collections.Generic.IDictionary<string, object>, object[]; received System.Double (Parameter 'unionProperty')", exception1.Message);

var exception2 = Assert.Throws<System.ArgumentException>(() =>
new ClassWithNestedUnion(new object[]
{ new object[] { new StructA { RequiredString = "present" }, 1337 } }));
Assert.Equal("Expected argument unionProperty[0][1] to be one of: Amazon.JSII.Tests.CalculatorNamespace.IStructA, Amazon.JSII.Tests.CalculatorNamespace.IStructB; received System.Int32 (Parameter 'unionProperty')", exception2.Message);

var exception3 = Assert.Throws<System.ArgumentException>(() =>
new ClassWithNestedUnion(new object[]
{
new Dictionary<string, object>
{
{ "good", new StructA { RequiredString = "present" } },
{ "bad", "Not a StructA or StructB" }
}
}));
Assert.Equal("Expected argument unionProperty[0][\"bad\"] to be one of: Amazon.JSII.Tests.CalculatorNamespace.IStructA, Amazon.JSII.Tests.CalculatorNamespace.IStructB; received System.String (Parameter 'unionProperty')", exception3.Message);
}

[Fact(DisplayName = Prefix + nameof(Variadic))]
public void Variadic()
{
var exception1 = Assert.Throws<System.ArgumentException>(() =>
new VariadicTypeUnion(
new StructA{RequiredString = "present"},
1337.42
));
Assert.Equal("Expected argument union[1] to be one of: Amazon.JSII.Tests.CalculatorNamespace.IStructA, Amazon.JSII.Tests.CalculatorNamespace.IStructB; received System.Double (Parameter 'union')", exception1.Message);

Assert.NotNull(new VariadicTypeUnion());
}
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/dotnet-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
"@types/semver": "^7.3.10",
"@types/semver": "^7.3.12",
"jsii-build-tools": "^0.0.0",
"semver": "^7.3.7"
}
Expand Down
31 changes: 0 additions & 31 deletions packages/@jsii/go-runtime-test/build-tools/go-run.ts

This file was deleted.

7 changes: 3 additions & 4 deletions packages/@jsii/go-runtime-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
"description": "",
"scripts": {
"build": "tsc --build && yarn gen:calc",
"fmt": "yarn --silent go:run goimports -w .",
"lint": "cd project && go vet ./... && yarn --silent go:run golint ./...",
"fmt": "cd project && go run golang.org/x/tools/cmd/goimports -w .",
"lint": "cd project && go vet ./... && go run golang.org/x/lint/golint ./...",
"test": "cd project && go test ./...",
"lint:fix": "yarn lint && yarn fmt",
"gen:calc": "node build-tools/gen-calc.js",
"go:run": "cd project && go mod download && node ../build-tools/go-run.js"
"gen:calc": "node build-tools/gen-calc.js"
},
"keywords": [],
"author": "",
Expand Down
22 changes: 6 additions & 16 deletions packages/@jsii/go-runtime-test/project/go.mod
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
module github.com/aws/jsii/go-runtime-test

go 1.17
go 1.16

require (
github.com/aws/jsii-runtime-go v0.0.0
github.com/aws/jsii/jsii-calc/go/jcb v0.0.0
github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 v3.20.120
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
github.com/stretchr/testify v1.8.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
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/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace (
github.com/aws/jsii-runtime-go => ../../go-runtime/jsii-runtime-go
github.com/aws/jsii/jsii-calc/go/jcb => ../jsii-calc/go/jcb
github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 => ../jsii-calc/go/jsiicalc
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
github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 v3.20.120 => ../jsii-calc/go/jsiicalc
github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 => ../jsii-calc/go/scopejsiicalcbaseofbase
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib => ../jsii-calc/go/scopejsiicalclib
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview => ../jsii-calc/go/scopejsiicalclib
)
7 changes: 6 additions & 1 deletion packages/@jsii/go-runtime-test/project/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
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=
Expand All @@ -22,6 +25,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
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=
Expand All @@ -30,8 +34,9 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
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 h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
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=
Expand Down
Loading

0 comments on commit 3c9512b

Please sign in to comment.