From efb97b1415c5d3d7eb3cf19df9f77d30c19b6672 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Wed, 11 Mar 2020 11:14:44 -0400
Subject: [PATCH] MCOL-2022: aws specific options can't use nvme dev names

Checkpointing a minimal attempt to disable the aws-specific
functionality for new installations.
---
 oamapps/postConfigure/CMakeLists.txt    |  2 +-
 oamapps/postConfigure/postConfigure.cpp | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt
index 8f573d0a8..be02574c2 100644
--- a/oamapps/postConfigure/CMakeLists.txt
+++ b/oamapps/postConfigure/CMakeLists.txt
@@ -65,5 +65,5 @@ install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-
 
 ########### next target ###############
 
-install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh
+install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh 
         DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)               
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 03cdfb7c0..8de961c07 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -316,11 +316,6 @@ int main(int argc, char* argv[])
 			multi_server_quick_install = true;
 			noPrompting = true;
 		}
-		else if( string("-qa") == argv[i] )
-		{
-			amazon_quick_install = true;
-			noPrompting = true;
-		}
         else if ( string("-f") == argv[i] )
             nodeps = "--nodeps";
         else if ( string("-o") == argv[i] )
@@ -460,7 +455,7 @@ int main(int argc, char* argv[])
         else
         {
             cout << "   ERROR: Invalid Argument = " << argv[i] << endl;
-   			cout << "   Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-qa][-port][-i][-sn][-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr][-numBlocksPct][-totalUmMemory]" << endl;
+   			cout << "   Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-port][-i][-sn][-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr][-numBlocksPct][-totalUmMemory]" << endl;
 			exit (1);
 		}
 	}
@@ -1354,6 +1349,7 @@ int main(int argc, char* argv[])
     bool amazonInstall = false;
     string cloud = oam::UnassignedName;
 
+    #if 0
 	if (!multi_server_quick_install)
 	{
 		string amazonLog = tmpDir + "/amazon.log";
@@ -1393,6 +1389,7 @@ int main(int argc, char* argv[])
 				amazonInstall = true;
 		}
 	}
+    #endif
 
     try
     {
@@ -1402,6 +1399,15 @@ int main(int argc, char* argv[])
     {
         cloud  = oam::UnassignedName;
     }
+    
+    #if XXXPAT
+    if (cloud.find("amazon") != string::npos)
+    {
+        cout << "AWS-specific functionality has been deprecated for this version." << endl
+            << "Please re-run postConfigure without the upgrade option." << endl;
+        exit(1);
+    }
+    #endif
 
     if ( cloud == "disable" )
         amazonInstall = false;