feat(client-cloudwatch): Fix default dualstack FIPS endpoints in AWS GovCloud(US) regions

Author: awstools

clients/client-cloudwatch/src/endpoint/EndpointParameters.ts

@@ -5,10 +5,10 @@ import { Endpoint, EndpointParameters as __EndpointParameters, EndpointV2, Provi
  * @public
  */
 export interface ClientInputEndpointParameters {
-  region?: string | undefined | Provider<string | undefined>;
   useDualstackEndpoint?: boolean | undefined | Provider<boolean | undefined>;
   useFipsEndpoint?: boolean | undefined | Provider<boolean | undefined>;
   endpoint?: string | Provider<string> | Endpoint | Provider<Endpoint> | EndpointV2 | Provider<EndpointV2>;
+  region?: string | undefined | Provider<string | undefined>;
 }
 
 export type ClientResolvedEndpointParameters = Omit<ClientInputEndpointParameters, "endpoint"> & {
@@ -33,8 +33,8 @@ export const commonParams = {
 } as const;
 
 export interface EndpointParameters extends __EndpointParameters {
-  Region?: string | undefined;
   UseDualStack?: boolean | undefined;
   UseFIPS?: boolean | undefined;
   Endpoint?: string | undefined;
+  Region?: string | undefined;
 }

clients/client-cloudwatch/src/endpoint/ruleset.ts

@@ -6,29 +6,33 @@ import { RuleSetObject } from "@smithy/types";
    or see "smithy.rules#endpointRuleSet"
    in codegen/sdk-codegen/aws-models/cloudwatch.json */
 
-const u="required",
-v="fn",
-w="argv",
-x="ref";
+const w="required",
+x="fn",
+y="argv",
+z="ref",
+A="properties",
+B="headers";
 const a=true,
-b="isSet",
-c="booleanEquals",
-d="error",
-e="endpoint",
-f="tree",
-g="PartitionResult",
-h="getAttr",
-i={[u]:false,"type":"String"},
-j={[u]:true,"default":false,"type":"Boolean"},
-k={[x]:"Endpoint"},
-l={[v]:c,[w]:[{[x]:"UseFIPS"},true]},
-m={[v]:c,[w]:[{[x]:"UseDualStack"},true]},
-n={},
-o={[v]:h,[w]:[{[x]:g},"supportsFIPS"]},
-p={[x]:g},
-q={[v]:c,[w]:[true,{[v]:h,[w]:[p,"supportsDualStack"]}]},
-r=[l],
-s=[m],
-t=[{[x]:"Region"}];
-const _data={version:"1.0",parameters:{Region:i,UseDualStack:j,UseFIPS:j,Endpoint:i},rules:[{conditions:[{[v]:b,[w]:[k]}],rules:[{conditions:r,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:d},{conditions:s,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:d},{endpoint:{url:k,properties:n,headers:n},type:e}],type:f},{conditions:[{[v]:b,[w]:t}],rules:[{conditions:[{[v]:"aws.partition",[w]:t,assign:g}],rules:[{conditions:[l,m],rules:[{conditions:[{[v]:c,[w]:[a,o]},q],rules:[{endpoint:{url:"https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:d}],type:f},{conditions:r,rules:[{conditions:[{[v]:c,[w]:[o,a]}],rules:[{conditions:[{[v]:"stringEquals",[w]:[{[v]:h,[w]:[p,"name"]},"aws-us-gov"]}],endpoint:{url:"https://monitoring.{Region}.amazonaws.com",properties:n,headers:n},type:e},{endpoint:{url:"https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"FIPS is enabled but this partition does not support FIPS",type:d}],type:f},{conditions:s,rules:[{conditions:[q],rules:[{endpoint:{url:"https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:n,headers:n},type:e}],type:f},{error:"DualStack is enabled but this partition does not support DualStack",type:d}],type:f},{endpoint:{url:"https://monitoring.{Region}.{PartitionResult#dnsSuffix}",properties:n,headers:n},type:e}],type:f}],type:f},{error:"Invalid Configuration: Missing Region",type:d}]};
+b=false,
+c="isSet",
+d="booleanEquals",
+e="error",
+f="endpoint",
+g="tree",
+h="PartitionResult",
+i={[w]:true,"default":false,"type":"Boolean"},
+j={[w]:false,"type":"String"},
+k={[z]:"Endpoint"},
+l={[x]:d,[y]:[{[z]:"UseFIPS"},true]},
+m={[z]:"UseFIPS"},
+n={[x]:d,[y]:[{[z]:"UseDualStack"},true]},
+o={},
+p={[x]:"stringEquals",[y]:[{[x]:"getAttr",[y]:[{[z]:h},"name"]},"aws-us-gov"]},
+q={[x]:d,[y]:[{[z]:"UseDualStack"},false]},
+r={"url":"https://monitoring.{Region}.{PartitionResult#dnsSuffix}",[A]:{},[B]:{}},
+s={"url":"https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}",[A]:{},[B]:{}},
+t={[x]:"getAttr",[y]:[{[z]:h},"supportsFIPS"]},
+u={[x]:d,[y]:[true,{[x]:"getAttr",[y]:[{[z]:h},"supportsDualStack"]}]},
+v=[{[z]:"Region"}];
+const _data={version:"1.0",parameters:{UseDualStack:i,UseFIPS:i,Endpoint:j,Region:j},rules:[{conditions:[{[x]:c,[y]:[k]}],rules:[{conditions:[l],error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:e},{rules:[{conditions:[n],error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:e},{endpoint:{url:k,[A]:o,[B]:o},type:f}],type:g}],type:g},{rules:[{conditions:[{[x]:c,[y]:v}],rules:[{conditions:[{[x]:"aws.partition",[y]:v,assign:h}],rules:[{conditions:[p,l,q],endpoint:r,type:f},{conditions:[p,l,n],endpoint:s,type:f},{conditions:[l,n],rules:[{conditions:[{[x]:d,[y]:[a,t]},u],rules:[{endpoint:{url:"https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",[A]:o,[B]:o},type:f}],type:g},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:e}],type:g},{conditions:[l,q],rules:[{conditions:[{[x]:d,[y]:[t,a]}],rules:[{endpoint:{url:"https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}",[A]:o,[B]:o},type:f}],type:g},{error:"FIPS is enabled but this partition does not support FIPS",type:e}],type:g},{conditions:[{[x]:d,[y]:[m,b]},n],rules:[{conditions:[u],rules:[{endpoint:s,type:f}],type:g},{error:"DualStack is enabled but this partition does not support DualStack",type:e}],type:g},{endpoint:r,type:f}],type:g}],type:g},{error:"Invalid Configuration: Missing Region",type:e}],type:g}]};
 export const ruleSet: RuleSetObject = _data;