Updated READMEs

AWSCookbook · Oct 27, 2021 · 7b429be · 7b429be
1 parent 6c1c018
commit 7b429be
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 162 deletions.
diff --git a/301-Using-S3-Lifecycle-Policies-to-Reduce-Storage-Costs/lifecycle-rule.json b/301-Using-S3-Lifecycle-Policies-to-Reduce-Storage-Costs/lifecycle-rule.json
@@ -12,8 +12,4 @@
             ]
         }
     ]
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/302-Using-S3-Intelligent-Tiering/tiering.json b/302-Using-S3-Intelligent-Tiering/tiering.json
@@ -1,17 +1,4 @@
 {
-<<<<<<< HEAD
-    "IntelligentTieringConfiguration": {
-        "Id": "awscookbook302",
-        "Status": "Enabled",
-        "Tierings": [
-            {
-                "Days": 90,
-                "AccessTier": "ARCHIVE_ACCESS"
-            }
-        ]
-    }
-}
-=======
     "Id": "awscookbook302",
     "Status": "Enabled",
     "Tierings": [
@@ -21,4 +8,3 @@
         }
     ]
 }
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-perms-policy-template.json b/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-perms-policy-template.json
@@ -1,42 +1,4 @@
 {
-<<<<<<< HEAD
-    "Version":"2012-10-17",
-    "Statement":[
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:GetObjectVersionForReplication",
-             "s3:GetObjectVersionAcl"
-          ],
-          "Resource":[
-             "arn:aws:s3:::SRCBUCKET/*"
-          ]
-       },
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:ListBucket",
-             "s3:GetReplicationConfiguration"
-          ],
-          "Resource":[
-             "arn:aws:s3:::SRCBUCKET"
-          ]
-       },
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:ReplicateObject",
-             "s3:ReplicateDelete",
-             "s3:ReplicateTags",
-             "s3:GetObjectVersionTagging"
-
-          ],
-          "Resource":"arn:aws:s3:::DSTBUCKET/*"
-       }
-    ]
- }
-
-=======
 	"Version":"2012-10-17",
 	"Statement":[
    	{
@@ -71,4 +33,3 @@
    	}
 	]
  }
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-perms-policy.json b/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-perms-policy.json
@@ -1,42 +1,4 @@
 {
-<<<<<<< HEAD
-    "Version":"2012-10-17",
-    "Statement":[
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:GetObjectVersionForReplication",
-             "s3:GetObjectVersionAcl"
-          ],
-          "Resource":[
-             "arn:aws:s3:::awscookbook302-src-357sky/*"
-          ]
-       },
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:ListBucket",
-             "s3:GetReplicationConfiguration"
-          ],
-          "Resource":[
-             "arn:aws:s3:::awscookbook302-src-357sky"
-          ]
-       },
-       {
-          "Effect":"Allow",
-          "Action":[
-             "s3:ReplicateObject",
-             "s3:ReplicateDelete",
-             "s3:ReplicateTags",
-             "s3:GetObjectVersionTagging"
-
-          ],
-          "Resource":"arn:aws:s3:::awscookbook302-dst-357sky/*"
-       }
-    ]
- }
-
-=======
 	"Version":"2012-10-17",
 	"Statement":[
    	{
@@ -71,4 +33,3 @@
    	}
 	]
  }
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-replication-template.json b/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-replication-template.json
@@ -1,33 +1,4 @@
 {
-<<<<<<< HEAD
-    "Rules": [
-        {
-            "Status": "Enabled",
-            "Filter": {
-                "Prefix": ""
-            },
-            "DeleteMarkerReplication": { "Status": "Disabled" },
-            "Destination": {
-                "Bucket": "arn:aws:s3:::DSTBUCKET",
-                "Metrics": {
-                    "Status": "Enabled",
-                    "EventThreshold": {
-                        "Minutes": 15
-                    }
-                },
-                "ReplicationTime": {
-                    "Status": "Enabled",
-                    "Time": {
-                        "Minutes": 15
-                    }
-                }
-            },
-            "Priority": 1
-        }
-    ],
-    "Role": "ROLEARN"
-}
-=======
 	"Rules": [
     	{
         	"Status": "Enabled",
@@ -57,4 +28,3 @@
 	],
 	"Role": "ROLEARN"
 }
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-replication.json b/303-Replicating-S3-Buckets-to-Meet-Recovery-Point-Objectives/s3-replication.json
@@ -1,33 +1,4 @@
 {
-<<<<<<< HEAD
-    "Rules": [
-        {
-            "Status": "Enabled",
-            "Filter": {
-                "Prefix": ""
-            },
-            "DeleteMarkerReplication": { "Status": "Disabled" },
-            "Destination": {
-                "Bucket": "arn:aws:s3:::awscookbook303-dst-357sky",
-                "Metrics": {
-                    "Status": "Enabled",
-                    "EventThreshold": {
-                        "Minutes": 15
-                    }
-                },
-                "ReplicationTime": {
-                    "Status": "Enabled",
-                    "Time": {
-                        "Minutes": 15
-                    }
-                }
-            },
-            "Priority": 1
-        }
-    ],
-    "Role": "arn:aws:iam::611652777867:role/AWSCookbook303S3Role"
-}
-=======
 	"Rules": [
     	{
         	"Status": "Enabled",
@@ -57,4 +28,3 @@
 	],
 	"Role": "arn:aws:iam::664865145641:role/AWSCookbook303S3Role"
 }
