From 2a9f47aa70f4769236d3d23380a345743e448be0 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 2 Jun 2016 12:13:39 +0100 Subject: [PATCH] provider/aws: aws_s3_object -> aws_s3_bucket_object (docs + filename) (#6979) * aws/docs: Fix s3_bucket_object DS documentation * provider/aws: aws_s3_object -> aws_s3_bucket_object --- ...ject.go => data_source_aws_s3_bucket_object.go} | 0 ...tml.markdown => s3_bucket_object.html.markdown} | 14 +++++++------- website/source/layouts/aws.erb | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename builtin/providers/aws/{data_source_aws_s3_object.go => data_source_aws_s3_bucket_object.go} (100%) rename website/source/docs/providers/aws/d/{s3_object.html.markdown => s3_bucket_object.html.markdown} (91%) diff --git a/builtin/providers/aws/data_source_aws_s3_object.go b/builtin/providers/aws/data_source_aws_s3_bucket_object.go similarity index 100% rename from builtin/providers/aws/data_source_aws_s3_object.go rename to builtin/providers/aws/data_source_aws_s3_bucket_object.go diff --git a/website/source/docs/providers/aws/d/s3_object.html.markdown b/website/source/docs/providers/aws/d/s3_bucket_object.html.markdown similarity index 91% rename from website/source/docs/providers/aws/d/s3_object.html.markdown rename to website/source/docs/providers/aws/d/s3_bucket_object.html.markdown index 680c745bc..a28a99967 100644 --- a/website/source/docs/providers/aws/d/s3_object.html.markdown +++ b/website/source/docs/providers/aws/d/s3_bucket_object.html.markdown @@ -1,12 +1,12 @@ --- layout: "aws" -page_title: "AWS: aws_s3_object" -sidebar_current: "docs-aws-datasource-s3-object" +page_title: "AWS: aws_s3_bucket_object" +sidebar_current: "docs-aws-datasource-s3-bucket-object" description: |- Provides metadata and optionally content of an S3 object --- -# aws\_s3\_object +# aws\_s3\_bucket\_object The S3 object data source allows access to the metadata and _optionally_ (see below) content of an object stored inside S3 bucket. @@ -16,7 +16,7 @@ _optionally_ (see below) content of an object stored inside S3 bucket. ## Example Usage ``` -data "aws_s3_object" "lambda" { +data "aws_s3_bucket_object" "lambda" { bucket = "my-lambda-functions" key = "hello-world.zip" } @@ -41,9 +41,9 @@ EOF } resource "aws_lambda_function" "test_lambda" { - s3_bucket = "${data.aws_s3_object.lambda.bucket}" - s3_key = "${data.aws_s3_object.lambda.key}" - s3_object_version = "${data.aws_s3_object.lambda.version_id}" + s3_bucket = "${data.aws_s3_bucket_object.lambda.bucket}" + s3_key = "${data.aws_s3_bucket_object.lambda.key}" + s3_object_version = "${data.aws_s3_bucket_object.lambda.version_id}" function_name = "lambda_function_name" role = "${aws_iam_role.iam_for_lambda.arn}" handler = "exports.test" diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb index ea360e9eb..335e6f9d9 100644 --- a/website/source/layouts/aws.erb +++ b/website/source/layouts/aws.erb @@ -22,8 +22,8 @@ > aws_iam_policy_document - > - aws_s3_object + > + aws_s3_bucket_object