testing updates to policy for opt-in

Author: cyphronix

aws_sra_examples/solutions/guardduty/guardduty_org/templates/sra-guardduty-org-delivery-kms-key.yaml

@@ -97,8 +97,7 @@ Resources:
             Effect: Allow
             Action: kms:GenerateDataKey
             Resource: '*'
-            Principal:
-              Service: '*'
+            Principal: '*'
             Condition:
               StringLike:
                 aws:PrincipalServiceName: guardduty.*.amazonaws.com

aws_sra_examples/solutions/guardduty/guardduty_org/templates/sra-guardduty-org-delivery-s3-bucket.yaml

@@ -136,8 +136,7 @@ Resources:
               - s3:GetBucketLocation
               - s3:ListBucket
             Resource: !Sub arn:aws:s3:::${rGuardDutyDeliveryS3Bucket}
-            Principal:
-              Service: '*'
+            Principal: '*'
             Condition:
               StringLike:
                 aws:PrincipalServiceName: guardduty.*.amazonaws.com
@@ -161,8 +160,7 @@ Resources:
             #   StringEquals:
             #     s3:x-amz-acl: bucket-owner-full-control
             Resource: !Sub arn:aws:s3:::${rGuardDutyDeliveryS3Bucket}/*
-            Principal:
-              Service: '*'
+            Principal: '*'
             Condition:
               StringLike:
                 aws:PrincipalServiceName: guardduty.*.amazonaws.com
@@ -186,8 +184,7 @@ Resources:
               StringNotEquals:
                 s3:x-amz-server-side-encryption: aws:kms
             Resource: !Sub arn:aws:s3:::${rGuardDutyDeliveryS3Bucket}/*
-            Principal:
-              Service: '*'
+            Principal: '*'
             Condition:
               StringLike:
                 aws:PrincipalServiceName: guardduty.*.amazonaws.com
@@ -211,8 +208,7 @@ Resources:
               StringNotEquals:
                 s3:x-amz-server-side-encryption-aws-kms-key-id: !Sub ${pGuardDutyOrgDeliveryKMSKeyArn}
             Resource: !Sub arn:aws:s3:::${rGuardDutyDeliveryS3Bucket}/*
-            Principal:
-              Service: '*'
+            Principal: '*'
             Condition:
               StringLike:
                 aws:PrincipalServiceName: guardduty.*.amazonaws.com