Skip to content

Commit 50b9b6f

Browse files
authored
chore(spec): current cfnspec contains breaking changes we are not ready to merge yet (#33481)
Restting to the versions used in 2.178.2 (see [comment](#33481 (comment)) below). ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 11a75b2 commit 50b9b6f

File tree

7 files changed

+188
-62
lines changed

7 files changed

+188
-62
lines changed

package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
"markdown-it": "^12.3.2",
4242
"string-width": "^4.2.3",
4343
"@types/babel__traverse": "7.18.2",
44-
"@smithy/types": "3.5.0"
44+
"@smithy/types": "3.5.0",
45+
"@aws-cdk/aws-service-spec": "0.1.51",
46+
"@aws-cdk/service-spec-importers": "0.0.64",
47+
"@aws-cdk/service-spec-types": "0.0.117"
4548
},
4649
"repository": {
4750
"type": "git",
@@ -181,4 +184,4 @@
181184
"string-width": "^4.2.3"
182185
},
183186
"packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
184-
}
187+
}

packages/@aws-cdk/cloudformation-diff/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"license": "Apache-2.0",
2525
"dependencies": {
26-
"@aws-cdk/aws-service-spec": "^0.1.58",
27-
"@aws-cdk/service-spec-types": "^0.0.124",
26+
"@aws-cdk/aws-service-spec": "^0.1.51",
27+
"@aws-cdk/service-spec-types": "^0.0.117",
2828
"chalk": "^4",
2929
"diff": "^5.2.0",
3030
"fast-deep-equal": "^3.1.3",
@@ -64,4 +64,4 @@
6464
"dependencies/cdk-point-dependencies"
6565
]
6666
}
67-
}
67+
}

packages/@aws-cdk/integ-runner/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@aws-cdk/cloud-assembly-schema": "^39.2.0",
7676
"@aws-cdk/cloudformation-diff": "0.0.0",
7777
"@aws-cdk/cx-api": "0.0.0",
78-
"@aws-cdk/aws-service-spec": "^0.1.58",
78+
"@aws-cdk/aws-service-spec": "^0.1.51",
7979
"cdk-assets": "3.0.0-rc.143",
8080
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
8181
"aws-cdk": "0.0.0",
@@ -109,4 +109,4 @@
109109
"publishConfig": {
110110
"tag": "latest"
111111
}
112-
}
112+
}

packages/aws-cdk-lib/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
},
137137
"devDependencies": {
138138
"@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
139-
"@aws-cdk/aws-service-spec": "^0.1.58",
139+
"@aws-cdk/aws-service-spec": "^0.1.51",
140140
"@aws-cdk/cdk-build-tools": "0.0.0",
141141
"@aws-cdk/custom-resource-handlers": "0.0.0",
142142
"@aws-cdk/pkglint": "0.0.0",
@@ -528,4 +528,4 @@
528528
"@aws-cdk/aws-kinesisfirehose-destinations-alpha": "*"
529529
}
530530
}
531-
}
531+
}

