SHPVWA-16535: Remove SetLocalService for PVWA (#416)

* remove SetLocalService * rename logs * revert changes for cpm
cyberark · Nov 18, 2024 · 153ff84 · 153ff84
1 parent 4a0e426
commit 153ff84
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/aws/Full-PAS-Deployment.yaml b/aws/Full-PAS-Deployment.yaml
@@ -13,11 +13,11 @@ Resources:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: CPMMachine/UserDataLog
     DeletionPolicy: Retain
-  CPMConfigurationsLogStream:
+  CPMConfigurationLogStream:
     Type: AWS::Logs::LogStream
     Properties:
       LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: CPMMachine/CPMConfigurationsLog
+      LogStreamName: CPMMachine/CPMConfigurationLog
     DeletionPolicy: Retain
   CPMRegistrationLogStream:
     Type: AWS::Logs::LogStream
@@ -55,24 +55,18 @@ Resources:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: PVWAMachine/UserDataLog
     DeletionPolicy: Retain
-  PVWAConfigurationsLogStream:
+  PVWAConfigurationLogStream:
     Type: AWS::Logs::LogStream
     Properties:
       LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: PVWAMachine/PVWAConfigurationsLog
+      LogStreamName: PVWAMachine/PVWAConfigurationLog
     DeletionPolicy: Retain
   PVWARegistrationLogStream:
     Type: AWS::Logs::LogStream
     Properties:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: PVWAMachine/PVWARegistrationLog
     DeletionPolicy: Retain
-  PVWASetLocalServiceLogStream:
-    Type: AWS::Logs::LogStream
-    Properties:
-      LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: PVWAMachine/PVWASetLocalServiceLog
-    DeletionPolicy: Retain
   VaultUserDataLogStream:
     Type: AWS::Logs::LogStream
     Properties:
@@ -909,9 +903,8 @@ Resources:
               "Region"                        = "${AWS::Region}"
               "LogGroup"                      = "${LogGroup}"
               "UserDataLogStream"             = "${PVWAUserDataLogStream}"
-              "PVWAConfigurationsLogStream"   = "${PVWAConfigurationsLogStream}"
+              "PVWAConfigurationLogStream"   = "${PVWAConfigurationLogStream}"
               "PVWARegistrationLogStream"     = "${PVWARegistrationLogStream}"
-              "PVWASetLocalServiceLogStream"  = "${PVWASetLocalServiceLogStream}"
               "VaultAdminUser"                = "Administrator"
               "SSMAdminPassParameterID"       = "${StoreAdminPassword.SsmId}"
               "VaultPrivateIP"                = "${VaultIpAddress}"
@@ -951,7 +944,7 @@ Resources:
               "Region"                        = "${AWS::Region}"
               "LogGroup"                      = "${LogGroup}"
               "UserDataLogStream"             = "${CPMUserDataLogStream}"
-              "CPMConfigurationsLogStream"    = "${CPMConfigurationsLogStream}"
+              "CPMConfigurationLogStream"    = "${CPMConfigurationLogStream}"
               "CPMRegistrationLogStream"      = "${CPMRegistrationLogStream}"
               "CPMSetLocalServiceLogStream"   = "${CPMSetLocalServiceLogStream}"
               "VaultAdminUser"                = "Administrator"

diff --git a/aws/PAS-Component-Single-Deployment.yaml b/aws/PAS-Component-Single-Deployment.yaml
@@ -14,12 +14,12 @@ Resources:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: CPMMachine/UserDataLog
     DeletionPolicy: Retain
-  CPMConfigurationsLogStream:
+  CPMConfigurationLogStream:
     Type: AWS::Logs::LogStream
     Condition: CreateCPMCondition
     Properties:
       LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: CPMMachine/CPMConfigurations
+      LogStreamName: CPMMachine/CPMConfiguration
     DeletionPolicy: Retain
   CPMRegistrationLogStream:
     Type: AWS::Logs::LogStream
@@ -63,12 +63,12 @@ Resources:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: PVWAMachine/UserDataLog
     DeletionPolicy: Retain
-  PVWAConfigurationsLogStream:
+  PVWAConfigurationLogStream:
     Type: AWS::Logs::LogStream
     Condition: CreatePVWACondition
     Properties:
       LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: PVWAMachine/PVWAConfigurationsLog
+      LogStreamName: PVWAMachine/PVWAConfigurationLog
     DeletionPolicy: Retain
   PVWARegistrationLogStream:
     Type: AWS::Logs::LogStream
@@ -77,13 +77,6 @@ Resources:
       LogGroupName: !Sub '${LogGroup}'
       LogStreamName: PVWAMachine/PVWARegistrationLog
     DeletionPolicy: Retain
-  PVWASetLocalServiceLogStream:
-    Type: AWS::Logs::LogStream
-    Condition: CreatePVWACondition
-    Properties:
-      LogGroupName: !Sub '${LogGroup}'
-      LogStreamName: PVWAMachine/PVWASetLocalServiceLog
-    DeletionPolicy: Retain
   PVWAAmi:
     Type: Custom::FindAMI
     Condition: PVWACustomImageEmpty
@@ -390,9 +383,8 @@ Resources:
               "Region"                        = "${AWS::Region}"
               "LogGroup"                      = "${LogGroup}"
               "UserDataLogStream"             = "${PVWAUserDataLogStream}"
-              "PVWAConfigurationsLogStream"   = "${PVWAConfigurationsLogStream}"
+              "PVWAConfigurationLogStream"   = "${PVWAConfigurationLogStream}"
               "PVWARegistrationLogStream"     = "${PVWARegistrationLogStream}"
-              "PVWASetLocalServiceLogStream"  = "${PVWASetLocalServiceLogStream}"
               "VaultAdminUser"                = "${VaultAdminUser}"
               "SSMAdminPassParameterID"       = "${StoreAdminPassword.SsmId}"
               "VaultPrivateIP"                = "${VaultIpAddress}"
@@ -434,7 +426,7 @@ Resources:
               "Region"                        = "${AWS::Region}"
               "LogGroup"                      = "${LogGroup}"
               "UserDataLogStream"             = "${CPMUserDataLogStream}"
-              "CPMConfigurationsLogStream"    = "${CPMConfigurationsLogStream}"
+              "CPMConfigurationLogStream"    = "${CPMConfigurationLogStream}"
               "CPMRegistrationLogStream"      = "${CPMRegistrationLogStream}"
               "CPMSetLocalServiceLogStream"   = "${CPMSetLocalServiceLogStream}"
               "VaultAdminUser"                = "${VaultAdminUser}"