Merge branch 'master' of https://github.com/aws/jsii into add_bin_scr…

…ipt_folder

.github/workflows/dependabot.yml

@@ -8,6 +8,7 @@ on:
     paths:
       - "!**"               # <-- Excludes everything by default
       - "**/package.json"   # <-- Allows modfying any package.json
+      - "**/*.csproj"       # <-- Allows modifying any .csproj file
       - "yarn.lock"         # <-- Allows modifying yarn.lock
 
 jobs:
@@ -16,6 +17,9 @@ jobs:
     if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]'
     runs-on: ubuntu-latest
     steps:
-      - uses: hmarr/auto-approve-action@v2.0.0
+      - name: Request @dependabot auto-merge
+        uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
-          github-token: "${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }}"
+          command: 'squash and merge'
+          github-token: ${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }}
+          target: minor

.github/workflows/main.yml

@@ -204,7 +204,7 @@ jobs:
             python: '3.6'
           # Test alternate .NETs
           - java: '8'
-            dotnet: '5.0.100-rc.1' # Pre-release matching requires exact version for now
+            dotnet: '5.0.100-rc.1.20452.10' # Pre-release matching requires exact version for now
             node: '10'
             os: ubuntu-latest
             python: '3.6'

package.json

@@ -15,13 +15,13 @@
     "test:update": "lerna run test:update --concurrency=1 --stream"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.1.1",
-    "@typescript-eslint/parser": "^4.1.1",
-    "eslint": "^7.9.0",
-    "eslint-config-prettier": "^6.11.0",
+    "@typescript-eslint/eslint-plugin": "^4.3.0",
+    "@typescript-eslint/parser": "^4.3.0",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.3.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.1.4",
     "lerna": "^3.22.1",
     "prettier": "^2.1.2",

packages/@jsii/dotnet-runtime-test/generate.sh

@@ -1,9 +1,20 @@
 #!/bin/bash
 set -euo pipefail
 test="./test"
+genRoot="${test}/generated"
 
