Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(spec): current cfnspec contains breaking changes we are not ready to merge yet #33481

Merged
merged 3 commits into from
Feb 17, 2025
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
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
"markdown-it": "^12.3.2",
"string-width": "^4.2.3",
"@types/babel__traverse": "7.18.2",
"@smithy/types": "3.5.0"
"@smithy/types": "3.5.0",
"@aws-cdk/aws-service-spec": "0.1.51",
"@aws-cdk/service-spec-importers": "0.0.64",
"@aws-cdk/service-spec-types": "0.0.117"
Comment on lines +45 to +47
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to guarantee the expected version and that there are no install time surprises. We remove this when we are ready to accept a new spec.

},
"repository": {
"type": "git",
Expand Down Expand Up @@ -181,4 +184,4 @@
"string-width": "^4.2.3"
},
"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
}
}
6 changes: 3 additions & 3 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.1.58",
"@aws-cdk/service-spec-types": "^0.0.124",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/service-spec-types": "^0.0.117",
"chalk": "^4",
"diff": "^5.2.0",
"fast-deep-equal": "^3.1.3",
Expand Down Expand Up @@ -64,4 +64,4 @@
"dependencies/cdk-point-dependencies"
]
}
}
}
4 changes: 2 additions & 2 deletions packages/@aws-cdk/integ-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@aws-cdk/cloud-assembly-schema": "^39.2.0",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.58",
"@aws-cdk/aws-service-spec": "^0.1.51",
"cdk-assets": "3.0.0-rc.143",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
Expand Down Expand Up @@ -109,4 +109,4 @@
"publishConfig": {
"tag": "latest"
}
}
}
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
},
"devDependencies": {
"@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
"@aws-cdk/aws-service-spec": "^0.1.58",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/custom-resource-handlers": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
Expand Down Expand Up @@ -528,4 +528,4 @@
"@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*"
}
}
}
}
8 changes: 4 additions & 4 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.1.58",
"@aws-cdk/service-spec-importers": "^0.0.68",
"@aws-cdk/service-spec-types": "^0.0.124",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/service-spec-importers": "^0.0.64",
"@aws-cdk/service-spec-types": "^0.0.117",
"@cdklabs/tskb": "^0.0.3",
"@cdklabs/typewriter": "^0.0.3",
"camelcase": "^6",
Expand Down Expand Up @@ -65,4 +65,4 @@
"dependencies/cdk-point-dependencies"
]
}
}
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the latest spec version of this specific resource because this PR already depends on it, as it makes use of the new containerFormat property.

Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"typeName" : "AWS::IVS::Channel",
"description" : "Resource Type definition for AWS::IVS::Channel",
"sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
"definitions" : {
"Tag" : {
"type" : "object",
"additionalProperties" : false,
"properties" : {
"Key" : {
"type" : "string",
"description" : "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
"minLength" : 1,
"maxLength" : 128
},
"Value" : {
"type" : "string",
"description" : "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
"minLength" : 0,
"maxLength" : 256
}
},
"required" : [ "Value", "Key" ]
},
"MultitrackInputConfiguration" : {
"type" : "object",
"additionalProperties" : false,
"properties" : {
"Enabled" : {
"description" : "Indicates whether multitrack input is enabled. Can be set to true only if channel type is STANDARD. Setting enabled to true with any other channel type will cause an exception. If true, then policy, maximumResolution, and containerFormat are required, and containerFormat must be set to FRAGMENTED_MP4. Default: false.",
"default" : false,
"type" : "boolean"
},
"MaximumResolution" : {
"description" : "Maximum resolution for multitrack input. Required if enabled is true.",
"type" : "string",
"enum" : [ "SD", "HD", "FULL_HD" ]
},
"Policy" : {
"description" : "Indicates whether multitrack input is allowed or required. Required if enabled is true.",
"type" : "string",
"enum" : [ "ALLOW", "REQUIRE" ]
}
}
}
},
"properties" : {
"Arn" : {
"description" : "Channel ARN is automatically generated on creation and assigned as the unique identifier.",
"type" : "string",
"pattern" : "^arn:aws:ivs:[a-z0-9-]+:[0-9]+:channel/[a-zA-Z0-9-]+$",
"minLength" : 1,
"maxLength" : 128
},
"Name" : {
"description" : "Channel",
"type" : "string",
"minLength" : 0,
"maxLength" : 128,
"pattern" : "^[a-zA-Z0-9-_]*$",
"default" : "-"
},
"Authorized" : {
"description" : "Whether the channel is authorized.",
"type" : "boolean",
"default" : false
},
"InsecureIngest" : {
"description" : "Whether the channel allows insecure ingest.",
"type" : "boolean",
"default" : false
},
"LatencyMode" : {
"description" : "Channel latency mode.",
"type" : "string",
"enum" : [ "NORMAL", "LOW" ],
"default" : "LOW"
},
"Type" : {
"description" : "Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately.",
"type" : "string",
"enum" : [ "STANDARD", "BASIC", "ADVANCED_SD", "ADVANCED_HD" ],
"default" : "STANDARD"
},
"Tags" : {
"description" : "A list of key-value pairs that contain metadata for the asset model.",
"type" : "array",
"uniqueItems" : true,
"insertionOrder" : false,
"maxItems" : 50,
"items" : {
"$ref" : "#/definitions/Tag"
}
},
"PlaybackUrl" : {
"description" : "Channel Playback URL.",
"type" : "string"
},
"IngestEndpoint" : {
"description" : "Channel ingest endpoint, part of the definition of an ingest server, used when you set up streaming software.",
"type" : "string"
},
"RecordingConfigurationArn" : {
"description" : "Recording Configuration ARN. A value other than an empty string indicates that recording is enabled. Default: \"\" (recording is disabled).",
"type" : "string",
"default" : "",
"pattern" : "^$|arn:aws:ivs:[a-z0-9-]+:[0-9]+:recording-configuration/[a-zA-Z0-9-]+$",
"minLength" : 0,
"maxLength" : 128
},
"Preset" : {
"description" : "Optional transcode preset for the channel. This is selectable only for ADVANCED_HD and ADVANCED_SD channel types. For those channel types, the default preset is HIGHER_BANDWIDTH_DELIVERY. For other channel types (BASIC and STANDARD), preset is the empty string (\"\").",
"type" : "string",
"enum" : [ "", "HIGHER_BANDWIDTH_DELIVERY", "CONSTRAINED_BANDWIDTH_DELIVERY" ]
},
"MultitrackInputConfiguration" : {
"$ref" : "#/definitions/MultitrackInputConfiguration"
},
"ContainerFormat" : {
"description" : "Indicates which content-packaging format is used (MPEG-TS or fMP4). If multitrackInputConfiguration is specified and enabled is true, then containerFormat is required and must be set to FRAGMENTED_MP4. Otherwise, containerFormat may be set to TS or FRAGMENTED_MP4. Default: TS.",
"type" : "string",
"default" : "TS",
"enum" : [ "TS", "FRAGMENTED_MP4" ]
}
},
"additionalProperties" : false,
"required" : [ ],
"tagging" : {
"taggable" : true,
"tagOnCreate" : true,
"tagUpdatable" : true,
"cloudFormationSystemTags" : false,
"tagProperty" : "/properties/Tags",
"permissions" : [ "ivs:TagResource", "ivs:UntagResource", "ivs:ListTagsForResource" ]
},
"readOnlyProperties" : [ "/properties/Arn", "/properties/PlaybackUrl", "/properties/IngestEndpoint" ],
"primaryIdentifier" : [ "/properties/Arn" ],
"handlers" : {
"create" : {
"permissions" : [ "ivs:CreateChannel", "ivs:TagResource" ]
},
"read" : {
"permissions" : [ "ivs:GetChannel", "ivs:ListTagsForResource" ]
},
"update" : {
"permissions" : [ "ivs:GetChannel", "ivs:UpdateChannel", "ivs:TagResource", "ivs:UntagResource", "ivs:ListTagsForResource" ]
},
"delete" : {
"permissions" : [ "ivs:DeleteChannel", "ivs:UntagResource" ]
},
"list" : {
"permissions" : [ "ivs:ListChannels", "ivs:ListTagsForResource" ]
}
}
}
66 changes: 17 additions & 49 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989"
integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A==

