Skip to content

Commit 245f309

Browse files
mrgrainmrgrain
authored
Merge branch 'main' into mrgrain/ci/concurrency
2 parents 7a0e128 + 164dc01 commit 245f309

File tree

14 files changed

+157
-13
lines changed

14 files changed

+157
-13
lines changed

‎.github/workflows/pr-build.yml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,24 @@ jobs:
3838
- name: Set up Docker
3939
uses: docker/setup-buildx-action@v3
4040

41+
- name: Load Docker images
42+
id: docker-cache
43+
uses: actions/cache/restore@v4
44+
with:
45+
path: |
46+
~/.docker-images.tar
47+
key: docker-cache-${{ runner.os }}
48+
49+
- name: Restore Docker images
50+
if: ${{ steps.docker-cache.outputs.cache-hit }}
51+
run: docker image load --input ~/.docker-images.tar
52+
4153
- name: Cache build artifacts
4254
uses: actions/cache@v4
4355
with:
4456
path: |
4557
~/.s3buildcache
46-
key: ${{ runner.os }}-${{ github.event.pull_request.base.ref }}-s3buildcache
58+
key: s3buildcache-${{ runner.os }}
4759

4860
- name: Configure system settings
4961
run: |
@@ -58,3 +70,15 @@ jobs:
5870

5971
- name: Check for uncommitted changes
6072
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
73+
74+
- name: Export Docker images
75+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
76+
run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
77+
78+
- name: Cache Docker images
79+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
80+
uses: actions/cache/save@v4
81+
with:
82+
path: |
83+
~/.docker-images.tar
84+
key: docker-cache-${{ runner.os }}

‎packages/aws-cdk-lib/aws-aiops/.jsiirc.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"targets": {
3+
"java": {
4+
"package": "software.amazon.awscdk.services.aiops"
5+
},
6+
"dotnet": {
7+
"package": "Amazon.CDK.AWS.AIOps"
8+
},
9+
"python": {
10+
"module": "aws_cdk.aws_aiops"
11+
}
12+
}
13+
}

‎packages/aws-cdk-lib/aws-aiops/README.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# AWS::AIOps Construct Library
2+
<!--BEGIN STABILITY BANNER-->
3+
4+
---
5+
6+
![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
7+
8+
> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
9+
>
10+
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
11+
12+
---
13+
14+
<!--END STABILITY BANNER-->
15+
16+
This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
17+
18+
```ts nofixture
19+
import * as aiops from 'aws-cdk-lib/aws-aiops';
20+
```
21+
22+
<!--BEGIN CFNONLY DISCLAIMER-->
23+
24+
There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
25+
26+
- Search [Construct Hub for AIOps construct libraries](https://constructs.dev/search?q=aiops)
27+
- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::AIOps resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_AIOps.html) directly.
28+
29+
30+
<!--BEGIN CFNONLY DISCLAIMER-->
31+
32+
There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
33+
However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
34+
35+
For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::AIOps](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_AIOps.html).
36+
37+
(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
38+
39+
<!--END CFNONLY DISCLAIMER-->

‎packages/aws-cdk-lib/aws-aiops/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './lib';

‎packages/aws-cdk-lib/aws-aiops/lib/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// AWS::AIOps Cloudformation Resources
2+
export * from './aiops.generated';

‎packages/aws-cdk-lib/aws-workspacesinstances/.jsiirc.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"targets": {
3+
"java": {
4+
"package": "software.amazon.awscdk.services.workspacesinstances"
5+
},
6+
"dotnet": {
7+
"package": "Amazon.CDK.AWS.WorkspacesInstances"
8+
},
9+
"python": {
10+
"module": "aws_cdk.aws_workspacesinstances"
11+
}
12+
}
13+
}

‎packages/aws-cdk-lib/aws-workspacesinstances/README.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# AWS::WorkspacesInstances Construct Library
2+
<!--BEGIN STABILITY BANNER-->
3+
4+
---
5+
6+
![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
7+
8+
> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
9+
>
10+
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
11+
12+
---
13+
14+
<!--END STABILITY BANNER-->
15+
16+
This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
17+
18+
```ts nofixture
19+
import * as workspacesinstances from 'aws-cdk-lib/aws-workspacesinstances';
20+
```
21+
22+
<!--BEGIN CFNONLY DISCLAIMER-->
23+
24+
There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
25+
26+
- Search [Construct Hub for WorkspacesInstances construct libraries](https://constructs.dev/search?q=workspacesinstances)
27+
- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::WorkspacesInstances resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_WorkspacesInstances.html) directly.
28+
29+
30+
<!--BEGIN CFNONLY DISCLAIMER-->
31+
32+
There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
33+
However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
34+
35+
For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::WorkspacesInstances](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_WorkspacesInstances.html).
36+
37+
(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
38+
39+
<!--END CFNONLY DISCLAIMER-->

‎packages/aws-cdk-lib/aws-workspacesinstances/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './lib';

‎packages/aws-cdk-lib/aws-workspacesinstances/lib/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// AWS::WorkspacesInstances Cloudformation Resources
2+
export * from './workspacesinstances.generated';

‎packages/aws-cdk-lib/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export * as assertions from './assertions';
33
export * as assets from './assets';
44
export * as aws_accessanalyzer from './aws-accessanalyzer';
55
export * as aws_acmpca from './aws-acmpca';
6+
export * as aws_aiops from './aws-aiops';
67
export * as aws_amazonmq from './aws-amazonmq';
78
export * as aws_amplify from './aws-amplify';
89
export * as aws_amplifyuibuilder from './aws-amplifyuibuilder';
@@ -282,6 +283,7 @@ export * as aws_wafregional from './aws-wafregional';
282283
export * as aws_wafv2 from './aws-wafv2';
283284
export * as aws_wisdom from './aws-wisdom';
284285
export * as aws_workspaces from './aws-workspaces';
286+
export * as aws_workspacesinstances from './aws-workspacesinstances';
285287
export * as aws_workspacesthinclient from './aws-workspacesthinclient';
286288
export * as aws_workspacesweb from './aws-workspacesweb';
287289
export * as aws_xray from './aws-xray';

0 commit comments

Comments
 (0)