@cloudsnorkel/cdk-github-runners 0.7.5 → 0.7.6

package/.jsii

@@ -3184,7 +3184,7 @@
         },
         "locationInModule": {
           "filename": "src/providers/image-builders/ami.ts",
-          "line": 223
+          "line": 230
         },
         "parameters": [
           {
@@ -3215,7 +3215,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/providers/image-builders/ami.ts",
-        "line": 220
+        "line": 227
       },
       "methods": [
         {
@@ -3225,7 +3225,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/image-builders/ami.ts",
-            "line": 285
+            "line": 296
           },
           "name": "addComponent",
           "parameters": [
@@ -3245,7 +3245,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/image-builders/ami.ts",
-            "line": 300
+            "line": 311
           },
           "name": "addExtraCertificates",
           "parameters": [
@@ -3267,7 +3267,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/image-builders/ami.ts",
-            "line": 313
+            "line": 324
           },
           "name": "bind",
           "overrides": "@cloudsnorkel/cdk-github-runners.IAmiBuilder",
@@ -3438,7 +3438,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/image-builders/ami.ts",
-            "line": 271
+            "line": 282
           },
           "name": "prependComponent",
           "parameters": [
@@ -3599,6 +3599,25 @@
             "fqn": "@cloudsnorkel/cdk-github-runners.Architecture"
           }
         },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "true",
+            "remarks": "You may want to disable this if you are building a Windows image and don't have a Docker Desktop license.",
+            "stability": "experimental",
+            "summary": "Install Docker inside the image, so it can be used by the runner."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "src/providers/image-builders/ami.ts",
+            "line": 115
+          },
+          "name": "installDocker",
+          "optional": true,
+          "type": {
+            "primitive": "boolean"
+          }
+        },
         {
           "abstract": true,
           "docs": {
@@ -4480,7 +4499,16 @@
             {
               "name": "task",
               "type": {
-                "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                "union": {
+                  "types": [
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.Parallel"
+                    },
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                    }
+                  ]
+                }
               }
             },
             {
@@ -5680,7 +5708,16 @@
             {
               "name": "task",
               "type": {
-                "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                "union": {
+                  "types": [
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.Parallel"
+                    },
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                    }
+                  ]
+                }
               }
             },
             {
@@ -5734,7 +5771,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/ec2.ts",
-            "line": 370
+            "line": 402
           },
           "name": "grantStateMachine",
           "overrides": "@cloudsnorkel/cdk-github-runners.IRunnerProvider",
@@ -5803,7 +5840,7 @@
           },
           "locationInModule": {
             "filename": "src/providers/ec2.ts",
-            "line": 400
+            "line": 432
           },
           "name": "status",
           "overrides": "@cloudsnorkel/cdk-github-runners.IRunnerProvider",
@@ -5832,7 +5869,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/providers/ec2.ts",
-            "line": 421
+            "line": 453
           },
           "name": "connections",
           "overrides": "aws-cdk-lib.aws_ec2.IConnectable",
@@ -6177,7 +6214,16 @@
             {
               "name": "task",
               "type": {
-                "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                "union": {
+                  "types": [
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.Parallel"
+                    },
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                    }
+                  ]
+                }
               }
             },
             {
@@ -6825,7 +6871,7 @@
         },
         "locationInModule": {
           "filename": "src/runner.ts",
-          "line": 187
+          "line": 188
         },
         "parameters": [
           {
@@ -6852,7 +6898,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 169
+        "line": 170
       },
       "name": "GitHubRunners",
       "properties": [
@@ -6864,7 +6910,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 173
+            "line": 174
           },
           "name": "providers",
           "type": {
@@ -6884,7 +6930,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 178
+            "line": 179
           },
           "name": "secrets",
           "type": {
@@ -6898,7 +6944,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 187
+            "line": 188
           },
           "name": "props",
           "optional": true,
@@ -6920,7 +6966,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 24
+        "line": 25
       },
       "name": "GitHubRunnersProps",
       "properties": [
@@ -6935,7 +6981,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 47
+            "line": 48
           },
           "name": "allowPublicSubnet",
           "optional": true,
@@ -6953,7 +6999,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 79
+            "line": 80
           },
           "name": "extraCertificates",
           "optional": true,
@@ -6972,7 +7018,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 86
+            "line": 87
           },
           "name": "idleTimeout",
           "optional": true,
@@ -6990,7 +7036,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 93
+            "line": 94
           },
           "name": "logOptions",
           "optional": true,
@@ -7009,7 +7055,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 30
+            "line": 31
           },
           "name": "providers",
           "optional": true,
