Skip to content

Commit 1dd433f

Browse files
authored
Merge pull request #132 from vulkoingim/fix-respect-endpoint-url
Fix AWS_ENDPOINT_URL following spec
2 parents f03df66 + ce8a9ad commit 1dd433f

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

lib/aws_codegen/post_service.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ defmodule AWS.CodeGen.PostService do
111111
signing_name: signing_name,
112112
signature_version: AWS.CodeGen.Util.get_signature_version(service),
113113
service_id: AWS.CodeGen.Util.get_service_id(service),
114-
endpoint_url_env_var: "AWS_ENDPOINT_URL_" <> spec.module_name |> String.upcase(),
114+
endpoint_url_env_var:
115+
"AWS_ENDPOINT_URL_" <>
116+
(service
117+
|> AWS.CodeGen.Util.get_service_id()
118+
|> String.replace(" ", "_")
119+
|> String.upcase()),
115120
target_prefix: target_prefix(spec.api)
116121
}
117122
end

lib/aws_codegen/rest_service.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,12 @@ defmodule AWS.CodeGen.RestService do
157157
signing_name: signing_name,
158158
signature_version: AWS.CodeGen.Util.get_signature_version(service),
159159
service_id: AWS.CodeGen.Util.get_service_id(service),
160-
endpoint_url_env_var: "AWS_ENDPOINT_URL_" <> spec.module_name |> String.upcase(),
160+
endpoint_url_env_var:
161+
"AWS_ENDPOINT_URL_" <>
162+
(service
163+
|> AWS.CodeGen.Util.get_service_id()
164+
|> String.replace(" ", "_")
165+
|> String.upcase()),
161166
## TODO: metadata["targetPrefix"],
162167
target_prefix: nil,
163168
shapes: Shapes.collect_shapes(language, spec.api)

test/aws_codegen/rest_service_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ defmodule AWS.CodeGen.RestServiceTest do
5151
module_name: "AWS.CloudTrailData",
5252
protocol: "rest-json",
5353
service_id: "CloudTrail Data",
54-
endpoint_url_env_var: "AWS_ENDPOINT_URL_AWS.CLOUDTRAILDATA", # For Erlang this would be: AWS_ENDPOINT_URL_CLOUDTRAILDATA
54+
endpoint_url_env_var: "AWS_ENDPOINT_URL_CLOUDTRAIL_DATA",
5555
signature_version: "v4",
5656
signing_name: "cloudtrail-data",
5757
target_prefix: nil

0 commit comments

Comments
 (0)