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, migrate test-proxy #36079

Merged
merged 11 commits into from
Jul 25, 2023
Merged

mgmt, migrate test-proxy #36079

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7e584b7
sql
weidongxu-microsoft Jul 25, 2023
819a6d3
appplatform
weidongxu-microsoft Jul 25, 2023
e4996c5
network
weidongxu-microsoft Jul 25, 2023
30188a8
Merge branch 'main' into mgmt_migrate-test-proxy
weidongxu-microsoft Jul 25, 2023
f25d4ec
clean up
weidongxu-microsoft Jul 25, 2023
f0cb417
sql test fix
weidongxu-microsoft Jul 25, 2023
6581786
redis
weidongxu-microsoft Jul 25, 2023
1350ea3
add sanitizer for ContainerRegistry
weidongxu-microsoft Jul 25, 2023
f12f161
fix
weidongxu-microsoft Jul 25, 2023
a7e32f1
cdn
weidongxu-microsoft Jul 25, 2023
3eac48c
delete credscan
weidongxu-microsoft Jul 25, 2023
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
6 changes: 6 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-appplatform/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/resourcemanager/azure-resourcemanager-appplatform",
"Tag": "java/resourcemanager/azure-resourcemanager-appplatform_3257d8a299"
}
4 changes: 2 additions & 2 deletions ...ager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/AppPlatformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.azure.resourcemanager.keyvault.KeyVaultManager;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
import com.azure.resourcemanager.test.ResourceManagerTestBase;
import com.azure.resourcemanager.test.ResourceManagerTestProxyTestBase;
import com.azure.resourcemanager.test.utils.TestDelayProvider;

import javax.net.ssl.HttpsURLConnection;
Expand All @@ -32,7 +32,7 @@
import java.time.temporal.ChronoUnit;
import java.util.List;

public class AppPlatformTest extends ResourceManagerTestBase {
public class AppPlatformTest extends ResourceManagerTestProxyTestBase {
protected AppPlatformManager appPlatformManager;
protected AppServiceManager appServiceManager;
protected DnsZoneManager dnsZoneManager;
Expand Down
2 changes: 1 addition & 1 deletion ...platform/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudLiveOnlyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void canCreateCustomDomainWithSsl() throws Exception {

allowAllSSL();
String cerPassword = password();
String resourcePath = Paths.get(this.getClass().getResource("/session-records").toURI()).getParent().toString();
String resourcePath = Paths.get(this.getClass().getResource("/junit-platform.properties").toURI()).getParent().toString();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't have /session-records folder now.

String cerPath = resourcePath + domainName + ".cer";
String pfxPath = resourcePath + domainName + ".pfx";
createCertificate(cerPath, pfxPath, domainName, cerPassword, "ssl." + domainName, "ssl." + domainName);
Expand Down
3,151 changes: 0 additions & 3,151 deletions ...manager-appplatform/src/test/resources/session-records/EnterpriseTierTest.canCRUDApp.json
View file
Open in desktop

This file was deleted.

5,652 changes: 0 additions & 5,652 deletions ...ger-appplatform/src/test/resources/session-records/EnterpriseTierTest.canCRUDService.json
View file
Open in desktop

This file was deleted.

1,835 changes: 0 additions & 1,835 deletions ...rcemanager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDApp.json
View file
Open in desktop

This file was deleted.

3,396 changes: 0 additions & 3,396 deletions ...manager-appplatform/src/test/resources/session-records/SpringCloudTest.canCRUDServie.json
View file
Open in desktop

This file was deleted.

1,373 changes: 0 additions & 1,373 deletions ...ppplatform/src/test/resources/session-records/SpringCloudTest.canSetActiveDeployment.json
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-cdn/assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/resourcemanager/azure-resourcemanager-cdn",
"Tag": "java/resourcemanager/azure-resourcemanager-cdn_57fc21a7b1"
}
4 changes: 2 additions & 2 deletions ...re-resourcemanager-cdn/src/test/java/com/azure/resourcemanager/cdn/CdnManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
import com.azure.resourcemanager.resources.ResourceManager;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
import com.azure.resourcemanager.test.ResourceManagerTestBase;
import com.azure.resourcemanager.test.ResourceManagerTestProxyTestBase;
import com.azure.resourcemanager.test.utils.TestDelayProvider;

import java.time.temporal.ChronoUnit;
import java.util.List;

public abstract class CdnManagementTest extends ResourceManagerTestBase {
public abstract class CdnManagementTest extends ResourceManagerTestProxyTestBase {

protected ResourceManager resourceManager;
protected CdnManager cdnManager;
Expand Down
221 changes: 0 additions & 221 deletions ...cdn/src/test/resources/session-records/CdnProfileOperationsTests.canCreateCdnProfile.json
View file
Open in desktop

This file was deleted.

Loading