Merge branch 'release/v0.9.1' into master

github-aws-runners · Jan 22, 2021 · 8874635 · 8874635
2 parents c5f7442 + a7451f9
commit 8874635
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.1] - 2021-01-22
+
+### Fixed
+
+- fix(ghes): Corrects preview option #482 @mcaulifn @samuelb
+
 ## [0.9.0] - 2021-01-21
 
 ### Added
@@ -139,7 +145,8 @@ terraform import module.runners.module.webhook.aws_cloudwatch_log_group.webhook
 
 - First release.
 
-[unreleased]: https://github.com/philips-labs/terraform-aws-github-runner/compare/v0.9.0..HEAD
+[unreleased]: https://github.com/philips-labs/terraform-aws-github-runner/compare/v0.9.1..HEAD
+[0.9.1]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.9.0..v0.9.1
 [0.9.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.8.1..v0.9.0
 [0.8.1]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.9.0..v0.8.1
 [0.8.0]: https://github.com/philips-labs/terraform-aws-github-runner/releases/tag/v0.7.0..v0.9.0

diff --git a/examples/default/lambdas-download/main.tf b/examples/default/lambdas-download/main.tf
@@ -3,15 +3,15 @@ module "lambdas" {
   lambdas = [
     {
       name = "webhook"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runners"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runner-binaries-syncer"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     }
   ]
 }

diff --git a/examples/permissions-boundary/lambdas-download/main.tf b/examples/permissions-boundary/lambdas-download/main.tf
@@ -3,15 +3,15 @@ module "lambdas" {
   lambdas = [
     {
       name = "webhook"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runners"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runner-binaries-syncer"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     }
   ]
 }

diff --git a/modules/download-lambda/README.md b/modules/download-lambda/README.md
@@ -10,15 +10,15 @@ module "lambdas" {
   lambdas = [
     {
       name = "webhook"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runners"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     },
     {
       name = "runner-binaries-syncer"
-      tag  = "v0.9.0"
+      tag  = "v0.9.1"
     }
   ]
 }

diff --git a/modules/runners/lambdas/runners/src/scale-runners/gh-auth.test.ts b/modules/runners/lambdas/runners/src/scale-runners/gh-auth.test.ts
@@ -41,6 +41,7 @@ describe('Test createGithubAuth', () => {
 
     // Assert
     expect(result.request.endpoint.DEFAULTS.baseUrl).toBe(enterpriseServer);
+    expect(result.request.endpoint.DEFAULTS.mediaType.previews).toStrictEqual(['antiope']);
   });
 });
 

diff --git a/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts b/modules/runners/lambdas/runners/src/scale-runners/gh-auth.ts
@@ -11,6 +11,7 @@ export async function createOctoClient(token: string, ghesApiUrl: string = ''):
   };
   if (ghesApiUrl) {
     ocktokitOptions.baseUrl = ghesApiUrl;
+    ocktokitOptions.previews = ['antiope'];
   }
   return new Octokit(ocktokitOptions);
 }
@@ -51,7 +52,6 @@ export async function createGithubAuth(
   if (ghesApiUrl) {
     authOptions.request = request.defaults({
       baseUrl: ghesApiUrl,
-      mediaType: { previews: ['antiope'] }
     });
   }
   return await createAppAuth(authOptions)({ type: authType });
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ describe('Test createGithubAuth', () => { @@
         // Assert
         expect(result.request.endpoint.DEFAULTS.baseUrl).toBe(enterpriseServer);
+        expect(result.request.endpoint.DEFAULTS.mediaType.previews).toStrictEqual(['antiope']);
       });
     });
@@ Expand Down @@