AWS Clean Rooms Service Update: This feature provides the ability for the collaboration creator to configure either the member who can run queries or a different member in the collaboration to be billed for query compute costs.

AWS · AWS · commit 4d4f9ecfa800 · 2023-11-14T19:13:22.000Z
diff --git a/.changes/next-release/feature-AWSCleanRoomsService-71c71f9.json b/.changes/next-release/feature-AWSCleanRoomsService-71c71f9.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS Clean Rooms Service",
+    "contributor": "",
+    "description": "This feature provides the ability for the collaboration creator to configure either the member who can run queries or a different member in the collaboration to be billed for query compute costs."
+}
diff --git a/services/cleanrooms/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/cleanrooms/src/main/resources/codegen-resources/endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -59,7 +58,6 @@
                 },
                 {
                     "conditions": [],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -87,13 +85,14 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -106,7 +105,6 @@
                             ]
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -120,7 +118,6 @@
                                     "assign": "PartitionResult"
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -143,7 +140,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
@@ -178,11 +174,9 @@
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
                                             "rules": [
                                                 {
                                                     "conditions": [],
-                                                    "type": "tree",
                                                     "rules": [
                                                         {
                                                             "conditions": [],
@@ -193,16 +187,19 @@
                                                             },
                                                             "type": "endpoint"
                                                         }
-                                                    ]
+                                                    ],
+                                                    "type": "tree"
                                                 }
-                                            ]
+                                            ],
+                                            "type": "tree"
                                         },
                                         {
                                             "conditions": [],
                                             "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                             "type": "error"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [
@@ -216,14 +213,12 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "booleanEquals",
                                                     "argv": [
-                                                        true,
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -232,15 +227,14 @@
                                                                 },
                                                                 "supportsFIPS"
                                                             ]
-                                                        }
+                                                        },
+                                                        true
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
                                             "rules": [
                                                 {
                                                     "conditions": [],
-                                                    "type": "tree",
                                                     "rules": [
                                                         {
                                                             "conditions": [],
@@ -251,16 +245,19 @@
                                                             },
                                                             "type": "endpoint"
                                                         }
-                                                    ]
+                                                    ],
+                                                    "type": "tree"
                                                 }
-                                            ]
+                                            ],
+                                            "type": "tree"
                                         },
                                         {
                                             "conditions": [],
                                             "error": "FIPS is enabled but this partition does not support FIPS",
                                             "type": "error"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [
@@ -274,7 +271,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
@@ -294,11 +290,9 @@
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
                                             "rules": [
                                                 {
                                                     "conditions": [],
-                                                    "type": "tree",
                                                     "rules": [
                                                         {
                                                             "conditions": [],
@@ -309,20 +303,22 @@
                                                             },
                                                             "type": "endpoint"
                                                         }
-                                                    ]
+                                                    ],
+                                                    "type": "tree"
                                                 }
-                                            ]
+                                            ],
+                                            "type": "tree"
                                         },
                                         {
                                             "conditions": [],
                                             "error": "DualStack is enabled but this partition does not support DualStack",
                                             "type": "error"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -333,18 +329,22 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 },
                 {
                     "conditions": [],
                     "error": "Invalid Configuration: Missing Region",
                     "type": "error"
                 }
-            ]
+            ],
+            "type": "tree"
         }
     ]
 }
diff --git a/services/cleanrooms/src/main/resources/codegen-resources/service-2.json b/services/cleanrooms/src/main/resources/codegen-resources/service-2.json

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`]`
`41`	`41`	`}`
`42`	`42`	`],`
`43`		`- "type": "tree",`
`44`	`43`	`"rules": [`
`45`	`44`	`{`
`46`	`45`	`"conditions": [`
`@@ -59,7 +58,6 @@`
`59`	`58`	`},`
`60`	`59`	`{`
`61`	`60`	`"conditions": [],`
`62`		`- "type": "tree",`
`63`	`61`	`"rules": [`
`64`	`62`	`{`
`65`	`63`	`"conditions": [`
`@@ -87,13 +85,14 @@`
`87`	`85`	`},`
`88`	`86`	`"type": "endpoint"`
`89`	`87`	`}`
`90`		`- ]`
	`88`	`+ ],`
	`89`	`+ "type": "tree"`
`91`	`90`	`}`
`92`		`- ]`
	`91`	`+ ],`
	`92`	`+ "type": "tree"`
`93`	`93`	`},`
`94`	`94`	`{`
`95`	`95`	`"conditions": [],`
`96`		`- "type": "tree",`
`97`	`96`	`"rules": [`
`98`	`97`	`{`
`99`	`98`	`"conditions": [`
`@@ -106,7 +105,6 @@`
`106`	`105`	`]`
`107`	`106`	`}`
`108`	`107`	`],`
`109`		`- "type": "tree",`
`110`	`108`	`"rules": [`
`111`	`109`	`{`
`112`	`110`	`"conditions": [`
`@@ -120,7 +118,6 @@`
`120`	`118`	`"assign": "PartitionResult"`
`121`	`119`	`}`
`122`	`120`	`],`
`123`		`- "type": "tree",`
`124`	`121`	`"rules": [`
`125`	`122`	`{`
`126`	`123`	`"conditions": [`
`@@ -143,7 +140,6 @@`
`143`	`140`	`]`
`144`	`141`	`}`
`145`	`142`	`],`
`146`		`- "type": "tree",`
`147`	`143`	`"rules": [`
`148`	`144`	`{`
`149`	`145`	`"conditions": [`
`@@ -178,11 +174,9 @@`
`178`	`174`	`]`
`179`	`175`	`}`
`180`	`176`	`],`
`181`		`- "type": "tree",`
`182`	`177`	`"rules": [`
`183`	`178`	`{`
`184`	`179`	`"conditions": [],`
`185`		`- "type": "tree",`
`186`	`180`	`"rules": [`
`187`	`181`	`{`
`188`	`182`	`"conditions": [],`
`@@ -193,16 +187,19 @@`
`193`	`187`	`},`
`194`	`188`	`"type": "endpoint"`
`195`	`189`	`}`
`196`		`- ]`
	`190`	`+ ],`
	`191`	`+ "type": "tree"`