"@aws-cdk/aws-service-spec@^0.1.58":
version "0.1.58"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.58.tgz#c045bc2fa0045bc8fddbc4eee6fdb029b2c02a01"
integrity sha512-rgsYO7Z5R61G/UWq7oviY2pKivQ0aUEa2vc1QiBbXWAI1vO8+feGOUSnLMk76W92IuCAmpgiO4GAoDHe1pjcsw==
"@aws-cdk/aws-service-spec@0.1.51", "@aws-cdk/aws-service-spec@^0.1.51":
version "0.1.51"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.51.tgz#2dbc01f897b7452a0092f33b8b1ce60b0bd523b0"
integrity sha512-9EQBahUhfg7HYvgiB3CRdEXoc0VPej4SprcdBa1wuF/f8nJOd3R2hrcQuMKfU+UpZJ5VBF+xoKDcEvbiXu8B6g==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.124"
"@aws-cdk/service-spec-types" "^0.0.117"
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/cloud-assembly-schema@^39.2.0":
Expand Down Expand Up @@ -119,12 +119,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v32/-/lambda-layer-kubectl-v32-2.0.1.tgz#8f77f30f16161fc07f1e82688ae7fa618c9a6d4e"
integrity sha512-kysjeU/A5axsSLYhOzrIZgzZoCY4z9R2cYo/l6s7QA8mKbes3plmOGBQCRSCVQN2MhnXNk/a0kZOEfDUpLQung==

