Skip to content

Commit

Permalink
Merge branch 'aws:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
randyridgley authored Jul 18, 2023
2 parents 7284055 + c8d8421 commit 6327ddc
Show file tree
Hide file tree
Showing 575 changed files with 889,727 additions and 38,265 deletions.
127 changes: 0 additions & 127 deletions .github/workflows/yarn-upgrade-v1main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"cdk-generate-synthetic-examples": "^0.1.287",
"cdk-generate-synthetic-examples": "^0.1.291",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"DedicatedMasterEnabled": false,
"InstanceCount": 1,
"InstanceType": "r5.large.search",
"ZoneAwarenessEnabled": false
"ZoneAwarenessEnabled": false,
"MultiAZWithStandbyEnabled": false
},
"DomainEndpointOptions": {
"EnforceHTTPS": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ class OpensSearch23Stack extends cdk.Stack {
},
nodeToNodeEncryption: true,
enforceHttps: true,
capacity: {
multiAzWithStandbyEnabled: false,
},
});

const api = new appsync.GraphqlApi(this, 'api', {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":"32.0.0"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "32.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
"path": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "32.0.0",
"testCases": {
"codebuild-arm-docker-registry/DefaultTest": {
"stacks": [
"test-codebuild-arm-docker-registry"
],
"stackUpdateWorkflow": false,
"assertionStack": "codebuild-arm-docker-registry/DefaultTest/DeployAssert",
"assertionStackName": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"version": "32.0.0",
"artifacts": {
"test-codebuild-arm-docker-registry.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "test-codebuild-arm-docker-registry.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"test-codebuild-arm-docker-registry": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "test-codebuild-arm-docker-registry.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"test-codebuild-arm-docker-registry.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"test-codebuild-arm-docker-registry.assets"
],
"metadata": {
"/test-codebuild-arm-docker-registry/MyProject/Role/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "MyProjectRole9BBE5233"
}
],
"/test-codebuild-arm-docker-registry/MyProject/Role/DefaultPolicy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "MyProjectRoleDefaultPolicyB19B7C29"
}
],
"/test-codebuild-arm-docker-registry/MyProject/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "MyProject39F7B0AE"
}
],
"/test-codebuild-arm-docker-registry/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/test-codebuild-arm-docker-registry/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "test-codebuild-arm-docker-registry"
},
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"codebuildarmdockerregistryDefaultTestDeployAssert69FB8AA0.assets"
],
"metadata": {
"/codebuild-arm-docker-registry/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/codebuild-arm-docker-registry/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "codebuild-arm-docker-registry/DefaultTest/DeployAssert"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "32.0.0",
"files": {
"b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6": {
"source": {
"path": "test-codebuild-arm-docker-registry.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "b6f85acdb6fe284b01a4751f3c590a55e03668bb3d353a044b6d5c5e9e1ab9a6.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Loading

0 comments on commit 6327ddc

Please sign in to comment.