From 335e54f888e98e957779305db10403d5e4fca3f7 Mon Sep 17 00:00:00 2001
From: UNiXMIT <4117073+UNiXMIT@users.noreply.github.com>
Date: Thu, 4 Jan 2024 16:33:19 +0000
Subject: [PATCH] Get license from S3

---
 rhel/extend.yml     | 7 +------
 rhel/variables.json | 5 -----
 win/extend.yml      | 4 ++--
 win/variables.json  | 7 -------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/rhel/extend.yml b/rhel/extend.yml
index d82ac6c..a4e2fdf 100644
--- a/rhel/extend.yml
+++ b/rhel/extend.yml
@@ -43,9 +43,4 @@
   shell: printf 'y\n{{ installPath }}\n' | {{ installPath }}{{ installerName }}
 
 - name: Activate Licenses
-  shell: printf '{{ extendCode }}\n{{ extendKey }}\n' | {{ installPath }}bin/activator
-
-- name: Display AWS EC2 Information
-  debug:
-    msg: 
-    - '{{ s3 }}'
\ No newline at end of file
+  shell: printf '{{ s3.tags.CODE }}\n{{ s3.tags.KEY }}\n' | {{ installPath }}bin/activator
\ No newline at end of file
diff --git a/rhel/variables.json b/rhel/variables.json
index 532f623..6144abd 100644
--- a/rhel/variables.json
+++ b/rhel/variables.json
@@ -13,11 +13,6 @@
   "volumeType": "gp3",
   "volumeSize": 120,
   "awsProfile": "848105473048_Fed_COBOL2_Compute",
-  "licenseServer": "domain.com",
-  "SafenetFile": "https://domain.com/lservrc.net",
-  "AutoPassFile": "https://domain.com/LicFile.txt",
-  "extend1050Code": "XXXXXXXX",
-  "extend1050Key": "XXXXXX",
   "vmCount": 1,
   "ssoEmail": "email@domain.com",
   "ssoPassword": "strongPassword",
diff --git a/win/extend.yml b/win/extend.yml
index ff4c8da..6fcf580 100644
--- a/win/extend.yml
+++ b/win/extend.yml
@@ -35,12 +35,12 @@
 
 - name: Activate 32 bit Licenses
   win_command:
-    cmd: '"{{ installPath32 }}\AcuGT\bin\activator.exe" /PCODE={{ extendCode86 }} /PKEY={{ extendKey86 }}'
+    cmd: '"{{ installPath32 }}\AcuGT\bin\activator.exe" /PCODE={{ s3.tags.CODE32 }} /PKEY={{ s3.tags.KEY32 }}'
     chdir: '{{ installPath32 }}\AcuGT\bin'
 
 - name: Activate 64 bit Licenses
   win_command:
-    cmd: '"{{ installPath32 }}\AcuGT\bin\activator.exe" /PCODE={{ extendCode64 }} /PKEY={{ extendKey64 }}'
+    cmd: '"{{ installPath32 }}\AcuGT\bin\activator.exe" /PCODE={{ s3.tags.CODE64 }} /PKEY={{ s3.tags.KEY64 }}'
     chdir: '{{ installPath32 }}\AcuGT\bin'
 
 - name: Admin rights for AcuRCL 32 bit
diff --git a/win/variables.json b/win/variables.json
index 93630af..c5e04e5 100644
--- a/win/variables.json
+++ b/win/variables.json
@@ -14,13 +14,6 @@
   "volumeType": "gp3",
   "volumeSize": 120,
   "awsProfile": "848105473048_Fed_COBOL2_Compute",
-  "licenseServer": "domain.com",
-  "SafenetFile": "https://domain.com/lservrc.net",
-  "AutoPassFile": "https://domain.com/LicFile.txt",
-  "extend1050Code86": "XXXXXXXX",
-  "extend1050Key86": "XXXXXX",
-  "extend1050Code64": "XXXXXXXX",
-  "extend1050Key64": "XXXXXX",
   "vmCount": 1,
   "ssoEmail": "email@domain.com",
   "ssoPassword": "strongPassword",