Maintenance update

beomseoklee · beomseoklee · commit ff1963c61380 · 2021-09-16T09:55:04.000-07:00
- Updated README.md to correct incorrect information
- Removed grunt packages from all pakcage.json files
diff --git a/README.md b/README.md
@@ -61,12 +61,16 @@ git clone https://github.com/awslabs/aws-data-lake-solution.git
 
 ```
 export AWS_REGION=<aws-region-code>
+export SOLUTION_NAME=<your-solution-name>
 export VERSION_CODE=<version-code>
 export DEPLOY_BUCKET=<source-bucket-base-name>
+export CLOUDFORMATION_TEMPLATE_BUCKET=<cloudformation-template-bucket-name>
 ```
-- **aws-region-code**: AWS region code. Ex: ```us-east-1```, ```us-west-2``` ...
-- **version-code**: version of the package
-- **source-bucket-base-name**: Name for the S3 bucket location where the template will source the Lambda code from. The template will append ```-[aws-region-code]``` to this bucket name. For example: ```./build-s3-dist.sh solutions v2.0.0```, the template will then expect the source code to be located in the ```solutions-[aws-region-code]``` bucket.
+- **aws-region-code**: AWS region code. e.g.: ```us-east-1```, ```us-west-2``` ...
+- **your-solution-name**: Your customized solution name. e.g. `aws-data-lake-solution`
+- **version-code**: Version of the package. e.g. `v1.0.0`
+- **source-bucket-base-name**: Name for the S3 bucket location where the template will source the Lambda code from. The template will append ```-[aws-region-code]``` to this bucket name. For example: ```./build-s3-dist.sh solutions aws-data-lake-solution v2.0.0 solutions```, the template will then expect the source code to be located in the ```solutions-[aws-region-code]``` bucket.
+- **cloudformation-template-bucket-name**: Name for the S3 bucket where the CloudFormation templates are going to be.
 
 #### 04. Run the data lake solution unit tests:
 ```
@@ -78,12 +82,13 @@ chmod +x run-unit-tests.sh
 #### 05. Build the data lake solution for deployment:
 ```
 chmod +x build-s3-dist.sh
-./build-s3-dist.sh $DEPLOY_BUCKET $VERSION_CODE
+./build-s3-dist.sh $DEPLOY_BUCKET $SOLUTION_NAME $VERSION_CODE $CLOUDFORMATION_TEMPLATE_BUCKET
 ```
 
 #### 06. Upload deployment assets to your Amazon S3 bucket:
 ```
-aws s3 cp ./dist s3://$DEPLOY_BUCKET/data-lake/$VERSION_CODE --recursive --acl bucket-owner-full-control
+aws s3 cp ./global-s3-assets s3://$CLOUDFORMATION_TEMPLATE_BUCKET/$SOLUTION_NAME/$VERSION_CODE --recursive --acl bucket-owner-full-control
+aws s3 cp ./regional-s3-assets s3://$DEPLOY_BUCKET-$AWS_REGION/$SOLUTION_NAME/$VERSION_CODE --recursive --acl bucket-owner-full-control
 ```
 
 #### 07. Deploy the data lake solution:
@@ -103,6 +108,6 @@ Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0 
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/source/api/authorizer/package.json b/source/api/authorizer/package.json
@@ -17,10 +17,6 @@
         "js-base64": "^2.4.9"
     },
     "devDependencies": {
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-pack": "^0.1.*",
-        "grunt-contrib-clean": "^2.0.0",
         "chai": "^4.2.0",
         "sinon": "^2.4.1",
         "sinon-chai": "^3.3.0",
@@ -44,4 +40,4 @@
         "underscore",
         "js-base64"
     ]
-}
+}
diff --git a/source/api/services/admin/package.json b/source/api/services/admin/package.json
@@ -24,10 +24,6 @@
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
         "chai-things": "^0.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -51,4 +47,4 @@
         "hat",
         "js-base64"
     ]
-}
+}
diff --git a/source/api/services/cart/package.json b/source/api/services/cart/package.json
@@ -16,10 +16,6 @@
         "access-validator": "file:../../../resources/access-validator/"
     },
     "devDependencies": {
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-pack": "^0.1.*",
-        "grunt-contrib-clean": "^2.0.0",
         "chai": "^4.2.0",
         "sinon": "^2.4.1",
         "sinon-chai": "^3.3.0",
@@ -41,4 +37,4 @@
         "underscore",
         "jsonschema"
     ]
-}
+}
diff --git a/source/api/services/logging/package.json b/source/api/services/logging/package.json
@@ -13,10 +13,6 @@
         "underscore": "^1.9.1"
     },
     "devDependencies": {
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-pack": "^0.1.*",
-        "grunt-contrib-clean": "^2.0.0",
         "chai": "^4.2.0",
         "sinon": "^2.4.1",
         "sinon-chai": "^3.3.0",
@@ -36,4 +32,4 @@
         "moment",
         "underscore"
     ]
-}
+}
diff --git a/source/api/services/manifest/package.json b/source/api/services/manifest/package.json
@@ -16,10 +16,6 @@
     "devDependencies": {
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "^0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -38,4 +34,4 @@
         "shortid",
         "underscore"
     ]
-}
+}
diff --git a/source/api/services/package/package.json b/source/api/services/package/package.json
@@ -20,10 +20,6 @@
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
         "chai-things": "^0.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "^0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -43,4 +39,4 @@
         "jsonschema",
         "shortid"
     ]
-}
+}
diff --git a/source/api/services/profile/package.json b/source/api/services/profile/package.json
@@ -18,10 +18,6 @@
     "devDependencies": {
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "^0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -41,4 +37,4 @@
         "underscore",
         "hat"
     ]
-}
+}
diff --git a/source/api/services/search/package.json b/source/api/services/search/package.json
@@ -18,10 +18,6 @@
     "devDependencies": {
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "^0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -42,4 +38,4 @@
         "moment",
         "underscore"
     ]
-}
+}
diff --git a/source/resources/helper/package.json b/source/resources/helper/package.json
@@ -20,10 +20,6 @@
     "devDependencies": {
         "aws-sdk-mock": "^4.5.0",
         "chai": "^4.2.0",
-        "grunt": "^0.4.5",
-        "grunt-aws-lambda": "^0.13.0",
-        "grunt-contrib-clean": "^2.0.0",
-        "grunt-pack": "^0.1.*",
         "mocha": "^6.2.2",
         "npm-run-all": "^4.1.5",
         "sinon": "^2.4.1",
@@ -45,4 +41,4 @@
         "password-generator",
         "uuid"
     ]
-}
+}
