Skip to content

Allow empty service endpoint, use default region endpoint. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow empty service endpoint, use default region endpoint. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81d1a8d
Allow empty custom url, so that we can just use the region. Users sho…
Aug 1, 2018
624d6c7
put an if to check if it not empty.
Aug 1, 2018
501195b
remove error.
Aug 1, 2018
996fe46
keep the error, drop the asterik.
Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions amazon-util/src/main/java/jetbrains/buildServer/util/amazon/AWSCommonParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ public static Map<String, String> validate(@NotNull Map<String, String> params,

if (ENVIRONMENT_TYPE_CUSTOM.equals(params.get(ENVIRONMENT_NAME_PARAM))) {
final String serviceEndpoint = params.get(SERVICE_ENDPOINT_PARAM);
if (StringUtil.isEmptyOrSpaces(serviceEndpoint)) {
invalids.put(SERVICE_ENDPOINT_PARAM, SERVICE_ENDPOINT_LABEL + " must not be empty");
} else {
if (StringUtil.isNotEmpty(serviceEndpoint)) {
try {
new URL(serviceEndpoint);
} catch (MalformedURLException e) {
Expand Down
2 changes: 1 addition & 1 deletion amazon-util/src/main/resources/buildServerResources/editAWSCommonParams.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<props:selectSectionPropertyContent value="" caption="<Default>" />
<props:selectSectionPropertyContent value="${environment_type_custom}" caption="Custom">
<tr>
<th><label for="${service_endpoint_param}">${service_endpoint_label}: <l:star/></label></th>
<th><label for="${service_endpoint_param}">${service_endpoint_label}: </label></th>
<td>
<props:textProperty name="${service_endpoint_param}" className="longField"/>
<span class="smallNote">Specify the URL for AWS service</span>
Expand Down