@@ -7032,7 +7078,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 52
+            "line": 53
           },
           "name": "securityGroup",
           "optional": true,
@@ -7050,7 +7096,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 35
+            "line": 36
           },
           "name": "vpc",
           "optional": true,
@@ -7068,7 +7114,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 40
+            "line": 41
           },
           "name": "vpcSubnets",
           "optional": true,
@@ -7279,7 +7325,8 @@
       "fqn": "@cloudsnorkel/cdk-github-runners.IRunnerProvider",
       "interfaces": [
         "aws-cdk-lib.aws_ec2.IConnectable",
-        "aws-cdk-lib.aws_iam.IGrantable"
+        "aws-cdk-lib.aws_iam.IGrantable",
+        "constructs.IConstruct"
       ],
       "kind": "interface",
       "locationInModule": {
@@ -7898,7 +7945,16 @@
             {
               "name": "task",
               "type": {
-                "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                "union": {
+                  "types": [
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.Parallel"
+                    },
+                    {
+                      "fqn": "aws-cdk-lib.aws_stepfunctions.TaskStateBase"
+                    }
+                  ]
+                }
               }
             },
             {
@@ -8710,7 +8766,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/runner.ts",
-        "line": 99
+        "line": 100
       },
       "name": "LogOptions",
       "properties": [
@@ -8724,7 +8780,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 110
+            "line": 111
           },
           "name": "includeExecutionData",
           "optional": true,
@@ -8742,7 +8798,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 117
+            "line": 118
           },
           "name": "level",
           "optional": true,
@@ -8759,7 +8815,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 103
+            "line": 104
           },
           "name": "logGroupName",
           "optional": true,
@@ -8778,7 +8834,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/runner.ts",
-            "line": 126
+            "line": 127
           },
           "name": "logRetention",
           "optional": true,
@@ -9994,6 +10050,6 @@
       "symbolId": "src/providers/image-builders/windows-components:WindowsComponents"
     }
   },
-  "version": "0.7.5",
-  "fingerprint": "laqJPG7tuKfwHJxSKRBzkd+Ep19fgids70hLEG6AxIE="
+  "version": "0.7.6",
+  "fingerprint": "ZZyPQhyjY7Cdx+RPoiCGbrij9KNR68fpSulMzukmnhg="
 }

package/API.md

@@ -2379,6 +2379,7 @@ const amiBuilderProps: AmiBuilderProps = { ... }
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.architecture">architecture</a></code> | <code><a href="#@cloudsnorkel/cdk-github-runners.Architecture">Architecture</a></code> | Image architecture. |
+| <code><a href="#@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.installDocker">installDocker</a></code> | <code>boolean</code> | Install Docker inside the image, so it can be used by the runner. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.instanceType">instanceType</a></code> | <code>aws-cdk-lib.aws_ec2.InstanceType</code> | The instance type used to build the image. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.logRemovalPolicy">logRemovalPolicy</a></code> | <code>aws-cdk-lib.RemovalPolicy</code> | Removal policy for logs of image builds. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.logRetention">logRetention</a></code> | <code>aws-cdk-lib.aws_logs.RetentionDays</code> | The number of days log events are kept in CloudWatch Logs. |
@@ -2405,6 +2406,21 @@ Image architecture.
 
 ---
 