`197`	`192`	`}`
`198`		`- ]`
	`193`	`+ ],`
	`194`	`+ "type": "tree"`
`199`	`195`	`},`
`200`	`196`	`{`
`201`	`197`	`"conditions": [],`
`202`	`198`	`"error": "FIPS and DualStack are enabled, but this partition does not support one or both",`
`203`	`199`	`"type": "error"`
`204`	`200`	`}`
`205`		`- ]`
	`201`	`+ ],`
	`202`	`+ "type": "tree"`
`206`	`203`	`},`
`207`	`204`	`{`
`208`	`205`	`"conditions": [`
`@@ -216,14 +213,12 @@`
`216`	`213`	`]`
`217`	`214`	`}`
`218`	`215`	`],`
`219`		`- "type": "tree",`
`220`	`216`	`"rules": [`
`221`	`217`	`{`
`222`	`218`	`"conditions": [`
`223`	`219`	`{`
`224`	`220`	`"fn": "booleanEquals",`
`225`	`221`	`"argv": [`
`226`		`- true,`
`227`	`222`	`{`
`228`	`223`	`"fn": "getAttr",`
`229`	`224`	`"argv": [`
`@@ -232,15 +227,14 @@`
`232`	`227`	`},`
`233`	`228`	`"supportsFIPS"`
`234`	`229`	`]`
`235`		`- }`
	`230`	`+ },`
	`231`	`+ true`
`236`	`232`	`]`
`237`	`233`	`}`
`238`	`234`	`],`
`239`		`- "type": "tree",`
`240`	`235`	`"rules": [`
`241`	`236`	`{`
`242`	`237`	`"conditions": [],`
`243`		`- "type": "tree",`
`244`	`238`	`"rules": [`
`245`	`239`	`{`
`246`	`240`	`"conditions": [],`
`@@ -251,16 +245,19 @@`
`251`	`245`	`},`
`252`	`246`	`"type": "endpoint"`
`253`	`247`	`}`
`254`		`- ]`
	`248`	`+ ],`
	`249`	`+ "type": "tree"`
`255`	`250`	`}`
`256`		`- ]`
	`251`	`+ ],`
	`252`	`+ "type": "tree"`
`257`	`253`	`},`
`258`	`254`	`{`
`259`	`255`	`"conditions": [],`
`260`	`256`	`"error": "FIPS is enabled but this partition does not support FIPS",`
`261`	`257`	`"type": "error"`
`262`	`258`	`}`
`263`		`- ]`
	`259`	`+ ],`
	`260`	`+ "type": "tree"`
`264`	`261`	`},`
`265`	`262`	`{`
`266`	`263`	`"conditions": [`
`@@ -274,7 +271,6 @@`
`274`	`271`	`]`
`275`	`272`	`}`
`276`	`273`	`],`
`277`		`- "type": "tree",`
`278`	`274`	`"rules": [`
`279`	`275`	`{`
`280`	`276`	`"conditions": [`
`@@ -294,11 +290,9 @@`
`294`	`290`	`]`
`295`	`291`	`}`
`296`	`292`	`],`
`297`		`- "type": "tree",`
`298`	`293`	`"rules": [`
`299`	`294`	`{`
`300`	`295`	`"conditions": [],`
`301`		`- "type": "tree",`
`302`	`296`	`"rules": [`
`303`	`297`	`{`
`304`	`298`	`"conditions": [],`
`@@ -309,20 +303,22 @@`
`309`	`303`	`},`
`310`	`304`	`"type": "endpoint"`
`311`	`305`	`}`
`312`		`- ]`
	`306`	`+ ],`
	`307`	`+ "type": "tree"`
`313`	`308`	`}`
`314`		`- ]`
	`309`	`+ ],`
	`310`	`+ "type": "tree"`
`315`	`311`	`},`
`316`	`312`	`{`
`317`	`313`	`"conditions": [],`
`318`	`314`	`"error": "DualStack is enabled but this partition does not support DualStack",`
`319`	`315`	`"type": "error"`
`320`	`316`	`}`
`321`		`- ]`
	`317`	`+ ],`
	`318`	`+ "type": "tree"`
`322`	`319`	`},`
`323`	`320`	`{`
`324`	`321`	`"conditions": [],`
`325`		`- "type": "tree",`
`326`	`322`	`"rules": [`
`327`	`323`	`{`
`328`	`324`	`"conditions": [],`
`@@ -333,18 +329,22 @@`
`333`	`329`	`},`
`334`	`330`	`"type": "endpoint"`
`335`	`331`	`}`
`336`		`- ]`
	`332`	`+ ],`
	`333`	`+ "type": "tree"`
`337`	`334`	`}`
`338`		`- ]`
	`335`	`+ ],`
	`336`	`+ "type": "tree"`
`339`	`337`	`}`
`340`		`- ]`
	`338`	`+ ],`
	`339`	`+ "type": "tree"`
`341`	`340`	`},`
`342`	`341`	`{`
`343`	`342`	`"conditions": [],`
`344`	`343`	`"error": "Invalid Configuration: Missing Region",`
`345`	`344`	`"type": "error"`
`346`	`345`	`}`
`347`		`- ]`
	`346`	`+ ],`
	`347`	`+ "type": "tree"`
`348`	`348`	`}`
`349`	`349`	`]`
`350`	`350`	`}`