-# Generate NuGet packages for jsii-calc and its dependencies.
-jsii-pacmak -t dotnet --recurse -o ${test}/generated ../../jsii-calc
+# Clean up before we start working
+rm -rf ${genRoot}
+
+# Generate .NET projects for jsii-calc and its dependencies.
+jsii-pacmak -t dotnet --code-only --recurse -o ${genRoot} ../../jsii-calc
+
+# Hack around project references to de-duplicate Amazon.JSII.Runtime in generated code.
+for csproj in ${genRoot}/dotnet/*/*.csproj
+do
+  dotnet remove ${csproj} package Amazon.JSII.Runtime
+  dotnet add    ${csproj} reference ../dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj
+done
 
 # Generate Directory.Build.props
 /usr/bin/env node ./Directory.Build.props.t.js > ${test}/Directory.Build.props

packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj

@@ -24,14 +24,18 @@
         <PackageReference Include="Microsoft.Extensions.Logging" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="Newtonsoft.Json" />
-        <PackageReference Include="xunit"/>
-        <PackageReference Include="xunit.runner.visualstudio"/>
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio" />
         <PackageReference Include="XunitXml.TestLogger" />
-        <DotNetCliToolReference Include="dotnet-xunit"/>
+        <DotNetCliToolReference Include="dotnet-xunit" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\dotnet-runtime\src\Amazon.JSII.Runtime\Amazon.JSII.Runtime.csproj" />
+        <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj" />
+        <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj" />
+        <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj" />
+        <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId\Amazon.JSII.Tests.CalculatorPackageId.csproj" />
     </ItemGroup>
 
 </Project>

packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime.IntegrationTests", "Amazon.JSII.Runtime.IntegrationTests\Amazon.JSII.Runtime.IntegrationTests.csproj", "{CE3CAFBD-25F8-422D-925A-8F9CCEA1F548}"
@@ -9,6 +9,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.JsonModel", "..
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Amazon.JSII.Runtime.IntegrationTests.FSharp", "Amazon.JSII.Runtime.IntegrationTests.FSharp\Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj", "{224406B0-12D5-408C-91E9-7420F72C2855}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generated", "generated", "{5B76E4C5-B66F-4263-87A4-111E944AB744}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{37A4E9E1-89D6-42FC-AF9D-4C4453D29857}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId", "generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj", "{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId", "generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj", "{A1287897-A767-4F1E-B83E-874797851732}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId", "generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj", "{A2830012-1C9D-4D42-80B1-61A360AFA3C9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Tests.CalculatorPackageId", "generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId\Amazon.JSII.Tests.CalculatorPackageId.csproj", "{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,5 +43,28 @@ Global
 		{224406B0-12D5-408C-91E9-7420F72C2855}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{224406B0-12D5-408C-91E9-7420F72C2855}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{224406B0-12D5-408C-91E9-7420F72C2855}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1287897-A767-4F1E-B83E-874797851732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1287897-A767-4F1E-B83E-874797851732}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1287897-A767-4F1E-B83E-874797851732}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1287897-A767-4F1E-B83E-874797851732}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2830012-1C9D-4D42-80B1-61A360AFA3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2830012-1C9D-4D42-80B1-61A360AFA3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2830012-1C9D-4D42-80B1-61A360AFA3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2830012-1C9D-4D42-80B1-61A360AFA3C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{37A4E9E1-89D6-42FC-AF9D-4C4453D29857} = {5B76E4C5-B66F-4263-87A4-111E944AB744}
+		{BBF82641-F1B7-44CC-BFE6-C82E6B00BC13} = {37A4E9E1-89D6-42FC-AF9D-4C4453D29857}
+		{A1287897-A767-4F1E-B83E-874797851732} = {37A4E9E1-89D6-42FC-AF9D-4C4453D29857}
+		{A2830012-1C9D-4D42-80B1-61A360AFA3C9} = {37A4E9E1-89D6-42FC-AF9D-4C4453D29857}
+		{B246A5D7-FF6F-47B1-A47B-6B2B3205A2FC} = {37A4E9E1-89D6-42FC-AF9D-4C4453D29857}
 	EndGlobalSection
 EndGlobal

packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj

@@ -29,6 +29,10 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\..\dotnet-runtime\src\Amazon.JSII.Runtime\Amazon.JSII.Runtime.csproj" />
+      <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj" />
+      <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId\Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj" />
+      <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId\Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj" />
+      <ProjectReference Include="..\generated\dotnet\Amazon.JSII.Tests.CalculatorPackageId\Amazon.JSII.Tests.CalculatorPackageId.csproj" />
     </ItemGroup>
 
 </Project>

packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs

@@ -1476,5 +1476,41 @@ public override object GiveItBack(object value) {
                 return value;
             }
         }
+
+        [Fact(DisplayName = Prefix + nameof(Iso8601DoesNotDeserializeToDate))]
+        public void Iso8601DoesNotDeserializeToDate()
+        {
+            var now = $"{DateTime.UtcNow.ToString("s")}Z";
+            var wallClock = new WallClock(now);
+            var entropy = new MildEntropy(wallClock);
+
+            Assert.Equal(now, entropy.Increase());
+        }
+
+        private sealed class WallClock: DeputyBase, IWallClock
+        {
+            private String _frozenTime;
+
+            public WallClock(String frozenTime)
+            {
+                _frozenTime = frozenTime;
+            }
+
+            public String Iso8601Now()
+            {
+                return _frozenTime;
+            }
+        }
+
+        private sealed class MildEntropy: Entropy
+        {
+            public MildEntropy(IWallClock clock): base(clock)
+            {
+            }
+            public override String Repeat(String word)
+            {
+                return word;
+            }
+        }
     }
 }

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Client.cs

@@ -100,7 +100,10 @@ TResponse ReceiveResponse<TResponse>()
 
         TResponse TryDeserialize<TResponse>(string responseJson) where TResponse : class, IKernelResponse
         {
-            JObject responseObject = (JObject)JsonConvert.DeserializeObject(responseJson)!;
+            JObject responseObject = (JObject)JsonConvert.DeserializeObject(responseJson, new JsonSerializerSettings
+            {
+                DateParseHandling = DateParseHandling.None
+            })!;
 
             if (responseObject.ContainsKey("error"))
             {

packages/@jsii/integ-test/package.json

@@ -32,7 +32,7 @@
     "@types/jest": "^26.0.14",
     "@types/node": "^10.17.35",
     "@types/tar": "^4.0.3",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "prettier": "^2.1.2",
     "typescript": "~3.9.7"
   },

packages/@jsii/java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java

@@ -27,12 +27,16 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -1776,4 +1780,26 @@ public void classesCanSelfReferenceDuringClassInitialization() {
         final OuterClass outerClass = new OuterClass();
         assertNotNull(outerClass.getInnerClass());
     }
+
+    @Test
+    public void iso8601DoesNotDeserializeToDate() {
+        final TimeZone tz = TimeZone.getTimeZone("UTC");
+        final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
+        df.setTimeZone(tz);
+        final String nowAsISO = df.format(new Date());
+
+        final IWallClock wallClock = new IWallClock() {
+            public String iso8601Now() {
+                return nowAsISO;
+            }
+        };
+
+        final Entropy entropy = new Entropy(wallClock) {
+            public String repeat(final String word) {
+                return word;
+            }
+        };
+
+        assertEquals(nowAsISO, entropy.increase());
+    }
 }

packages/@jsii/kernel/package.json

@@ -44,7 +44,7 @@
     "@types/jest-expect-message": "^1.0.2",
     "@types/node": "^10.17.35",
     "@types/tar": "^4.0.3",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "jest": "^26.4.2",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",

packages/@jsii/python-runtime/requirements.txt

@@ -1,5 +1,5 @@
 black~=20.8b1
-pytest~=6.0
+pytest~=6.1
 pytest-mypy~=0.7
 pip~=20.2
 setuptools~=50.3

packages/@jsii/python-runtime/tests/test_compliance.py

@@ -28,6 +28,7 @@
     DisappointingCollectionSource,
     DoNotOverridePrivates,
     DoubleTrouble,
+    Entropy,
     GreetingAugmenter,
     IBellRinger,
     IConcreteBellRinger,
@@ -37,6 +38,7 @@
     InterfaceCollections,
     IInterfaceWithProperties,
     IStructReturningDelegate,
+    IWallClock,
     Isomorphism,
     JsiiAgent,
     JSObjectLiteralForInterface,
@@ -1267,3 +1269,23 @@ def __init__(self):
 
 def test_kwargs_from_superinterface_are_working():
     assert Kwargs.method(extra="ordinary", prop=SomeEnum.SOME)
+
+
+def test_iso8601_does_not_deserialize_to_date():
+    @jsii.implements(IWallClock)
+    class WallClock:
+        def __init__(self, now: str):
+            self.now = now
+
+        def iso8601_now(self) -> str:
+            return self.now
+
+    class MildEntropy(Entropy):
+        def repeat(self, word: str) -> str:
+            return word
+
+    now = datetime.utcnow().isoformat() + "Z"
+    wall_clock = WallClock(now)
+    entropy = MildEntropy(wall_clock)
+
+    assert now == entropy.increase()

packages/@jsii/runtime/package.json

@@ -42,7 +42,7 @@
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/jest": "^26.0.14",
     "@types/node": "^10.17.35",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "jest": "^26.4.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",

packages/@jsii/spec/package.json

@@ -31,12 +31,12 @@
     "package": "package-js"
   },
   "dependencies": {
-    "jsonschema": "^1.2.6"
+    "jsonschema": "^1.2.7"
   },
   "devDependencies": {
     "@types/jest": "^26.0.14",
     "@types/node": "^10.17.35",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "jest": "^26.4.2",
     "jsii-build-tools": "^0.0.0",
     "prettier": "^2.1.2",

packages/codemaker/package.json

@@ -39,7 +39,7 @@
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.14",
     "@types/node": "^10.17.35",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "jest": "^26.4.2",
     "prettier": "^2.1.2",
     "typescript": "~3.9.7"

packages/jsii-calc/lib/compliance.ts

@@ -2820,3 +2820,23 @@ export class DynamicPropertyBearerChild extends DynamicPropertyBearer {
     return oldValue;
   }
 }
+
+/**
+ * Validates that nested classes get correct code generation for the occasional
+ * forward reference.
+ */
+export class LevelOne {
+  public constructor(public readonly props: LevelOneProps) {}
+}
+export interface LevelOneProps {
+  readonly prop: LevelOne.PropProperty;
+}
+export namespace LevelOne {
+  export interface PropProperty {
+    readonly prop: PropBooleanValue;
+  }
+
+  export interface PropBooleanValue {
+    readonly value: boolean;
+  }
+}