+##### `installDocker`<sup>Optional</sup> <a name="installDocker" id="@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.installDocker"></a>
+
+```typescript
+public readonly installDocker: boolean;
+```
+
+- *Type:* boolean
+- *Default:* true
+
+Install Docker inside the image, so it can be used by the runner.
+
+You may want to disable this if you are building a Windows image and don't have a Docker Desktop license.
+
+---
+
 ##### `instanceType`<sup>Optional</sup> <a name="instanceType" id="@cloudsnorkel/cdk-github-runners.AmiBuilderProps.property.instanceType"></a>
 
 ```typescript
@@ -5691,7 +5707,7 @@ Log group name for the image builder where history of image builds can be analyz
 
 ### IRunnerProvider <a name="IRunnerProvider" id="@cloudsnorkel/cdk-github-runners.IRunnerProvider"></a>
 
-- *Extends:* aws-cdk-lib.aws_ec2.IConnectable, aws-cdk-lib.aws_iam.IGrantable
+- *Extends:* aws-cdk-lib.aws_ec2.IConnectable, aws-cdk-lib.aws_iam.IGrantable, constructs.IConstruct
 
 - *Implemented By:* <a href="#@cloudsnorkel/cdk-github-runners.CodeBuildRunner">CodeBuildRunner</a>, <a href="#@cloudsnorkel/cdk-github-runners.Ec2Runner">Ec2Runner</a>, <a href="#@cloudsnorkel/cdk-github-runners.FargateRunner">FargateRunner</a>, <a href="#@cloudsnorkel/cdk-github-runners.LambdaRunner">LambdaRunner</a>, <a href="#@cloudsnorkel/cdk-github-runners.IRunnerProvider">IRunnerProvider</a>
 
@@ -5770,6 +5786,7 @@ grantable for the status function.
 | --- | --- | --- |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.connections">connections</a></code> | <code>aws-cdk-lib.aws_ec2.Connections</code> | The network connections associated with this resource. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.grantPrincipal">grantPrincipal</a></code> | <code>aws-cdk-lib.aws_iam.IPrincipal</code> | The principal to grant permissions to. |
+| <code><a href="#@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.node">node</a></code> | <code>constructs.Node</code> | The tree node. |
 | <code><a href="#@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.labels">labels</a></code> | <code>string[]</code> | GitHub Actions labels used for this provider. |
 
 ---
@@ -5798,6 +5815,18 @@ The principal to grant permissions to.
 
 ---
 
+##### `node`<sup>Required</sup> <a name="node" id="@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.node"></a>
+
+```typescript
+public readonly node: Node;
+```
+
+- *Type:* constructs.Node
+
+The tree node.
+
+---
+
 ##### `labels`<sup>Required</sup> <a name="labels" id="@cloudsnorkel/cdk-github-runners.IRunnerProvider.property.labels"></a>
 
 ```typescript

package/lib/lambdas/delete-runner/index.js

