s3deploy_guardDuty_remove_plugins

serverless-guru · Aug 3, 2020 · 64bf88f · 64bf88f
1 parent 9784cd6
commit 64bf88f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/sls-guardduty/resources/guardduty/package.json b/sls-guardduty/resources/guardduty/package.json
@@ -9,7 +9,5 @@
   "author": "Serverless Guru",
   "license": "ISC",
   "dependencies": {},
-  "devDependencies": {
-    "serverless-pseudo-parameters": "^2.5.0"
-  }
+  "devDependencies": {}
 }
diff --git a/sls-guardduty/resources/guardduty/serverless.yml b/sls-guardduty/resources/guardduty/serverless.yml
@@ -4,18 +4,14 @@ provider:
   name: aws
   stage: ${opt:stage, "dev"}
   region: ${opt:region, "us-east-2"}
-  profile: ${opt:region, "slsguru"}
+  profile: ${opt:profile, "slsguru"}
 
 custom:
   base: ${self:service}-${self:provider.stage}
-  awsAccountId: "#{AWS::AccountId}"
-  IPSetBucket: ${cf:sls-bucket-deploy-dev.guarddutyIPSetBucket}
-  IPSetTXTFile: ${cf:sls-bucket-deploy-dev.guarddutyIPFile}
+  IPSetBucket: ${cf:sls-bucket-deploy-${self:provider.stage}.guarddutyIPSetBucket}
+  IPSetTXTFile: ${cf:sls-bucket-deploy-${self:provider.stage}.guarddutyIPFile}
   subscriptionEmailAddress: mohammed@serverlessguru.com
 
-plugins:
-  - serverless-pseudo-parameters
-
 resources:
   Resources:
     guardduty:
@@ -29,9 +25,7 @@ resources:
       Properties:
         Activate: True
         DetectorId:
-            !Join
-              - ''
-              - - Ref: guardduty
+          Ref: guardduty
         Format: "TXT"
         Location: "https://s3-${self:provider.region}.amazonaws.com/${self:custom.IPSetBucket}/${self:custom.IPSetTXTFile}"
         Name: slsguruIPSet
@@ -57,9 +51,7 @@ resources:
               Resource:
                 - Ref: guarddutySNSTopic
         Topics:
-          - !Join
-            - ''
-            - - Ref: guarddutySNSTopic
+          - Ref: guarddutySNSTopic
     guarddutyEventRule:
       Type: "AWS::Events::Rule"
       Properties:
@@ -69,9 +61,7 @@ resources:
         Name: guardduty-event-rule
         State: ENABLED
         Targets:
-          - Arn: !Join
-              - ''
-              - - Ref: guarddutySNSTopic 
-            Id: !Join
-              - ''
-              - - Ref: guardduty
+          - Arn:
+              Ref: guarddutySNSTopic 
+            Id:
+              Ref: guardduty
diff --git a/sls-s3deploy/package-lock.json b/sls-s3deploy/package-lock.json
diff --git a/sls-s3deploy/package.json b/sls-s3deploy/package.json
@@ -5,7 +5,6 @@
   "main": "index.js",
   "dependencies": {},
   "devDependencies": {
-    "serverless-pseudo-parameters": "^2.5.0",
     "serverless-s3-deploy": "^0.9.0"
   },
   "scripts": {

diff --git a/sls-s3deploy/serverless.yml b/sls-s3deploy/serverless.yml
@@ -4,11 +4,10 @@ provider:
   name: aws
   stage: ${opt:stage, "dev"}
   region: ${opt:region, "us-east-2"}
-  profile: ${opt:region, "slsguru"}
+  profile: ${opt:profile, "slsguru"}
 
 custom:
   base: ${self:service}-${self:provider.stage}
-  awsAccountId: "#{AWS::AccountId}"
   IPSetBucket: "slsguru-guarddutyip"
   IPSetTXTFile: "slsguruIPSet.txt"
   assets:
@@ -21,7 +20,6 @@ custom:
             globs: ${self:custom.IPSetTXTFile}
 
 plugins:
-  - serverless-pseudo-parameters
   - serverless-s3-deploy
 resources:
   Resources: