Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions applications/feedback_sentiment_analyzer/SPECIFICATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ For example:

```json
{
"bucket": "DOC-EXAMPLE-BUCKET",
"bucket": "amzn-s3-demo-bucket",
"region": "us-east-1",
"object": "obj/ect.png"
}
Expand Down Expand Up @@ -295,7 +295,7 @@ For example:

```json
{
"bucket": "DOC-EXAMPLE-BUCKET",
"bucket": "amzn-s3-demo-bucket",
"translated_text": "THIS HOTEL WAS GREAT",
"region": "us-east-1",
"object": "comment.png"
Expand Down
2 changes: 1 addition & 1 deletion aws-cli/bash-linux/s3/s3_getting_started.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function s3_getting_started() {
echo_repeat "*" 88

local bucket_name
bucket_name=$(generate_random_name "doc-example-bucket")
bucket_name=$(generate_random_name "amzn-s3-demo-bucket")

local region_code
region_code=$(aws configure get region)
Expand Down
4 changes: 2 additions & 2 deletions cpp/example_code/iam/tests/mock_input/ListBuckets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Buckets>
<Bucket>
<CreationDate>2019-12-11T23:32:47+00:00</CreationDate>
<String>DOC-EXAMPLE-BUCKET</String>
<String>amzn-s3-demo-bucket</String>
</Bucket>
<Bucket>
<CreationDate>2019-11-10T23:32:13+00:00</CreationDate>
<String>DOC-EXAMPLE-BUCKET2</String>
<String>amzn-s3-demo-bucket2</String>
</Bucket>
</Buckets>
<Owner>
Expand Down
4 changes: 2 additions & 2 deletions cpp/example_code/s3/create_bucket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ int main() {

// Create a unique bucket name to increase the chance of success
// when trying to create the bucket.
// Format: "doc-example-bucket-" + lowercase UUID.
// Format: "amzn-s3-demo-bucket-" + lowercase UUID.
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

AwsDoc::S3::createBucket(bucketName, clientConfig);
Expand Down
4 changes: 2 additions & 2 deletions cpp/example_code/s3/list_objects_with_aws_global_region.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static const int MAX_TIMEOUT_RETRIES = 20;
static Aws::String createOneBucket(const Aws::S3::S3Client &s3Client) {
// Create an S3 bucket within the us-west-2 AWS Region.
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

Aws::S3::Model::CreateBucketRequest createBucketRequest;
Expand Down Expand Up @@ -203,4 +203,4 @@ int main() {
return 0;
}

#endif // EXCLUDE_MAIN_FUNCTION
#endif // EXCLUDE_MAIN_FUNCTION
4 changes: 2 additions & 2 deletions cpp/example_code/s3/s3_getting_started_scenario.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ bool AwsDoc::S3::S3_GettingStartedScenario(const Aws::String &uploadFilePath,
Aws::S3::S3Client client(clientConfig);

// Create a unique bucket name which is only temporary and will be deleted.
// Format: "doc-example-bucket-" + lowercase UUID.
// Format: "amzn-s3-demo-bucket-" + lowercase UUID.
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

// 1. Create a bucket.
Expand Down
2 changes: 1 addition & 1 deletion cpp/example_code/s3/tests/S3_GTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void AwsDocTest::S3_GTests::TearDownTestSuite() {
std::vector<Aws::String> AwsDocTest::S3_GTests::GetCachedS3Buckets(size_t count) {
for (size_t index = s_cachedS3Buckets.size(); index < count; ++index) {
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

if (CreateBucket(bucketName)) {
Expand Down
2 changes: 1 addition & 1 deletion cpp/example_code/s3/tests/gtest_create_bucket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace AwsDocTest {
// NOLINTNEXTLINE(readability-named-parameter)
TEST_F(S3_GTests, create_bucket_2_) {
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

bool result = AwsDoc::S3::createBucket(bucketName, *s_clientConfig);
Expand Down
2 changes: 1 addition & 1 deletion cpp/example_code/s3/tests/gtest_delete_bucket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace AwsDocTest {
// NOLINTNEXTLINE(readability-named-parameter)
TEST_F(S3_GTests, delete_bucket_2_) {
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());


Expand Down
4 changes: 2 additions & 2 deletions cpp/example_code/s3/tests/gtest_put_bucket_policy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ namespace AwsDocTest {
"AWS": "arn:aws:iam::111111222222:user/UnitTester"
},
"Action": "s3:GetObject",
"Resource": "arn:aws:s3:::doc-example-bucket/*"
"Resource": "arn:aws:s3:::amzn-s3-demo-bucket/*"
}
]
})";

result = AwsDoc::S3::putBucketPolicy("doc-example-bucket", policyString, *s_clientConfig);
result = AwsDoc::S3::putBucketPolicy("amzn-s3-demo-bucket", policyString, *s_clientConfig);
ASSERT_TRUE(result);
}
} // namespace AwsDocTest
2 changes: 1 addition & 1 deletion cpp/example_code/s3/tests/gtest_s3_demo_for_cloud9.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace AwsDocTest {
// NOLINTNEXTLINE(readability-named-parameter)
TEST_F(S3_GTests, s3_demo_for_cloud9) {
Aws::String uuid = Aws::Utils::UUID::RandomUUID();
Aws::String bucketName = "doc-example-bucket-" +
Aws::String bucketName = "amzn-s3-demo-bucket-" +
Aws::Utils::StringUtils::ToLower(uuid.c_str());

Aws::S3::S3Client s3Client(*s_clientConfig);
Expand Down
4 changes: 2 additions & 2 deletions cpp/example_code/s3/tests/mock_input/GetBucketPolicy.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"AWS": "arn:aws:iam::111111222222:user/UnitTester"
},
"Action": "s3:GetObject",
"Resource": "arn:aws:s3:::doc-example-bucket/*"
"Resource": "arn:aws:s3:::amzn-s3-demo-bucket/*"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static async Task Main()
var client = new AmazonCloudWatchLogsClient();
string taskName = "export-task-example";
string logGroupName = "cloudwatchlogs-example-loggroup";
string destination = "doc-example-bucket";
string destination = "amzn-s3-demo-bucket";
var fromTime = 1437584472382;
var toTime = 1437584472833;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"BucketName": "DOC-EXAMPLE-BUCKET1",
"BucketName": "amzn-s3-demo-bucket1",
"VpcId": "vpc-1a2b3c4d",
"SubnetId": "subnet-012345678912345606",
"SecurityGroupId": "sg-012345678912345606",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"BucketName": "DOC-EXAMPLE-BUCKET1",
"BucketName": "amzn-s3-demo-bucket1",
"VpcId": "vpc-1a2b3c4d",
"SubnetId": "subnet-012345678912345606",
"SecurityGroupId": "sg-012345678912345606",
Expand Down
4 changes: 2 additions & 2 deletions dotnetv3/Lambda/Scenarios/LambdaBasics/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"FunctionName": "LambdaExample",
"Handler": "LambdaIncrement::LambdaIncrement.Function::FunctionHandler",
"UpdatedHandler": "LambdaCalculator::LambdaCalculator.Function::FunctionHandler",
"BucketName": "doc-example-bucket",
"BucketName": "amzn-s3-demo-bucket",
"IncrementKey": "LambdaIncrement.zip",
"CalculatorKey": "LambdaCalculator.zip",
"RoleName": "lambda-support",
"PolicyArn": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
}
}
2 changes: 1 addition & 1 deletion dotnetv3/Lambda/Tests/testsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"FunctionName": "LambdaExample",
"IncrementHandler": "LambdaIncrement::LambdaIncrement.Function::FunctionHandler",
"CalculatorHandler": "LambdaCalculator::LambdaCalculator.Function::FunctionHandler",
"BucketName": "doc-example-bucket",
"BucketName": "amzn-s3-demo-bucket",
"IncrementKey": "LambdaIncrement.zip",
"CalculatorKey": "LambdaCalculator.zip",
"RoleName": "lambda-support",
Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/Rekognition/AddFacesExample/AddFaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class AddFaces
public static async Task Main()
{
string collectionId = "MyCollection2";
string bucket = "doc-example-bucket";
string bucket = "amzn-s3-demo-bucket";
string photo = "input.jpg";

var rekognitionClient = new AmazonRekognitionClient();
Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/AbortMPUExample/AbortMPU.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class AbortMPU
{
public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";

// If the AWS Region defined for your default user is different
// from the Region where your Amazon S3 bucket is located,
Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/BucketACLExample/BucketACL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class BucketACL
{
public static async Task Main()
{
const string newBucketName = "doc-example-bucket";
const string newBucketName = "amzn-s3-demo-bucket";

IAmazonS3 client = new AmazonS3Client();

Expand Down
4 changes: 2 additions & 2 deletions dotnetv3/S3/CopyObjectExample/CopyObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public static async Task Main()
IAmazonS3 s3Client = new AmazonS3Client();

// Remember to change these values to refer to your Amazon S3 objects.
string sourceBucketName = "doc-example-bucket1";
string destinationBucketName = "doc-example-bucket2";
string sourceBucketName = "amzn-s3-demo-bucket1";
string destinationBucketName = "amzn-s3-demo-bucket2";
string sourceObjectKey = "testfile.txt";
string destinationObjectKey = "testfilecopy.txt";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class EnableNotifications
{
public static async Task Main()
{
const string bucketName = "doc-example-bucket1";
const string bucketName = "amzn-s3-demo-bucket1";
const string snsTopic = "arn:aws:sns:us-east-2:0123456789ab:bucket-notify";
const string sqsQueue = "arn:aws:sqs:us-east-2:0123456789ab:Example_Queue";

Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/GenPresignedURLExample/GenPresignedUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class GenPresignedUrl
{
public static void Main()
{
const string bucketName = "doc-example-bucket";
const string bucketName = "amzn-s3-demo-bucket";
const string objectKey = "sample.txt";

// Specify how long the presigned URL lasts, in hours
Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/LifecycleExample/Lifecycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static async Task Main()
// should look like this:
// RegionEndpoint.USWest2
var client = new AmazonS3Client();
const string BucketName = "doc-example-bucket";
const string BucketName = "amzn-s3-demo-bucket";

await AddUpdateDeleteLifecycleConfigAsync(client, BucketName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace ListObjectsPaginatorExample
/// </summary>
public class ListObjectsPaginator
{
private const string BucketName = "doc-example-bucket";
private const string BucketName = "amzn-s3-demo-bucket";

public static async Task Main()
{
Expand Down
4 changes: 2 additions & 2 deletions dotnetv3/S3/MPUapiCopyObjExample/MPUapiCopyObj.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace MPUapiCopyObjectExample
/// </summary>
public class MPUapiCopyObj
{
private const string SourceBucket = "doc-example-bucket1";
private const string TargetBucket = "doc-example-bucket2";
private const string SourceBucket = "amzn-s3-demo-bucket1";
private const string TargetBucket = "amzn-s3-demo-bucket2";
private const string SourceObjectKey = "example.mov";
private const string TargetObjectKey = "copied_video_file.mov";

Expand Down
4 changes: 2 additions & 2 deletions dotnetv3/S3/ManageACLsExample/ManageACLs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class ManageACLs
{
public static async Task Main()
{
string bucketName = "doc-example-bucket1";
string newBucketName = "doc-example-bucket2";
string bucketName = "amzn-s3-demo-bucket1";
string newBucketName = "amzn-s3-demo-bucket2";
string keyName = "sample-object.txt";
string emailAddress = "[email protected]";

Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/ObjectTagExample/ObjectTag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class ObjectTag
{
public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string keyName = "newobject.txt";
string filePath = @"*** file path ***";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class RestoreArchivedObject
{
public static void Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string objectKey = "archived-object.txt";

// Specify your bucket region (an example region is shown).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class SSECLowLevelMPUcopyObject
{
public static async Task Main()
{
string existingBucketName = "doc-example-bucket";
string existingBucketName = "amzn-s3-demo-bucket";
string sourceKeyName = "sample_file.txt";
string targetKeyName = "sample_file_copy.txt";
string filePath = $"sample\\{targetKeyName}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class SSEClientEncryption
{
public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string keyName = "exampleobject.txt";
string copyTargetKeyName = "examplecopy.txt";

Expand Down
4 changes: 2 additions & 2 deletions dotnetv3/S3/ServerAccessLoggingExample/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"BucketName": "DOC-EXAMPLE-SOURCE-BUCKET",
"LogBucketName": "DOC-EXAMPLE-DESTINATION-BUCKET",
"BucketName": "amzn-s3-demo-source-bucket",
"LogBucketName": "amzn-s3-demo-destination-bucket",
"LogObjectKeyPrefix": "access-logs/",
"AccountId": "111122223333"
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ServerSideEncryption
{
public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string keyName = "samplefile.txt";

// If the AWS Region defined for your default user is different
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class TrackMPUUsingHighLevelAPI
{
public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string keyName = "sample_pic.png";
string path = "filepath/directory/";
string filePath = $"{path}{keyName}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class TransferAcceleration
public static async Task Main()
{
var s3Client = new AmazonS3Client();
const string bucketName = "doc-example-bucket";
const string bucketName = "amzn-s3-demo-bucket";

await EnableAccelerationAsync(s3Client, bucketName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class UploadUsingPresignedURL

public static async Task Main()
{
string bucketName = "doc-example-bucket";
string bucketName = "amzn-s3-demo-bucket";
string keyName = "samplefile.txt";
string filePath = $"source\\{keyName}";

Expand Down
2 changes: 1 addition & 1 deletion dotnetv3/S3/WebsiteConfigExample/WebsiteConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class WebsiteConfig
/// </summary>
public static async Task Main()
{
const string bucketName = "doc-example-bucket";
const string bucketName = "amzn-s3-demo-bucket";
const string indexDocumentSuffix = "index.html";
const string errorDocument = "error.html";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class DeleteMultipleObjects
/// </summary>
public static async Task Main()
{
const string bucketName = "doc-example-bucket";
const string bucketName = "amzn-s3-demo-bucket";

// If the Amazon S3 bucket from which you wish to delete objects is not
// located in the same AWS Region as the default user, define the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class DeleteObject
/// </summary>
public static async Task Main()
{
const string bucketName = "doc-example-bucket";
const string bucketName = "amzn-s3-demo-bucket";
const string keyName = "testfile.txt";

// If the Amazon S3 bucket is located in an AWS Region other than the
Expand Down
Loading
Loading