chore(ci): remove tokens and add windows to ci (#313)

aajtodd · web-flow · commit b95deb55441d · 2021-11-12T13:17:50.000-05:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,42 +19,61 @@ jobs:
   linux-compat:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-    - name: Build and Test ${{ env.PACKAGE_NAME }}
-      run: |
-        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
-        chmod a+x builder.pyz
-        echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
-        ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build and Test ${{ env.PACKAGE_NAME }}
+        run: |
+          python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
+          chmod a+x builder.pyz
+          echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
+          ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
 
   macos-compat:
     runs-on: macos-latest
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-    - name: Build and Test ${{ env.PACKAGE_NAME }}
-      env:
-        CI_USER: ${{ secrets.CI_USER}}
-        CI_ACCESS_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }}
-      run: |
-        python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
-        chmod a+x builder.pyz
-        echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
-        GIT_ASKPASS="$(pwd)/.github/scripts/git-ci-askpass.sh" ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build and Test ${{ env.PACKAGE_NAME }}
+        run: |
+          python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
+          chmod a+x builder.pyz
+          echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
+          ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
+
+  windows-compat:
+    runs-on: windows-2019
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'gradle'
+      - name: Modify Gradle Daemon JVM Args
+        # windows job runs out of memory with the defaults normally used
+        shell: bash
+        run: |
+          sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx4g/' gradle.properties
+          cat gradle.properties
+      - name: Build and Test ${{ env.PACKAGE_NAME }}
+        run: |
+          python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
+          java -version
+          python3 builder.pyz build -p ${{ env.PACKAGE_NAME }}
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/config/imds/ImdsClientTest.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/config/imds/ImdsClientTest.kt
@@ -13,6 +13,7 @@ import aws.smithy.kotlin.runtime.http.HttpStatusCode
 import aws.smithy.kotlin.runtime.http.operation.Endpoint
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.httptest.buildTestConnection
+import aws.smithy.kotlin.runtime.testing.IgnoreWindows
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.ManualClock
 import aws.smithy.kotlin.runtime.time.epochMilliseconds
@@ -209,6 +210,7 @@ class ImdsClientTest {
         connection.assertRequests()
     }
 
+    @IgnoreWindows("DNS fails faster on windows and results in a different error")
     @Test
     fun testHttpConnectTimeouts(): Unit = runSuspendTest {
         // end-to-end real client times out after 1-second
@@ -218,14 +220,16 @@ class ImdsClientTest {
         }
 
         val start = Instant.now()
-        assertFails {
+        val ex = assertFails {
             withTimeout(3000) {
                 client.get("/latest/metadata")
             }
-        }.message.shouldContain("timed out")
+        }
+        // on windows DNS fails faster with message `socket connect failure, no route to host.
+        assertTrue(ex.message!!.contains("timed out"), "message `${ex.message}`")
         val elapsed = Instant.now().epochMilliseconds - start.epochMilliseconds
-        assertTrue(elapsed >= 1000)
-        assertTrue(elapsed < 2000)
+        assertTrue(elapsed >= 1000, "expected elapsed ms to be greater than 1000; actual = $elapsed")
+        assertTrue(elapsed < 2000, "expected elapsed ms to be less than 2000; actual = $elapsed")
     }
 
     data class ImdsConfigTest(
diff --git a/aws-runtime/http-client-engine-crt/common/src/aws/sdk/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt b/aws-runtime/http-client-engine-crt/common/src/aws/sdk/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt
@@ -169,6 +169,7 @@ internal class SdkStreamResponseHandler(
 
         if (forceClose) {
             conn.shutdown()
+            conn.close()
         }
     }
 }
diff --git a/aws-runtime/http-client-engine-crt/jvm/test/aws/sdk/kotlin/runtime/http/engine/crt/AsyncStressTest.kt b/aws-runtime/http-client-engine-crt/jvm/test/aws/sdk/kotlin/runtime/http/engine/crt/AsyncStressTest.kt
@@ -14,6 +14,7 @@ import aws.smithy.kotlin.runtime.http.request.url
 import aws.smithy.kotlin.runtime.http.response.complete
 import aws.smithy.kotlin.runtime.http.sdkHttpClient
 import aws.smithy.kotlin.runtime.httptest.TestWithLocalServer
+import aws.smithy.kotlin.runtime.testing.IgnoreWindows
 import io.ktor.application.*
 import io.ktor.response.*
 import io.ktor.routing.*
@@ -70,6 +71,7 @@ class AsyncStressTest : TestWithLocalServer() {
         }
     }
 
+    @IgnoreWindows("https://github.com/awslabs/aws-sdk-kotlin/issues/413")
     @OptIn(ExperimentalTime::class)
     @Test
     fun testStreamNotConsumed() = runSuspendTest {
diff --git a/builder.json b/builder.json
@@ -12,6 +12,12 @@
     "env": {
         "JAVA_HOME": "{java_home}"
     },
+    "hosts": {
+        "windows": {
+            "!imports": [],
+            "!env": {}
+        }
+    },
     "_comment": "prebuild step defined in .builder/actions/set_upstream_versions.py",
     "pre_build_steps": [
         "set-upstream-versions"
diff --git a/codegen/protocol-tests/build.gradle.kts b/codegen/protocol-tests/build.gradle.kts
@@ -163,12 +163,10 @@ open class ProtocolTestTask : DefaultTask() {
         if (!generatedBuildDir.exists()) {
             throw GradleException("$generatedBuildDir does not exist")
         }
-        val gradlew = project.rootProject.file("gradlew").absolutePath
+        val wrapper = if (System.getProperty("os.name").toLowerCase().contains("windows")) "gradlew.bat" else "gradlew"
+        val gradlew = project.rootProject.file(wrapper).absolutePath
 
-        // FIXME - this still requires us to publish to maven local.
-        // We might be able to do something clever with an init script by overriding dependencies or something
-        // and passing as a cli arg to gradle invocation
-        // https://docs.gradle.org/current/userguide/init_scripts.html
+        // NOTE - this still requires us to publish to maven local.
         project.exec {
             workingDir = generatedBuildDir
             executable = gradlew
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,6 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 
 # gradle
-# FIXME - see https://github.com/Kotlin/dokka/issues/1405
 org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:MaxMetaspaceSize=1G
 
 # sdk

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ internal class SdkStreamResponseHandler(`
`169`	`169`
`170`	`170`	`if (forceClose) {`
`171`	`171`	`conn.shutdown()`
	`172`	`+ conn.close()`
`172`	`173`	`}`
`173`	`174`	`}`
`174`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import aws.smithy.kotlin.runtime.http.request.url`
`14`	`14`	`import aws.smithy.kotlin.runtime.http.response.complete`
`15`	`15`	`import aws.smithy.kotlin.runtime.http.sdkHttpClient`
`16`	`16`	`import aws.smithy.kotlin.runtime.httptest.TestWithLocalServer`
	`17`	`+import aws.smithy.kotlin.runtime.testing.IgnoreWindows`
`17`	`18`	`import io.ktor.application.*`
`18`	`19`	`import io.ktor.response.*`
`19`	`20`	`import io.ktor.routing.*`
`@@ -70,6 +71,7 @@ class AsyncStressTest : TestWithLocalServer() {`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`
	`74`	`+ @IgnoreWindows("https://github.com/awslabs/aws-sdk-kotlin/issues/413")`
`73`	`75`	`@OptIn(ExperimentalTime::class)`
`74`	`76`	`@Test`
`75`	`77`	`fun testStreamNotConsumed() = runSuspendTest {`