Skip to content

Commit 01e3062

Browse files
committed
test: update translator tests to add Sub in BasePath
1 parent 60c401c commit 01e3062

File tree

4 files changed

+55
-97
lines changed

4 files changed

+55
-97
lines changed

tests/translator/input/api_with_basic_custom_domain_intrinsics.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Resources:
5858
DomainName: !Sub 'example-${AWS::Region}.com'
5959
CertificateArn: !Ref MyDomainCert
6060
EndpointConfiguration: !Ref EndpointConf
61-
BasePath: [/get, /fetch]
61+
BasePath: !Sub '${AWS::Region}-api'
6262
MutualTlsAuthentication:
6363
TruststoreUri: !Ref MyMTLSUri
6464
TruststoreVersion: !Ref MyMTLSVersion

tests/translator/output/api_with_basic_custom_domain_intrinsics.json

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,12 @@
9999
},
100100
"Type": "AWS::ApiGateway::RestApi"
101101
},
102-
"MyApiDeployment19c8cf5c63": {
102+
"MyApiBasePathMapping": {
103103
"Condition": "C1",
104104
"Properties": {
105-
"Description": "RestApi deployment id: 19c8cf5c63090f12c5a96f6f57162495bed446c7",
106-
"RestApiId": {
107-
"Ref": "MyApi"
108-
}
109-
},
110-
"Type": "AWS::ApiGateway::Deployment"
111-
},
112-
"MyApiProdStage": {
113-
"Condition": "C1",
114-
"Properties": {
115-
"DeploymentId": {
116-
"Ref": "MyApiDeployment19c8cf5c63"
105+
"BasePath": {
106+
"Fn::Sub": "ap-southeast-1-api"
117107
},
118-
"RestApiId": {
119-
"Ref": "MyApi"
120-
},
121-
"StageName": "Prod"
122-
},
123-
"Type": "AWS::ApiGateway::Stage"
124-
},
125-
"MyApifetchBasePathMapping": {
126-
"Condition": "C1",
127-
"Properties": {
128-
"BasePath": "fetch",
129108
"DomainName": {
130109
"Ref": "ApiGatewayDomainNamec0ed6fae34"
131110
},
@@ -138,21 +117,28 @@
138117
},
139118
"Type": "AWS::ApiGateway::BasePathMapping"
140119
},
141-
"MyApigetBasePathMapping": {
120+
"MyApiDeployment651fe13005": {
142121
"Condition": "C1",
143122
"Properties": {
144-
"BasePath": "get",
145-
"DomainName": {
146-
"Ref": "ApiGatewayDomainNamec0ed6fae34"
123+
"Description": "RestApi deployment id: 651fe13005fac4c7c7f2fe93b77c7ef2c6c3e746",
124+
"RestApiId": {
125+
"Ref": "MyApi"
126+
}
127+
},
128+
"Type": "AWS::ApiGateway::Deployment"
129+
},
130+
"MyApiProdStage": {
131+
"Condition": "C1",
132+
"Properties": {
133+
"DeploymentId": {
134+
"Ref": "MyApiDeployment651fe13005"
147135
},
148136
"RestApiId": {
149137
"Ref": "MyApi"
150138
},
151-
"Stage": {
152-
"Ref": "MyApiProdStage"
153-
}
139+
"StageName": "Prod"
154140
},
155-
"Type": "AWS::ApiGateway::BasePathMapping"
141+
"Type": "AWS::ApiGateway::Stage"
156142
},
157143
"MyFunction": {
158144
"Condition": "C1",

tests/translator/output/aws-cn/api_with_basic_custom_domain_intrinsics.json

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -107,33 +107,12 @@
107107
},
108108
"Type": "AWS::ApiGateway::RestApi"
109109
},
110-
"MyApiDeployment4f2c19d290": {
110+
"MyApiBasePathMapping": {
111111
"Condition": "C1",
112112
"Properties": {
113-
"Description": "RestApi deployment id: 4f2c19d290875d88d8e30124f0953f1784e1b54d",
114-
"RestApiId": {
115-
"Ref": "MyApi"
116-
}
117-
},
118-
"Type": "AWS::ApiGateway::Deployment"
119-
},
120-
"MyApiProdStage": {
121-
"Condition": "C1",
122-
"Properties": {
123-
"DeploymentId": {
124-
"Ref": "MyApiDeployment4f2c19d290"
113+
"BasePath": {
114+
"Fn::Sub": "cn-north-1-api"
125115
},
126-
"RestApiId": {
127-
"Ref": "MyApi"
128-
},
129-
"StageName": "Prod"
130-
},
131-
"Type": "AWS::ApiGateway::Stage"
132-
},
133-
"MyApifetchBasePathMapping": {
134-
"Condition": "C1",
135-
"Properties": {
136-
"BasePath": "fetch",
137116
"DomainName": {
138117
"Ref": "ApiGatewayDomainNamec0cd2d9dfc"
139118
},
@@ -146,21 +125,28 @@
146125
},
147126
"Type": "AWS::ApiGateway::BasePathMapping"
148127
},
149-
"MyApigetBasePathMapping": {
128+
"MyApiDeploymente1e3e9b849": {
150129
"Condition": "C1",
151130
"Properties": {
152-
"BasePath": "get",
153-
"DomainName": {
154-
"Ref": "ApiGatewayDomainNamec0cd2d9dfc"
131+
"Description": "RestApi deployment id: e1e3e9b849803f87115b2cb8fcdf5d144342aaa4",
132+
"RestApiId": {
133+
"Ref": "MyApi"
134+
}
135+
},
136+
"Type": "AWS::ApiGateway::Deployment"
137+
},
138+
"MyApiProdStage": {
139+
"Condition": "C1",
140+
"Properties": {
141+
"DeploymentId": {
142+
"Ref": "MyApiDeploymente1e3e9b849"
155143
},
156144
"RestApiId": {
157145
"Ref": "MyApi"
158146
},
159-
"Stage": {
160-
"Ref": "MyApiProdStage"
161-
}
147+
"StageName": "Prod"
162148
},
163-
"Type": "AWS::ApiGateway::BasePathMapping"
149+
"Type": "AWS::ApiGateway::Stage"
164150
},
165151
"MyFunction": {
166152
"Condition": "C1",

tests/translator/output/aws-us-gov/api_with_basic_custom_domain_intrinsics.json

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -107,33 +107,12 @@
107107
},
108108
"Type": "AWS::ApiGateway::RestApi"
109109
},
110-
"MyApiDeployment32e59613e2": {
110+
"MyApiBasePathMapping": {
111111
"Condition": "C1",
112112
"Properties": {
113-
"Description": "RestApi deployment id: 32e59613e2e02a1f1d264849167ea359f10342f0",
114-
"RestApiId": {
115-
"Ref": "MyApi"
116-
}
117-
},
118-
"Type": "AWS::ApiGateway::Deployment"
119-
},
120-
"MyApiProdStage": {
121-
"Condition": "C1",
122-
"Properties": {
123-
"DeploymentId": {
124-
"Ref": "MyApiDeployment32e59613e2"
113+
"BasePath": {
114+
"Fn::Sub": "us-gov-west-1-api"
125115
},
126-
"RestApiId": {
127-
"Ref": "MyApi"
128-
},
129-
"StageName": "Prod"
130-
},
131-
"Type": "AWS::ApiGateway::Stage"
132-
},
133-
"MyApifetchBasePathMapping": {
134-
"Condition": "C1",
135-
"Properties": {
136-
"BasePath": "fetch",
137116
"DomainName": {
138117
"Ref": "ApiGatewayDomainName9c93aac102"
139118
},
@@ -146,21 +125,28 @@
146125
},
147126
"Type": "AWS::ApiGateway::BasePathMapping"
148127
},
149-
"MyApigetBasePathMapping": {
128+
"MyApiDeployment9d140ab9b8": {
150129
"Condition": "C1",
151130
"Properties": {
152-
"BasePath": "get",
153-
"DomainName": {
154-
"Ref": "ApiGatewayDomainName9c93aac102"
131+
"Description": "RestApi deployment id: 9d140ab9b8b8ee141d5cd2d4a90a374c37a10db7",
132+
"RestApiId": {
133+
"Ref": "MyApi"
134+
}
135+
},
136+
"Type": "AWS::ApiGateway::Deployment"
137+
},
138+
"MyApiProdStage": {
139+
"Condition": "C1",
140+
"Properties": {
141+
"DeploymentId": {
142+
"Ref": "MyApiDeployment9d140ab9b8"
155143
},
156144
"RestApiId": {
157145
"Ref": "MyApi"
158146
},
159-
"Stage": {
160-
"Ref": "MyApiProdStage"
161-
}
147+
"StageName": "Prod"
162148
},
163-
"Type": "AWS::ApiGateway::BasePathMapping"
149+
"Type": "AWS::ApiGateway::Stage"
164150
},
165151
"MyFunction": {
166152
"Condition": "C1",

0 commit comments

Comments
 (0)