Skip to content

Commit 7303172

Browse files
authored
Merge branch 'master' into corymhall/integ-tests/internal
2 parents 51b1907 + e9cbda3 commit 7303172

2 files changed

Lines changed: 30 additions & 20 deletions

File tree

packages/@aws-cdk/aws-s3/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -522,15 +522,15 @@ by deploying with CDK version `1.126.0` or later **before** switching this value
522522

523523
```ts
524524
const bucket = new s3.Bucket(this, 'MyBucket', {
525-
transferAcceleration: true,
525+
transferAcceleration: true,
526526
});
527527
```
528528

529529
To access the bucket that is enabled for Transfer Acceleration, you must use a special endpoint. The URL can be generated using method `transferAccelerationUrlForObject`:
530530

531531
```ts
532532
const bucket = new s3.Bucket(this, 'MyBucket', {
533-
transferAcceleration: true,
533+
transferAcceleration: true,
534534
});
535535
bucket.transferAccelerationUrlForObject('objectname');
536536
```
@@ -540,14 +540,14 @@ bucket.transferAccelerationUrlForObject('objectname');
540540
[Intelligent Tiering](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intelligent-tiering.html) can be configured to automatically move files to glacier:
541541

542542
```ts
543-
new s3.Bucket(this, 'MyBucket', {
544-
intelligentTieringConfigurations: [{
545-
name: 'foo',
546-
prefix: 'folder/name',
547-
archiveAccessTierTime: cdk.Duration.days(90),
548-
deepArchiveAccessTierTime: cdk.Duration.days(180),
549-
tags: [{key: 'tagname', value: 'tagvalue'}]
550-
}],
543+
new s3.Bucket(this, 'MyBucket', {
544+
intelligentTieringConfigurations: [{
545+
name: 'foo',
546+
prefix: 'folder/name',
547+
archiveAccessTierTime: cdk.Duration.days(90),
548+
deepArchiveAccessTierTime: cdk.Duration.days(180),
549+
tags: [{key: 'tagname', value: 'tagvalue'}]
550+
}],
551551
});
552552

553553
```

packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc
3838
*
3939
* * **repo** - to read the repository
4040
* * **admin:repo_hook** - if you plan to use webhooks (true by default)
41+
*
42+
* If you need access to symlinks or the repository history, use a source of type
43+
* `connection` instead.
4144
*/
4245
public static gitHub(repoString: string, branch: string, props: GitHubSourceOptions = {}): CodePipelineSource {
4346
return new GitHubSource(repoString, branch, props);
@@ -92,6 +95,9 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc
9295
* });
9396
* ```
9497
*
98+
* If you need access to symlinks or the repository history, be sure to set
99+
* `codeBuildCloneOutput`.
100+
*
95101
* @param repoString A string that encodes owner and repository separated by a slash (e.g. 'owner/repo').
96102
* @param branch The branch to use.
97103
* @param props The source properties, including the connection ARN.
@@ -105,6 +111,10 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc
105111
/**
106112
* Returns a CodeCommit source.
107113
*
114+
* If you need access to symlinks or the repository history, be sure to set
115+
* `codeBuildCloneOutput`.
116+
*
117+
*
108118
* @param repository The CodeCommit repository.
109119
* @param branch The branch to use.
110120
* @param props The source properties.
@@ -360,12 +370,12 @@ export interface ConnectionSourceOptions {
360370

361371
// long URL in @see
362372
/**
363-
* Whether the output should be the contents of the repository
364-
* (which is the default),
365-
* or a link that allows CodeBuild to clone the repository before building.
373+
* If this is set, the next CodeBuild job clones the repository (instead of CodePipeline downloading the files).
374+
*
375+
* This provides access to repository history, and retains symlinks (symlinks would otherwise be
376+
* removed by CodePipeline).
366377
*
367-
* **Note**: if this option is true,
368-
* then only CodeBuild actions can use the resulting {@link output}.
378+
* **Note**: if this option is true, only CodeBuild jobs can use the output artifact.
369379
*
370380
* @default false
371381
* @see https://docs.aws.amazon.com/codepipeline/latest/userguide/action-reference-CodestarConnectionSource.html#action-reference-CodestarConnectionSource-config
@@ -435,12 +445,12 @@ export interface CodeCommitSourceOptions {
435445
readonly eventRole?: iam.IRole;
436446

437447
/**
438-
* Whether the output should be the contents of the repository
439-
* (which is the default),
440-
* or a link that allows CodeBuild to clone the repository before building.
448+
* If this is set, the next CodeBuild job clones the repository (instead of CodePipeline downloading the files).
449+
*
450+
* This provides access to repository history, and retains symlinks (symlinks would otherwise be
451+
* removed by CodePipeline).
441452
*
442-
* **Note**: if this option is true,
443-
* then only CodeBuild actions can use the resulting {@link output}.
453+
* **Note**: if this option is true, only CodeBuild jobs can use the output artifact.
444454
*
445455
* @default false
446456
* @see https://docs.aws.amazon.com/codepipeline/latest/userguide/action-reference-CodeCommit.html

0 commit comments

Comments
 (0)