-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3094 from TimeIncOSS/f-aws-cloudtrail
provider/aws: Add support for CloudTrail
- Loading branch information
Showing
6 changed files
with
426 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/cloudtrail" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| ) | ||
|
|
||
| func resourceAwsCloudTrail() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsCloudTrailCreate, | ||
| Read: resourceAwsCloudTrailRead, | ||
| Update: resourceAwsCloudTrailUpdate, | ||
| Delete: resourceAwsCloudTrailDelete, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "name": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "s3_bucket_name": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "s3_key_prefix": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| "cloud_watch_logs_role_arn": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| "cloud_watch_logs_group_arn": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| "include_global_service_events": &schema.Schema{ | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| Default: true, | ||
| }, | ||
| "sns_topic_name": &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceAwsCloudTrailCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).cloudtrailconn | ||
|
|
||
| input := cloudtrail.CreateTrailInput{ | ||
| Name: aws.String(d.Get("name").(string)), | ||
| S3BucketName: aws.String(d.Get("s3_bucket_name").(string)), | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("cloud_watch_logs_group_arn"); ok { | ||
| input.CloudWatchLogsLogGroupArn = aws.String(v.(string)) | ||
| } | ||
| if v, ok := d.GetOk("cloud_watch_logs_role_arn"); ok { | ||
| input.CloudWatchLogsRoleArn = aws.String(v.(string)) | ||
| } | ||
| if v, ok := d.GetOk("include_global_service_events"); ok { | ||
| input.IncludeGlobalServiceEvents = aws.Bool(v.(bool)) | ||
| } | ||
| if v, ok := d.GetOk("s3_key_prefix"); ok { | ||
| input.S3KeyPrefix = aws.String(v.(string)) | ||
| } | ||
| if v, ok := d.GetOk("sns_topic_name"); ok { | ||
| input.SnsTopicName = aws.String(v.(string)) | ||
| } | ||
|
|
||
| t, err := conn.CreateTrail(&input) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] CloudTrail created: %s", t) | ||
|
|
||
| d.SetId(*t.Name) | ||
|
|
||
| return resourceAwsCloudTrailRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsCloudTrailRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).cloudtrailconn | ||
|
|
||
| name := d.Get("name").(string) | ||
| input := cloudtrail.DescribeTrailsInput{ | ||
| TrailNameList: []*string{ | ||
| aws.String(name), | ||
| }, | ||
| } | ||
| resp, err := conn.DescribeTrails(&input) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(resp.TrailList) == 0 { | ||
| return fmt.Errorf("No CloudTrail found, using name %q", name) | ||
| } | ||
|
|
||
| trail := resp.TrailList[0] | ||
| log.Printf("[DEBUG] CloudTrail received: %s", trail) | ||
|
|
||
| d.Set("name", trail.Name) | ||
| d.Set("s3_bucket_name", trail.S3BucketName) | ||
| d.Set("s3_key_prefix", trail.S3KeyPrefix) | ||
| d.Set("cloud_watch_logs_role_arn", trail.CloudWatchLogsRoleArn) | ||
| d.Set("cloud_watch_logs_group_arn", trail.CloudWatchLogsLogGroupArn) | ||
| d.Set("include_global_service_events", trail.IncludeGlobalServiceEvents) | ||
| d.Set("sns_topic_name", trail.SnsTopicName) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceAwsCloudTrailUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).cloudtrailconn | ||
|
|
||
| input := cloudtrail.UpdateTrailInput{ | ||
| Name: aws.String(d.Get("name").(string)), | ||
| } | ||
|
|
||
| if d.HasChange("s3_bucket_name") { | ||
| input.S3BucketName = aws.String(d.Get("s3_bucket_name").(string)) | ||
| } | ||
| if d.HasChange("s3_key_prefix") { | ||
| input.S3KeyPrefix = aws.String(d.Get("s3_key_prefix").(string)) | ||
| } | ||
| if d.HasChange("cloud_watch_logs_role_arn") { | ||
| input.CloudWatchLogsRoleArn = aws.String(d.Get("cloud_watch_logs_role_arn").(string)) | ||
| } | ||
| if d.HasChange("cloud_watch_logs_group_arn") { | ||
| input.CloudWatchLogsLogGroupArn = aws.String(d.Get("cloud_watch_logs_group_arn").(string)) | ||
| } | ||
| if d.HasChange("include_global_service_events") { | ||
| input.IncludeGlobalServiceEvents = aws.Bool(d.Get("include_global_service_events").(bool)) | ||
| } | ||
| if d.HasChange("sns_topic_name") { | ||
| input.SnsTopicName = aws.String(d.Get("sns_topic_name").(string)) | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Updating CloudTrail: %s", input) | ||
| t, err := conn.UpdateTrail(&input) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| log.Printf("[DEBUG] CloudTrail updated: %s", t) | ||
|
|
||
| return resourceAwsCloudTrailRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsCloudTrailDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).cloudtrailconn | ||
| name := d.Get("name").(string) | ||
|
|
||
| log.Printf("[DEBUG] Deleting CloudTrail: %q", name) | ||
| _, err := conn.DeleteTrail(&cloudtrail.DeleteTrailInput{ | ||
| Name: aws.String(name), | ||
| }) | ||
|
|
||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "math/rand" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/cloudtrail" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAccAWSCloudTrail_basic(t *testing.T) { | ||
| var trail cloudtrail.Trail | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSCloudTrailDestroy, | ||
| Steps: []resource.TestStep{ | ||
| resource.TestStep{ | ||
| Config: testAccAWSCloudTrailConfig, | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckCloudTrailExists("aws_cloudtrail.foobar", &trail), | ||
| resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "include_global_service_events", "true"), | ||
| ), | ||
| }, | ||
| resource.TestStep{ | ||
| Config: testAccAWSCloudTrailConfigModified, | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckCloudTrailExists("aws_cloudtrail.foobar", &trail), | ||
| resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "s3_key_prefix", "/prefix"), | ||
| resource.TestCheckResourceAttr("aws_cloudtrail.foobar", "include_global_service_events", "false"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func testAccCheckCloudTrailExists(n string, trail *cloudtrail.Trail) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| rs, ok := s.RootModule().Resources[n] | ||
| if !ok { | ||
| return fmt.Errorf("Not found: %s", n) | ||
| } | ||
|
|
||
| conn := testAccProvider.Meta().(*AWSClient).cloudtrailconn | ||
| params := cloudtrail.DescribeTrailsInput{ | ||
| TrailNameList: []*string{aws.String(rs.Primary.ID)}, | ||
| } | ||
| resp, err := conn.DescribeTrails(¶ms) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(resp.TrailList) == 0 { | ||
| return fmt.Errorf("Trail not found") | ||
| } | ||
| *trail = *resp.TrailList[0] | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckAWSCloudTrailDestroy(s *terraform.State) error { | ||
| conn := testAccProvider.Meta().(*AWSClient).cloudtrailconn | ||
|
|
||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "aws_cloudtrail" { | ||
| continue | ||
| } | ||
|
|
||
| params := cloudtrail.DescribeTrailsInput{ | ||
| TrailNameList: []*string{aws.String(rs.Primary.ID)}, | ||
| } | ||
|
|
||
| resp, err := conn.DescribeTrails(¶ms) | ||
|
|
||
| if err == nil { | ||
| if len(resp.TrailList) != 0 && | ||
| *resp.TrailList[0].Name == rs.Primary.ID { | ||
| return fmt.Errorf("CloudTrail still exists: %s", rs.Primary.ID) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| var cloudTrailRandInt = rand.New(rand.NewSource(time.Now().UnixNano())).Int() | ||
|
|
||
| var testAccAWSCloudTrailConfig = fmt.Sprintf(` | ||
| resource "aws_cloudtrail" "foobar" { | ||
| name = "tf-trail-foobar" | ||
| s3_bucket_name = "${aws_s3_bucket.foo.id}" | ||
| } | ||
| resource "aws_s3_bucket" "foo" { | ||
| bucket = "tf-test-trail-%d" | ||
| force_destroy = true | ||
| policy = <<POLICY | ||
| { | ||
| "Version": "2012-10-17", | ||
| "Statement": [ | ||
| { | ||
| "Sid": "AWSCloudTrailAclCheck", | ||
| "Effect": "Allow", | ||
| "Principal": "*", | ||
| "Action": "s3:GetBucketAcl", | ||
| "Resource": "arn:aws:s3:::tf-test-trail-%d" | ||
| }, | ||
| { | ||
| "Sid": "AWSCloudTrailWrite", | ||
| "Effect": "Allow", | ||
| "Principal": "*", | ||
| "Action": "s3:PutObject", | ||
| "Resource": "arn:aws:s3:::tf-test-trail-%d/*", | ||
| "Condition": { | ||
| "StringEquals": { | ||
| "s3:x-amz-acl": "bucket-owner-full-control" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| POLICY | ||
| } | ||
| `, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt) | ||
|
|
||
| var testAccAWSCloudTrailConfigModified = fmt.Sprintf(` | ||
| resource "aws_cloudtrail" "foobar" { | ||
| name = "tf-trail-foobar" | ||
| s3_bucket_name = "${aws_s3_bucket.foo.id}" | ||
| s3_key_prefix = "/prefix" | ||
| include_global_service_events = false | ||
| } | ||
| resource "aws_s3_bucket" "foo" { | ||
| bucket = "tf-test-trail-%d" | ||
| force_destroy = true | ||
| policy = <<POLICY | ||
| { | ||
| "Version": "2012-10-17", | ||
| "Statement": [ | ||
| { | ||
| "Sid": "AWSCloudTrailAclCheck", | ||
| "Effect": "Allow", | ||
| "Principal": "*", | ||
| "Action": "s3:GetBucketAcl", | ||
| "Resource": "arn:aws:s3:::tf-test-trail-%d" | ||
| }, | ||
| { | ||
| "Sid": "AWSCloudTrailWrite", | ||
| "Effect": "Allow", | ||
| "Principal": "*", | ||
| "Action": "s3:PutObject", | ||
| "Resource": "arn:aws:s3:::tf-test-trail-%d/*", | ||
| "Condition": { | ||
| "StringEquals": { | ||
| "s3:x-amz-acl": "bucket-owner-full-control" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| POLICY | ||
| } | ||
| `, cloudTrailRandInt, cloudTrailRandInt, cloudTrailRandInt) |
Oops, something went wrong.