tools/@aws-cdk/spec2cdk/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
},
3333
"license": "Apache-2.0",
3434
"dependencies": {
35-
"@aws-cdk/aws-service-spec": "^0.1.58",
36-
"@aws-cdk/service-spec-importers": "^0.0.68",
37-
"@aws-cdk/service-spec-types": "^0.0.124",
35+
"@aws-cdk/aws-service-spec": "^0.1.51",
36+
"@aws-cdk/service-spec-importers": "^0.0.64",
37+
"@aws-cdk/service-spec-types": "^0.0.117",
3838
"@cdklabs/tskb": "^0.0.3",
3939
"@cdklabs/typewriter": "^0.0.3",
4040
"camelcase": "^6",
@@ -65,4 +65,4 @@
6565
"dependencies/cdk-point-dependencies"
6666
]
6767
}
68-
}
68+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
{
2+
"typeName" : "AWS::IVS::Channel",
3+
"description" : "Resource Type definition for AWS::IVS::Channel",
4+
"sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
5+
"definitions" : {
6+
"Tag" : {
7+
"type" : "object",
8+
"additionalProperties" : false,
9+
"properties" : {
10+
"Key" : {
11+
"type" : "string",
12+
"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 -.",
13+
"minLength" : 1,
14+
"maxLength" : 128
15+
},
16+
"Value" : {
17+
"type" : "string",
18+
"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 -.",
19+
"minLength" : 0,
20+
"maxLength" : 256
21+
}
22+
},
23+
"required" : [ "Value", "Key" ]
24+
},
25+
"MultitrackInputConfiguration" : {
26+
"type" : "object",
27+
"additionalProperties" : false,
28+
"properties" : {
29+
"Enabled" : {
30+
"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.",
31+
"default" : false,
32+
"type" : "boolean"
33+
},
34+
"MaximumResolution" : {
35+
"description" : "Maximum resolution for multitrack input. Required if enabled is true.",
36+
"type" : "string",
37+
"enum" : [ "SD", "HD", "FULL_HD" ]
38+
},
39+
"Policy" : {
40+
"description" : "Indicates whether multitrack input is allowed or required. Required if enabled is true.",
41+
"type" : "string",
42+
"enum" : [ "ALLOW", "REQUIRE" ]
43+
}
44+
}
45+
}
46+
},
47+
"properties" : {
48+
"Arn" : {
49+
"description" : "Channel ARN is automatically generated on creation and assigned as the unique identifier.",
50+
"type" : "string",
51+
"pattern" : "^arn:aws:ivs:[a-z0-9-]+:[0-9]+:channel/[a-zA-Z0-9-]+$",
52+
"minLength" : 1,
53+
"maxLength" : 128
54+
},
55+
"Name" : {
56+
"description" : "Channel",
57+
"type" : "string",
58+
"minLength" : 0,
59+
"maxLength" : 128,
60+
"pattern" : "^[a-zA-Z0-9-_]*$",
61+
"default" : "-"
62+
},
63+
"Authorized" : {
64+
"description" : "Whether the channel is authorized.",
65+
"type" : "boolean",
66+
"default" : false
67+
},
68+
"InsecureIngest" : {
69+
"description" : "Whether the channel allows insecure ingest.",
70+
"type" : "boolean",
71+
"default" : false
72+
},
73+
"LatencyMode" : {
74+
"description" : "Channel latency mode.",
75+
"type" : "string",
76+
"enum" : [ "NORMAL", "LOW" ],
77+
"default" : "LOW"
78+
},
79+
"Type" : {
80+
"description" : "Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately.",
81+
"type" : "string",
82+
"enum" : [ "STANDARD", "BASIC", "ADVANCED_SD", "ADVANCED_HD" ],
83+
"default" : "STANDARD"
84+
},
85+
"Tags" : {
86+
"description" : "A list of key-value pairs that contain metadata for the asset model.",
87+
"type" : "array",
88+
"uniqueItems" : true,
89+
"insertionOrder" : false,
90+
"maxItems" : 50,
91+
"items" : {
92+
"$ref" : "#/definitions/Tag"
93+
}
94+
},
95+
"PlaybackUrl" : {
96+
"description" : "Channel Playback URL.",
97+
"type" : "string"
98+
},
99+
"IngestEndpoint" : {
100+
"description" : "Channel ingest endpoint, part of the definition of an ingest server, used when you set up streaming software.",
101+
"type" : "string"
102+
},
103+
"RecordingConfigurationArn" : {
104+
"description" : "Recording Configuration ARN. A value other than an empty string indicates that recording is enabled. Default: \"\" (recording is disabled).",
105+
"type" : "string",
106+
"default" : "",
107+
"pattern" : "^$|arn:aws:ivs:[a-z0-9-]+:[0-9]+:recording-configuration/[a-zA-Z0-9-]+$",
108+
"minLength" : 0,
109+
"maxLength" : 128
110+
},
111+
"Preset" : {
112+
"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 (\"\").",
113+
"type" : "string",
114+
"enum" : [ "", "HIGHER_BANDWIDTH_DELIVERY", "CONSTRAINED_BANDWIDTH_DELIVERY" ]
115+
},
116+
"MultitrackInputConfiguration" : {
117+
"$ref" : "#/definitions/MultitrackInputConfiguration"
118+
},
119+
"ContainerFormat" : {
120+
"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.",
121+
"type" : "string",
122+
"default" : "TS",
123+
"enum" : [ "TS", "FRAGMENTED_MP4" ]
124+
}
125+
},
126+
"additionalProperties" : false,
127+
"required" : [ ],
128+
"tagging" : {
129+
"taggable" : true,
130+
"tagOnCreate" : true,
131+
"tagUpdatable" : true,
132+
"cloudFormationSystemTags" : false,
133+
"tagProperty" : "/properties/Tags",
134+
"permissions" : [ "ivs:TagResource", "ivs:UntagResource", "ivs:ListTagsForResource" ]
135+
},
136+
"readOnlyProperties" : [ "/properties/Arn", "/properties/PlaybackUrl", "/properties/IngestEndpoint" ],
137+
"primaryIdentifier" : [ "/properties/Arn" ],
138+
"handlers" : {
139+
"create" : {
140+
"permissions" : [ "ivs:CreateChannel", "ivs:TagResource" ]
141+
},
142+
"read" : {
143+
"permissions" : [ "ivs:GetChannel", "ivs:ListTagsForResource" ]
144+
},
145+
"update" : {
146+
"permissions" : [ "ivs:GetChannel", "ivs:UpdateChannel", "ivs:TagResource", "ivs:UntagResource", "ivs:ListTagsForResource" ]
147+
},
148+
"delete" : {
149+
"permissions" : [ "ivs:DeleteChannel", "ivs:UntagResource" ]
150+
},
151+
"list" : {
152+
"permissions" : [ "ivs:ListChannels", "ivs:ListTagsForResource" ]
153+
}
154+
}
155+
}

