From e87e26074af66ea169704c93ecfe959db79d70b7 Mon Sep 17 00:00:00 2001
From: Jamie Lynch <jamie.lynch@guardian.co.uk>
Date: Mon, 25 Jan 2021 14:25:13 +0000
Subject: [PATCH] move instance role to constructs

---
 .../iam/roles}/__snapshots__/instance-role.test.ts.snap   | 0
 src/constructs/iam/roles/index.ts                         | 2 ++
 .../iam/roles}/instance-role.test.ts                      | 4 ++--
 src/{patterns => constructs/iam/roles}/instance-role.ts   | 8 ++++----
 src/constructs/iam/{ => roles}/roles.test.ts              | 4 ++--
 src/constructs/iam/{ => roles}/roles.ts                   | 2 +-
 src/patterns/index.ts                                     | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename src/{patterns => constructs/iam/roles}/__snapshots__/instance-role.test.ts.snap (100%)
 create mode 100644 src/constructs/iam/roles/index.ts
 rename src/{patterns => constructs/iam/roles}/instance-role.test.ts (92%)
 rename src/{patterns => constructs/iam/roles}/instance-role.ts (88%)
 rename src/constructs/iam/{ => roles}/roles.test.ts (88%)
 rename src/constructs/iam/{ => roles}/roles.ts (92%)

diff --git a/src/patterns/__snapshots__/instance-role.test.ts.snap b/src/constructs/iam/roles/__snapshots__/instance-role.test.ts.snap
similarity index 100%
rename from src/patterns/__snapshots__/instance-role.test.ts.snap
rename to src/constructs/iam/roles/__snapshots__/instance-role.test.ts.snap
diff --git a/src/constructs/iam/roles/index.ts b/src/constructs/iam/roles/index.ts
new file mode 100644
index 0000000000..f42f2adf17
--- /dev/null
+++ b/src/constructs/iam/roles/index.ts
@@ -0,0 +1,2 @@
+export * from "./instance-role";
+export * from "./roles";
diff --git a/src/patterns/instance-role.test.ts b/src/constructs/iam/roles/instance-role.test.ts
similarity index 92%
rename from src/patterns/instance-role.test.ts
rename to src/constructs/iam/roles/instance-role.test.ts
index e39d9882ae..67e1fd3229 100644
--- a/src/patterns/instance-role.test.ts
+++ b/src/constructs/iam/roles/instance-role.test.ts
@@ -1,7 +1,7 @@
 import "@aws-cdk/assert/jest";
 import { SynthUtils } from "@aws-cdk/assert";
-import { simpleGuStackForTesting } from "../../test/utils";
-import { GuGetS3ObjectPolicy } from "../constructs/iam";
+import { simpleGuStackForTesting } from "../../../../test/utils";
+import { GuGetS3ObjectPolicy } from "../policies";
 import { GuInstanceRole } from "./instance-role";
 
 describe("The GuInstanceRole construct", () => {
diff --git a/src/patterns/instance-role.ts b/src/constructs/iam/roles/instance-role.ts
similarity index 88%
rename from src/patterns/instance-role.ts
rename to src/constructs/iam/roles/instance-role.ts
index fa1d349a64..77ada63233 100644
--- a/src/patterns/instance-role.ts
+++ b/src/constructs/iam/roles/instance-role.ts
@@ -1,14 +1,14 @@
 import { ServicePrincipal } from "@aws-cdk/aws-iam";
-import type { GuStack } from "../constructs/core";
-import type { GuPolicy } from "../constructs/iam";
+import type { GuStack } from "../../core";
+import type { GuPolicy } from "../policies";
 import {
   GuDescribeEC2Policy,
   GuGetDistributablePolicy,
   GuLogShippingPolicy,
   GuParameterStoreReadPolicy,
-  GuRole,
   GuSSMRunCommandPolicy,
-} from "../constructs/iam";
+} from "../policies";
+import { GuRole } from "../roles";
 
 interface GuInstanceRoleProps {
   withoutLogShipping?: boolean; // optional to have log shipping added by default, you have to opt out
diff --git a/src/constructs/iam/roles.test.ts b/src/constructs/iam/roles/roles.test.ts
similarity index 88%
rename from src/constructs/iam/roles.test.ts
rename to src/constructs/iam/roles/roles.test.ts
index 3c1d844869..17b4e2a9e9 100644
--- a/src/constructs/iam/roles.test.ts
+++ b/src/constructs/iam/roles/roles.test.ts
@@ -1,8 +1,8 @@
 import { SynthUtils } from "@aws-cdk/assert";
 import "@aws-cdk/assert/jest";
 import { ServicePrincipal } from "@aws-cdk/aws-iam";
-import { simpleGuStackForTesting } from "../../../test/utils/simple-gu-stack";
-import type { SynthedStack } from "../../../test/utils/synthed-stack";
+import { simpleGuStackForTesting } from "../../../../test/utils/simple-gu-stack";
+import type { SynthedStack } from "../../../../test/utils/synthed-stack";
 import { GuRole } from "./roles";
 
 describe("The GuRole class", () => {
diff --git a/src/constructs/iam/roles.ts b/src/constructs/iam/roles/roles.ts
similarity index 92%
rename from src/constructs/iam/roles.ts
rename to src/constructs/iam/roles/roles.ts
index 8582acb27a..5548b08292 100644
--- a/src/constructs/iam/roles.ts
+++ b/src/constructs/iam/roles/roles.ts
@@ -1,6 +1,6 @@
 import type { CfnRole, RoleProps } from "@aws-cdk/aws-iam";
 import { Role } from "@aws-cdk/aws-iam";
-import type { GuStack } from "../core";
+import type { GuStack } from "../../core";
 
 export interface GuRoleProps extends RoleProps {
   overrideId?: boolean;
diff --git a/src/patterns/index.ts b/src/patterns/index.ts
index a57d528d0c..6fd6af1e8d 100644
--- a/src/patterns/index.ts
+++ b/src/patterns/index.ts
@@ -1 +1 @@
-export * from "./instance-role";
+export * from "./scheduled-lambda";