->>>>>>> d0119e3 (Updated READMEs)
diff --git a/305-Configuring-Application-Specific-Access-to-S3/.gitignore b/305-Configuring-Application-Specific-Access-to-S3/.gitignore
@@ -1,3 +1,3 @@
 Recipe304Test.txt
 app-1-policy.json
-app-2-policy.json
+app-2-policy.json
diff --git a/305-Configuring-Application-Specific-Access-to-S3/app-1-policy.json b/305-Configuring-Application-Specific-Access-to-S3/app-1-policy.json
@@ -0,0 +1,12 @@
+{
+    "Version":"2012-10-17",
+    "Statement": [
+    {
+        "Effect": "Allow",
+        "Principal": {
+            "AWS": "arn:aws:iam::664865145641:role/cdk-aws-cookbook-305-Instance1SSM06992D3D-ML80O8CVOLOV"
+        },
+        "Action": ["s3:GetObject","s3:PutObject"],
+        "Resource": "arn:aws:s3:us-east-1:664865145641:accesspoint/cookbook305-app-1/object/*"
+    }]
+}
diff --git a/305-Configuring-Application-Specific-Access-to-S3/app-2-policy.json b/305-Configuring-Application-Specific-Access-to-S3/app-2-policy.json
@@ -0,0 +1,12 @@
+{
+    "Version":"2012-10-17",
+    "Statement": [
+    {
+        "Effect": "Allow",
+        "Principal": {
+            "AWS": "arn:aws:iam::664865145641:role/cdk-aws-cookbook-305-Instance2SSM9F9326DF-K3V3PP8TD6W5"
+        },
+        "Action": ["s3:GetObject"],
+        "Resource": "arn:aws:s3:us-east-1:664865145641:accesspoint/cookbook305-app-2/object/*"
+    }]
+}
diff --git a/...ific-Access-to-S3/cdk-AWS-Cookbook-305/cdk_aws_cookbook_305/cdk_aws_cookbook_305_stack.py b/...ific-Access-to-S3/cdk-AWS-Cookbook-305/cdk_aws_cookbook_305/cdk_aws_cookbook_305_stack.py
@@ -104,11 +104,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
 
         iam_role2 = iam.Role(self, "Instance2SSM", assumed_by=iam.ServicePrincipal("ec2.amazonaws.com"))
 
-<<<<<<< HEAD
-        iam_role2.add_managed_policy(iam.ManagedPolicy.from_aws_managed_policy_name("service-role/AmazonEC2RoleforSSM"))
-=======
         iam_role2.add_managed_policy(iam.ManagedPolicy.from_aws_managed_policy_name("AmazonSSMManagedInstanceCore"))
->>>>>>> d0119e3 (Updated READMEs)
 
         instance2 = ec2.Instance(
             self,

diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@ export AWS_REGION=us-east-1
 ## Set your AWS ACCOUNT ID 
 AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
 ## Validate AWS Cli Setup and access
-aws ec2 describe-instances
+aws ec2 describe-instances
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,8 +12,4 @@ @@
                 ]
             }
         ]
-    <<<<<<< HEAD
     }
-    =======
-    }
-    >>>>>>> d0119e3 (Updated READMEs)