diff --git a/builtin/providers/aws/data_source_aws_billing_service_account.go b/builtin/providers/aws/data_source_aws_billing_service_account.go new file mode 100644 index 000000000000..f5bfb838727e --- /dev/null +++ b/builtin/providers/aws/data_source_aws_billing_service_account.go @@ -0,0 +1,29 @@ +package aws + +import ( + "github.com/hashicorp/terraform/helper/schema" +) + +// See http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/billing-getting-started.html#step-2 +var billingAccountId = "386209384616" + +func dataSourceAwsBillingServiceAccount() *schema.Resource { + return &schema.Resource{ + Read: dataSourceAwsBillingServiceAccountRead, + + Schema: map[string]*schema.Schema{ + "arn": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func dataSourceAwsBillingServiceAccountRead(d *schema.ResourceData, meta interface{}) error { + d.SetId(billingAccountId) + + d.Set("arn", "arn:aws:iam::"+billingAccountId+":root") + + return nil +} diff --git a/builtin/providers/aws/data_source_aws_billing_service_account_test.go b/builtin/providers/aws/data_source_aws_billing_service_account_test.go new file mode 100644 index 000000000000..adfee84f85b0 --- /dev/null +++ b/builtin/providers/aws/data_source_aws_billing_service_account_test.go @@ -0,0 +1,27 @@ +package aws + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAWSBillingServiceAccount_basic(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccCheckAwsBillingServiceAccountConfig, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("data.aws_billing_service_account.main", "id", "386209384616"), + resource.TestCheckResourceAttr("data.aws_billing_service_account.main", "arn", "arn:aws:iam::386209384616:root"), + ), + }, + }, + }) +} + +const testAccCheckAwsBillingServiceAccountConfig = ` +data "aws_billing_service_account" "main" { } +` diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index c3e48e902361..a9ecf320fde9 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -145,6 +145,7 @@ func Provider() terraform.ResourceProvider { DataSourcesMap: map[string]*schema.Resource{ "aws_ami": dataSourceAwsAmi(), "aws_availability_zones": dataSourceAwsAvailabilityZones(), + "aws_billing_service_account": dataSourceAwsBillingServiceAccount(), "aws_caller_identity": dataSourceAwsCallerIdentity(), "aws_cloudformation_stack": dataSourceAwsCloudFormationStack(), "aws_ecs_container_definition": dataSourceAwsEcsContainerDefinition(), diff --git a/website/source/docs/providers/aws/d/billing_service_account.markdown b/website/source/docs/providers/aws/d/billing_service_account.markdown new file mode 100644 index 000000000000..6594ea4655e3 --- /dev/null +++ b/website/source/docs/providers/aws/d/billing_service_account.markdown @@ -0,0 +1,60 @@ +--- +layout: "aws" +page_title: "AWS: aws_billing_service_account" +sidebar_current: "docs-aws-datasource-billing-service-account" +description: |- + Get AWS Billing Service Account +--- + +# aws\_billing\_service\_account + +Use this data source to get the Account ID of the [AWS Billing and Cost Management Service Account](http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/billing-getting-started.html#step-2) for the purpose of whitelisting in S3 bucket policy. + +## Example Usage + +``` +data "aws_billing_service_account" "main" { } + +resource "aws_s3_bucket" "billing_logs" { + bucket = "my-billing-tf-test-bucket" + acl = "private" + policy = <