@@ -6849,6 +6849,11 @@ var require_lib3 = __commonJS({
       const dest = new URL$1(destination).hostname;
       return orig === dest || orig[orig.length - dest.length - 1] === "." && orig.endsWith(dest);
     };
+    var isSameProtocol = function isSameProtocol2(destination, original) {
+      const orig = new URL$1(original).protocol;
+      const dest = new URL$1(destination).protocol;
+      return orig === dest;
+    };
     function fetch(url, opts) {
       if (!fetch.Promise) {
         throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
@@ -6864,7 +6869,7 @@ var require_lib3 = __commonJS({
           let error = new AbortError("The user aborted a request.");
           reject(error);
           if (request.body && request.body instanceof Stream.Readable) {
-            request.body.destroy(error);
+            destroyStream(request.body, error);
           }
           if (!response || !response.body)
             return;
@@ -6899,8 +6904,29 @@ var require_lib3 = __commonJS({
         }
         req.on("error", function(err) {
           reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, "system", err));
+          if (response && response.body) {
+            destroyStream(response.body, err);
+          }
           finalize();
         });
+        fixResponseChunkedTransferBadEnding(req, function(err) {
+          if (signal && signal.aborted) {
+            return;
+          }
+          destroyStream(response.body, err);
+        });
+        if (parseInt(process.version.substring(1)) < 14) {
+          req.on("socket", function(s) {
+            s.addListener("close", function(hadError) {
+              const hasDataListener = s.listenerCount("data") > 0;
+              if (response && hasDataListener && !hadError && !(signal && signal.aborted)) {
+                const err = new Error("Premature close");
+                err.code = "ERR_STREAM_PREMATURE_CLOSE";
+                response.body.emit("error", err);
+              }
+            });
+          });
+        }
         req.on("response", function(res) {
           clearTimeout(reqTimeout);
           const headers = createHeadersLenient(res.headers);
@@ -6951,7 +6977,7 @@ var require_lib3 = __commonJS({
                   timeout: request.timeout,
                   size: request.size
                 };
-                if (!isDomainOrSubdomain(request.url, locationURL)) {
+                if (!isDomainOrSubdomain(request.url, locationURL) || !isSameProtocol(request.url, locationURL)) {
                   for (const name of ["authorization", "www-authenticate", "cookie", "cookie2"]) {
                     requestOpts.headers.delete(name);
                   }
@@ -7012,6 +7038,12 @@ var require_lib3 = __commonJS({
               response = new Response(body, response_options);
               resolve(response);
             });
+            raw.on("end", function() {
+              if (!response) {
+                response = new Response(body, response_options);
+                resolve(response);
+              }
+            });
             return;
           }
           if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
@@ -7026,6 +7058,33 @@ var require_lib3 = __commonJS({
         writeToStream(req, request);
       });
     }
+    function fixResponseChunkedTransferBadEnding(request, errorCallback) {
+      let socket;
+      request.on("socket", function(s) {
+        socket = s;
+      });
+      request.on("response", function(response) {
+        const headers = response.headers;
+        if (headers["transfer-encoding"] === "chunked" && !headers["content-length"]) {
+          response.once("close", function(hadError) {
+            const hasDataListener = socket.listenerCount("data") > 0;
+            if (hasDataListener && !hadError) {
+              const err = new Error("Premature close");
+              err.code = "ERR_STREAM_PREMATURE_CLOSE";
+              errorCallback(err);
+            }
+          });
+        }
+      });
+    }
+    function destroyStream(stream, err) {
+      if (stream.destroy) {
+        stream.destroy(err);
+      } else {
+        stream.emit("error", err);
+        stream.end();
+      }
+    }
     fetch.isRedirect = function(code) {
       return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
     };
@@ -8785,7 +8844,7 @@ var require_dist_node14 = __commonJS({
     var authOauthDevice = require_dist_node13();
     var oauthMethods = require_dist_node12();
     var btoa = _interopDefault(require_btoa_node());
-    var VERSION = "2.0.4";
+    var VERSION = "2.1.0";
     async function getAuthentication(state) {
       if ("code" in state.strategyOptions) {
         const {
@@ -8794,6 +8853,7 @@ var require_dist_node14 = __commonJS({
           clientId: state.clientId,
           clientSecret: state.clientSecret,
           clientType: state.clientType,
+          onTokenCreated: state.onTokenCreated,
           ...state.strategyOptions,
           request: state.request
         });
@@ -8807,6 +8867,7 @@ var require_dist_node14 = __commonJS({
         const deviceAuth = authOauthDevice.createOAuthDeviceAuth({
           clientType: state.clientType,
           clientId: state.clientId,
+          onTokenCreated: state.onTokenCreated,
           ...state.strategyOptions,
           request: state.request
         });
@@ -8825,6 +8886,7 @@ var require_dist_node14 = __commonJS({
           clientId: state.clientId,
           clientSecret: state.clientSecret,
           clientType: state.clientType,
+          onTokenCreated: state.onTokenCreated,
           ...state.strategyOptions
         };
       }
@@ -8857,12 +8919,16 @@ var require_dist_node14 = __commonJS({
         }
       }
       if (options.type === "refresh") {
+        var _state$onTokenCreated;
         if (state.clientType === "oauth-app") {
           throw new Error("[@octokit/auth-oauth-user] OAuth Apps do not support expiring tokens");
         }
         if (!currentAuthentication.hasOwnProperty("expiresAt")) {
           throw new Error("[@octokit/auth-oauth-user] Refresh token missing");
         }
+        await ((_state$onTokenCreated = state.onTokenCreated) === null || _state$onTokenCreated === void 0 ? void 0 : _state$onTokenCreated.call(state, state.authentication, {
+          type: options.type
+        }));
       }
       if (options.type === "check" || options.type === "reset") {
         const method = options.type === "check" ? oauthMethods.checkToken : oauthMethods.resetToken;
@@ -8883,6 +8949,12 @@ var require_dist_node14 = __commonJS({
             // @ts-expect-error TBD
             ...authentication
           };
+          if (options.type === "reset") {
+            var _state$onTokenCreated2;
+            await ((_state$onTokenCreated2 = state.onTokenCreated) === null || _state$onTokenCreated2 === void 0 ? void 0 : _state$onTokenCreated2.call(state, state.authentication, {
+              type: options.type
+            }));
+          }
           return state.authentication;
         } catch (error) {
           if (error.status === 404) {
@@ -8947,12 +9019,14 @@ var require_dist_node14 = __commonJS({
           "user-agent": `octokit-auth-oauth-app.js/${VERSION} ${universalUserAgent.getUserAgent()}`
         }
       }),
+      onTokenCreated,
       ...strategyOptions
     }) {
       const state = Object.assign({
         clientType,
         clientId,
         clientSecret,
+        onTokenCreated,
         strategyOptions,
         request: request$1
       });
@@ -13796,7 +13870,9 @@ var require_lodash = __commonJS({
           var isArr = isArray(value), isArg = !isArr && isArguments(value), isBuff = !isArr && !isArg && isBuffer(value), isType = !isArr && !isArg && !isBuff && isTypedArray(value), skipIndexes = isArr || isArg || isBuff || isType, result2 = skipIndexes ? baseTimes(value.length, String2) : [], length = result2.length;
           for (var key in value) {
             if ((inherited || hasOwnProperty.call(value, key)) && !(skipIndexes && // Safari 9 has enumerable `arguments.length` in strict mode.
-            (key == "length" || isBuff && (key == "offset" || key == "parent") || isType && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
+            (key == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
+            isBuff && (key == "offset" || key == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
+            isType && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
             isIndex(key, length)))) {
               result2.push(key);
             }