"@aws-cdk/service-spec-importers@^0.0.68":
version "0.0.68"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.68.tgz#89999b9c51f16f1c3c3c8d9d82ec0fd5a4507b23"
integrity sha512-XZKpOa/3tiUzpgfYgpw2RDyYhVVLWDacZFs0J7opq1n29cB71tnNm7R1jDAwGx1+MpDQZ/V6wrGf1N0MOTs5kA==
"@aws-cdk/service-spec-importers@0.0.64", "@aws-cdk/service-spec-importers@^0.0.64":
version "0.0.64"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.64.tgz#8e69644f627c838f8a6523fc6b5e63069fbd6656"
integrity sha512-8EGZaNkY9jUpFbc0h0TY5Knz/l1PcQo8NDxymoEiZqUrUFY0WD3CFCzlzgzlNyY9kpfJLvvbfzyM0q0nHRqaCg==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.121"
"@aws-cdk/service-spec-types" "^0.0.117"
"@cdklabs/tskb" "^0.0.3"
ajv "^6"
canonicalize "^2.0.0"
Expand All @@ -135,17 +135,10 @@
glob "^8"
sort-json "^2.0.1"

"@aws-cdk/service-spec-types@^0.0.121":
version "0.0.121"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.121.tgz#f9f2e91838bb93f48b98e1b8e29bc0cdacccc559"
integrity sha512-skPyQa4tV4ozC7wtMiJTjSR8mbJ7DQaheTkPxz0NRYUe7kNiGw2hnFzkTrFcMMFtwwLOzAtVxMsDlrVsa68GPA==
dependencies:
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/service-spec-types@^0.0.124":
version "0.0.124"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.124.tgz#672b7c95aca0e76b077e41bfb76aa00b0c45da9b"
integrity sha512-nCY2etLDv0ruhjltvT6zNyZ5PJIAa2qGuoBLGREYdNDn8/3AoHgKztyVSiw+L0xsJ/5+0JkFlL2DjvHo4dcdbw==
"@aws-cdk/service-spec-types@0.0.117", "@aws-cdk/service-spec-types@^0.0.117":
version "0.0.117"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.117.tgz#b428b6556a3fd20b95e52e311e939b3b18a1f791"
integrity sha512-2hMV1i2GtBPCEkZw7gsdiAeTbfMpOXGTD2jh4okiFIvQBDXoKXqL29e7Z4J9pA4KLhNA24SecmFxiiHXhPJ3tA==
dependencies:
"@cdklabs/tskb" "^0.0.3"

Expand Down Expand Up @@ -19261,16 +19254,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2:
"string-width-cjs@npm:string-width@^4.2.0", string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -19339,7 +19323,7 @@ stringify-package@^1.0.1:
resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand All @@ -19353,13 +19337,6 @@ strip-ansi@^3.0.1:
dependencies:
ansi-regex "^2.0.0"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.0.1, strip-ansi@^7.1.0:
version "7.1.0"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
Expand Down Expand Up @@ -20448,7 +20425,7 @@ workerpool@^6.5.1:
resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -20466,15 +20443,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down