From fb11d752618f8094e4d1736c6f7caa555a24060d Mon Sep 17 00:00:00 2001
From: Dawn Pattison <pattison.dawn.r@gmail.com>
Date: Tue, 2 Nov 2021 14:57:22 -0500
Subject: [PATCH] Run intel image in emulation for mysql.

---
 Makefile                                  |  2 +-
 docker-compose.integration-quickstart.yml | 34 -----------------------
 docker-compose.integration-test.yml       |  1 +
 quickstart.py                             |  8 +++---
 4 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 docker-compose.integration-quickstart.yml

diff --git a/Makefile b/Makefile
index 31b4795d0..d5ebf6ee7 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ integration-env: compose-build
 	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml up
 
 quickstart: compose-build
-	@docker-compose -f docker-compose.yml -f docker-compose.integration-quickstart.yml up -d
+	@docker-compose -f docker-compose.yml -f docker-compose.integration-test.yml up -d
 	@docker exec -it fidesops python quickstart.py
 
 ####################
diff --git a/docker-compose.integration-quickstart.yml b/docker-compose.integration-quickstart.yml
deleted file mode 100644
index 75224e1ee..000000000
--- a/docker-compose.integration-quickstart.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-services:
-  fidesops:
-    depends_on:
-      - postgres_example
-      - mongodb_example
-
-  postgres_example:
-    image: postgres:12
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=postgres_example
-    expose:
-      - 6432
-    ports:
-      - "0.0.0.0:6432:5432"
-    volumes:
-      # NOTE: consider running initialization SQL in Python instead of this
-      # (see "Initialization scripts" section at https://hub.docker.com/_/postgres)
-      - ./data/sql/postgres_example.sql:/docker-entrypoint-initdb.d/postgres_example.sql
-
-  mongodb_example:
-    image: mongo:5.0.3
-    environment:
-      - MONGO_INITDB_DATABASE=mongo_test
-      - MONGO_INITDB_ROOT_USERNAME=mongo_user
-      - MONGO_INITDB_ROOT_PASSWORD=mongo_pass
-    expose:
-      - 27017
-    ports:
-      - "27017:27017"
-    volumes:
-      - ./data/nosql/mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
-
diff --git a/docker-compose.integration-test.yml b/docker-compose.integration-test.yml
index f16f73f1a..ad10d8ca3 100644
--- a/docker-compose.integration-test.yml
+++ b/docker-compose.integration-test.yml
@@ -35,6 +35,7 @@ services:
 
   mysql_example:
     image: mysql
+    platform: linux/amd64
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
diff --git a/quickstart.py b/quickstart.py
index a8817b679..3b546d010 100644
--- a/quickstart.py
+++ b/quickstart.py
@@ -630,7 +630,7 @@ def print_results(request_id: str) -> None:
     )
     print("""
     ┌─┐┌┬┐┌─┐┌─┐  ┌┬┐┬ ┬┌─┐
-    └─┐ │ ├┤ ├─┘   │ ││││ │  ...  Create an access policy 
+    └─┐ │ ├┤ ├─┘   │ ││││ │  ...  Create an access policy rule
     └─┘ ┴ └─┘┴     ┴ └┴┘└─┘
     """)
     print(
@@ -638,7 +638,7 @@ def print_results(request_id: str) -> None:
     )
     data_category = 'user.provided.identifiable'
     print(
-        f"Press [enter] to create a Policy that accesses information with the data category '{data_category}':"
+        f"Press [enter] to create a Policy Rule that accesses information with the data category '{data_category}':"
     )
     input()
 
@@ -694,7 +694,7 @@ def print_results(request_id: str) -> None:
     print(
     """
     ┌─┐┌┬┐┌─┐┌─┐  ┌─┐┌─┐┬ ┬┬─┐
-    └─┐ │ ├┤ ├─┘  ├┤ │ ││ │├┬┘   ...  Create an erasure policy
+    └─┐ │ ├┤ ├─┘  ├┤ │ ││ │├┬┘   ...  Create an erasure policy rule
     └─┘ ┴ └─┘┴    └  └─┘└─┘┴└─    
     """
     )
@@ -704,7 +704,7 @@ def print_results(request_id: str) -> None:
 
     # Create a policy that erases all user data
     print(
-        f"Press [enter] to create a Policy describing how to erase information with the data category `{data_category}`:"
+        f"Press [enter] to create a Policy Rule describing how to erase information with the data category `{data_category}`:"
     )
     input()