Skip to content
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

Mgmt Appplatform: custom domain, certificate and samples #13127

Merged
merged 12 commits into from
Jul 16, 2020
Merged

Mgmt Appplatform: custom domain, certificate and samples #13127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9daa9da
add interface for left api
ChenTanyi Jul 8, 2020
918a07c
add impl
ChenTanyi Jul 9, 2020
0a8c6cb
add test for custom domain
ChenTanyi Jul 10, 2020
2180617
update specs
ChenTanyi Jul 10, 2020
0483600
Merge branch 'master' into appplatform
ChenTanyi Jul 10, 2020
d449dc6
regen
ChenTanyi Jul 10, 2020
8e026a8
fix compile error
ChenTanyi Jul 10, 2020
3d0179f
add app platform sample
ChenTanyi Jul 14, 2020
95996f1
add samples.json remaining wrong filepath
ChenTanyi Jul 14, 2020
34aff11
fix checkstyle
ChenTanyi Jul 14, 2020
94c202d
fix checkstyle
ChenTanyi Jul 14, 2020
d07d164
disconnect in finally
ChenTanyi Jul 14, 2020
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
Prev Previous commit
Next Next commit
fix checkstyle
  • Loading branch information
@ChenTanyi
ChenTanyi committed Jul 14, 2020
commit 94c202dc4eca189e34afdc83d42e26c3e22187bd
11 changes: 6 additions & 5 deletions ...appplatform/mgmt/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,12 @@ private void extraTarGzSource(File folder, URL url) throws IOException {
}
File file = new File(folder, entry.getName());
File parent = file.getParentFile();
if (!parent.exists()) {
parent.mkdirs();
}
try (OutputStream outputStream = new FileOutputStream(file)) {
IOUtils.copy(inputStream, outputStream);
if (parent.exists() || parent.mkdirs()) {
try (OutputStream outputStream = new FileOutputStream(file)) {
IOUtils.copy(inputStream, outputStream);
}
} else {
throw new IllegalStateException("Cannot create directory: " + parent.getAbsolutePath());
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions ...amples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public class ManageSpringCloud {
* @param azure instance of the azure client
* @param clientId the aad client id in azure instance
* @return true if sample runs successfully
* @throws IllegalStateException unexcepted state
*/
public static boolean runSample(Azure azure, String clientId) {
final String rgName = azure.sdkContext().randomResourceName("rg", 24);
Expand Down Expand Up @@ -299,11 +300,12 @@ private static void extraTarGzSource(File folder, URL url) throws IOException {
}
File file = new File(folder, entry.getName());
File parent = file.getParentFile();
if (!parent.exists()) {
parent.mkdirs();
}
try (OutputStream outputStream = new FileOutputStream(file)) {
IOUtils.copy(inputStream, outputStream);
if (parent.exists() || parent.mkdirs()) {
try (OutputStream outputStream = new FileOutputStream(file)) {
IOUtils.copy(inputStream, outputStream);
}
} else {
throw new IllegalStateException("Cannot create directory: " + parent.getAbsolutePath());
}
}
}
Expand Down