yarn.lock

+17-49
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989"
5959
integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A==
6060

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

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

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

138-
"@aws-cdk/service-spec-types@^0.0.121":
139-
version "0.0.121"
140-
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.121.tgz#f9f2e91838bb93f48b98e1b8e29bc0cdacccc559"
141-
integrity sha512-skPyQa4tV4ozC7wtMiJTjSR8mbJ7DQaheTkPxz0NRYUe7kNiGw2hnFzkTrFcMMFtwwLOzAtVxMsDlrVsa68GPA==
142-
dependencies:
143-
"@cdklabs/tskb" "^0.0.3"
144-
145-
"@aws-cdk/service-spec-types@^0.0.124":
146-
version "0.0.124"
147-
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.124.tgz#672b7c95aca0e76b077e41bfb76aa00b0c45da9b"
148-
integrity sha512-nCY2etLDv0ruhjltvT6zNyZ5PJIAa2qGuoBLGREYdNDn8/3AoHgKztyVSiw+L0xsJ/5+0JkFlL2DjvHo4dcdbw==
138+
"@aws-cdk/[email protected]", "@aws-cdk/service-spec-types@^0.0.117":
139+
version "0.0.117"
140+
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.117.tgz#b428b6556a3fd20b95e52e311e939b3b18a1f791"
141+
integrity sha512-2hMV1i2GtBPCEkZw7gsdiAeTbfMpOXGTD2jh4okiFIvQBDXoKXqL29e7Z4J9pA4KLhNA24SecmFxiiHXhPJ3tA==
149142
dependencies:
150143
"@cdklabs/tskb" "^0.0.3"
151144

@@ -19261,16 +19254,7 @@ string-length@^4.0.1:
1926119254
char-regex "^1.0.2"
1926219255
strip-ansi "^6.0.0"
1926319256

19264-
"string-width-cjs@npm:string-width@^4.2.0":
19265-
version "4.2.3"
19266-
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
19267-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
19268-
dependencies:
19269-
emoji-regex "^8.0.0"
19270-
is-fullwidth-code-point "^3.0.0"
19271-
strip-ansi "^6.0.1"
19272-
19273-
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:
19257+
"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:
1927419258
version "4.2.3"
1927519259
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1927619260
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -19339,7 +19323,7 @@ stringify-package@^1.0.1:
1933919323
resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
1934019324
integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
1934119325

19342-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
19326+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1934319327
version "6.0.1"
1934419328
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1934519329
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -19353,13 +19337,6 @@ strip-ansi@^3.0.1:
1935319337
dependencies:
1935419338
ansi-regex "^2.0.0"
1935519339

19356-
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
19357-
version "6.0.1"
19358-
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
19359-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
19360-
dependencies:
19361-
ansi-regex "^5.0.1"
19362-
1936319340
strip-ansi@^7.0.1, strip-ansi@^7.1.0:
1936419341
version "7.1.0"
1936519342
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -20448,7 +20425,7 @@ workerpool@^6.5.1:
2044820425
resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
2044920426
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
2045020427

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

20469-
wrap-ansi@^7.0.0:
20470-
version "7.0.0"
20471-
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
20472-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
20473-
dependencies:
20474-
ansi-styles "^4.0.0"
20475-
string-width "^4.1.0"
20476-
strip-ansi "^6.0.0"
20477-
2047820446
wrap-ansi@^8.1.0:
2047920447
version "8.1.0"
2048020448
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)