Skip to content

mgmt support module-info for resource manager #14127

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

Closed
xseeseesee wants to merge 32 commits into from
Closed

mgmt support module-info for resource manager #14127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
741fd19
update resources fluentcore and test base
xseeseesee Aug 14, 2020
80db3dc
add azure-resourcemanager-test
xseeseesee Aug 14, 2020
4a117fc
add module-info for resources
xseeseesee Aug 14, 2020
b829c16
add module-info for storage
xseeseesee Aug 14, 2020
d6acbb2
add module-info for authorization
xseeseesee Aug 14, 2020
c24c274
add module-info for msi
xseeseesee Aug 14, 2020
2c750fc
add module-info for network
xseeseesee Aug 14, 2020
646412c
add module-info for compute
xseeseesee Aug 14, 2020
0380f8d
add module-info for dns
xseeseesee Aug 14, 2020
2c8f0e9
add module-info for keyvault
xseeseesee Aug 14, 2020
36b7bbc
add module-info for appservice
xseeseesee Aug 14, 2020
72305d2
add module-info for appplatform
xseeseesee Aug 14, 2020
53ea270
add module-info for containerinstance
xseeseesee Aug 14, 2020
100056a
add module-info for containerregistry
xseeseesee Aug 14, 2020
7950075
add module-info for containerservice
xseeseesee Aug 14, 2020
0daf905
add module-info for cosmos
xseeseesee Aug 14, 2020
c50a6b1
add module-info for monitor
xseeseesee Aug 14, 2020
47df98d
add module-info for sql
xseeseesee Aug 14, 2020
3a50c55
add module-info for azure client
xseeseesee Aug 14, 2020
7962298
update samples
xseeseesee Aug 14, 2020
0fecfea
Merge remote-tracking branch 'upstream/master' into add-resmgr-test
xseeseesee Aug 14, 2020
417766a
update versioning and pom
xseeseesee Aug 14, 2020
e4ffa0d
Merge branch 'master' into add-resmgr-test
xseeseesee Aug 14, 2020
cf3fda6
Merge branch 'master' into add-resmgr-test
xseeseesee Aug 17, 2020
1ae3f60
Merge branch 'add-resmgr-test' of https://github.com/xccc-msft/azure-…
xseeseesee Aug 17, 2020
7ac2fed
update README for azure-resourcemanager-test
xseeseesee Aug 17, 2020
e0f51d0
update module-info and add private dns
xseeseesee Aug 18, 2020
b843d8b
update ResourceManagerTestBase for hiding output
xseeseesee Aug 18, 2020
513b965
Merge remote-tracking branch 'upstream/master' into add-resmgr-test
xseeseesee Aug 18, 2020
054215f
add module-info for redis
xseeseesee Aug 18, 2020
cfd0166
skip random CI failure for dns and private dns
xseeseesee Aug 19, 2020
fb84736
Merge branch 'master' into add-resmgr-test
xseeseesee Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ com.azure.resourcemanager:azure-resourcemanager-redis;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-sql;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-storage;2.0.0-beta.3;2.0.0-beta.4
com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.4;2.0.0-beta.4
com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.3;2.4.0-beta.1
com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.3;2.4.0-beta.1
com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.3;2.4.0-beta.1
Expand Down
5 changes: 5 additions & 0 deletions sdk/parents/azure-client-sdk-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,11 @@
<!-- Azure-core needs to open the test entities to Jackson for unit tests to operate -->
--add-opens com.azure.core/com.azure.core.implementation.entities=com.fasterxml.jackson.databind
--add-opens com.azure.core/com.azure.core.implementation.entities=ALL-UNNAMED

Copy link
Member

@conniey conniey Aug 24, 2020

Choose a reason for hiding this comment

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

IIRC, we were trying to push this into the actual child pom.xml than bloat the parent one. @alzimmermsft, is this correct?

Copy link
Member

@alzimmermsft alzimmermsft Aug 24, 2020

Choose a reason for hiding this comment

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

Yes, we should begin removing library specific configurations from the parent POM. The current configuration results in a lot of warnings from being unable to find modules that exist outside of the project being ran.

<!-- ResourceManager tests fail without these exports. -->
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.models.implementation=ALL-UNNAMED
</argLine>
<systemPropertyVariables>
<jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
Expand Down
6 changes: 3 additions & 3 deletions sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-test</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;current} -->
Copy link
Member

@srnagar srnagar Aug 19, 2020

Choose a reason for hiding this comment

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

I see that there is apache-commons dependency included. This dependency is not allowed. Can this dependency be removed?

@JonathanGiles

Copy link
Contributor Author

@xseeseesee xseeseesee Aug 19, 2020

Choose a reason for hiding this comment

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

I think this apache-commons is required for spring cloud service(named appplatform here). It could help on compression and upload.

cc: @ChenTanyi

Copy link
Contributor

@ChenTanyi ChenTanyi Aug 19, 2020

Choose a reason for hiding this comment

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

Is there any compression package can be used?

Copy link
Member

@JonathanGiles JonathanGiles Aug 19, 2020

Choose a reason for hiding this comment

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

Yes - we should start with the default position that this dependency is not allowed, and work from there to either find an alternative approach or justify why this is needed, but for me the hurdle for accepting this dependency is very high.

<scope>test</scope>
</dependency>
<dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...r-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.azure.resourcemanager.resources.fluentcore.arm.AzureConfigurable;
import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl;
import com.azure.resourcemanager.resources.fluentcore.arm.implementation.Manager;
import com.azure.resourcemanager.resources.fluentcore.profile.AzureProfile;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext;

Expand Down Expand Up @@ -88,8 +88,9 @@ private AppPlatformManager(HttpPipeline httpPipeline, AzureProfile profile, SdkC
profile,
new AppPlatformManagementClientBuilder()
.pipeline(httpPipeline)
.endpoint(profile.environment().getResourceManagerEndpoint())
.subscriptionId(profile.subscriptionId())
.environment(profile.getEnvironment())
.endpoint(profile.getEnvironment().getResourceManagerEndpoint())
.subscriptionId(profile.getSubscriptionId())
.buildClient(),
sdkContext);
}
Expand Down
2 changes: 0 additions & 2 deletions ...ger-appplatform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.fluent.inner.AppResourceInner;
import com.azure.resourcemanager.resources.fluentcore.arm.models.ExternalChildResource;
import com.azure.resourcemanager.resources.fluentcore.model.Appliable;
Expand All @@ -18,7 +17,6 @@

/** An immutable client-side representation of an Azure Spring App. */
@Fluent
@Beta
public interface SpringApp
extends ExternalChildResource<SpringApp, SpringService>,
HasInner<AppResourceInner>,
Expand Down
2 changes: 0 additions & 2 deletions ...tform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringAppDeployment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.fluent.inner.DeploymentResourceInner;
import com.azure.resourcemanager.resources.fluentcore.arm.models.ExternalChildResource;
import com.azure.resourcemanager.resources.fluentcore.model.Appliable;
Expand All @@ -19,7 +18,6 @@

/** An immutable client-side representation of an Azure Spring App Deployment. */
@Fluent
@Beta
public interface SpringAppDeployment
extends ExternalChildResource<SpringAppDeployment, SpringApp>,
HasInner<DeploymentResourceInner>,
Expand Down
2 changes: 0 additions & 2 deletions ...form/src/main/java/com/azure/resourcemanager/appplatform/models/SpringAppDeployments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.DeploymentsClient;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -19,7 +18,6 @@

/** Entry point for Spring App Deployments API. */
@Fluent
@Beta
public interface SpringAppDeployments
extends HasManager<AppPlatformManager>,
HasInner<DeploymentsClient>,
Expand Down
2 changes: 0 additions & 2 deletions ...platform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringAppDomains.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.CustomDomainsClient;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -19,7 +18,6 @@

/** Entry point for Spring App Custom Domains API. */
@Fluent
@Beta
public interface SpringAppDomains
extends HasManager<AppPlatformManager>,
HasInner<CustomDomainsClient>,
Expand Down
2 changes: 0 additions & 2 deletions .../src/main/java/com/azure/resourcemanager/appplatform/models/SpringAppServiceBindings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.BindingsClient;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -18,7 +17,6 @@

/** Entry point for Spring App Service Bindings API. */
@Fluent
@Beta
public interface SpringAppServiceBindings
extends HasManager<AppPlatformManager>,
HasInner<BindingsClient>,
Expand Down
2 changes: 0 additions & 2 deletions ...er-appplatform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringApps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.AppsClient;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -19,7 +18,6 @@

/** Entry point for Spring Apps API. */
@Fluent
@Beta
public interface SpringApps
extends HasManager<AppPlatformManager>,
HasInner<AppsClient>,
Expand Down
2 changes: 0 additions & 2 deletions ...appplatform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.inner.ServiceResourceInner;
import com.azure.resourcemanager.resources.fluentcore.arm.models.GroupableResource;
Expand All @@ -17,7 +16,6 @@

/** An immutable client-side representation of an Azure Spring Service. */
@Fluent
@Beta
public interface SpringService
extends GroupableResource<AppPlatformManager, ServiceResourceInner>,
Refreshable<SpringService>,
Expand Down
2 changes: 0 additions & 2 deletions ...src/main/java/com/azure/resourcemanager/appplatform/models/SpringServiceCertificates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package com.azure.resourcemanager.appplatform.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.CertificatesClient;
import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById;
Expand All @@ -18,7 +17,6 @@

/** Entry point for Spring Service Certificates API. */
@Fluent
@Beta
public interface SpringServiceCertificates
extends HasManager<AppPlatformManager>,
HasInner<CertificatesClient>,
Expand Down
2 changes: 0 additions & 2 deletions ...ppplatform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.azure.core.annotation.Fluent;
import com.azure.core.http.rest.PagedFlux;
import com.azure.core.http.rest.PagedIterable;
import com.azure.core.implementation.annotation.Beta;
import com.azure.resourcemanager.appplatform.AppPlatformManager;
import com.azure.resourcemanager.appplatform.fluent.ServicesClient;
import com.azure.resourcemanager.resources.fluentcore.arm.Region;
Expand All @@ -23,7 +22,6 @@

/** Entry point for Spring Service management API. */
@Fluent
@Beta
public interface SpringServices
extends HasManager<AppPlatformManager>,
HasInner<ServicesClient>,
Expand Down
13 changes: 13 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module com.azure.resourcemanager.appplatform {
Copy link
Member

@srnagar srnagar Aug 19, 2020

Choose a reason for hiding this comment

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

All the module-info.java files are missing license headers.

requires transitive com.azure.resourcemanager.resources;
requires transitive com.azure.storage.file.share;
requires org.apache.commons.compress;
Copy link
Member

@srnagar srnagar Aug 19, 2020

Choose a reason for hiding this comment

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

If the apache-commons dependency is removed, this should be removed as well.


exports com.azure.resourcemanager.appplatform;
exports com.azure.resourcemanager.appplatform.fluent;
exports com.azure.resourcemanager.appplatform.fluent.inner;
exports com.azure.resourcemanager.appplatform.models;

opens com.azure.resourcemanager.appplatform.fluent.inner to com.fasterxml.jackson.databind, com.azure.core;
opens com.azure.resourcemanager.appplatform.models to com.fasterxml.jackson.databind, com.azure.core;
}
46 changes: 32 additions & 14 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 @@ -3,36 +3,54 @@

package com.azure.resourcemanager.appplatform;

import com.azure.core.credential.TokenCredential;
import com.azure.core.http.HttpClient;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.policy.HttpLogOptions;
import com.azure.core.http.policy.HttpPipelinePolicy;
import com.azure.core.http.policy.RetryPolicy;
import com.azure.resourcemanager.appservice.AppServiceManager;
import com.azure.resourcemanager.dns.DnsZoneManager;
import com.azure.resourcemanager.keyvault.KeyVaultManager;
import com.azure.resourcemanager.resources.core.TestBase;
import com.azure.resourcemanager.resources.fluentcore.profile.AzureProfile;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.test.ResourceManagerTestBase;

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

public class AppPlatformTest extends TestBase {
public class AppPlatformTest extends ResourceManagerTestBase {
protected AppPlatformManager appPlatformManager;
protected AppServiceManager appServiceManager;
protected DnsZoneManager dnsZoneManager;
protected KeyVaultManager keyVaultManager;
protected String rgName = "";

public AppPlatformTest() {
}

AppPlatformTest(RunCondition runCondition) {
super(runCondition);
@Override
protected HttpPipeline buildHttpPipeline(
TokenCredential credential,
AzureProfile profile,
HttpLogOptions httpLogOptions,
List<HttpPipelinePolicy> policies,
HttpClient httpClient) {
return HttpPipelineProvider.buildHttpPipeline(
credential,
profile,
null,
httpLogOptions,
null,
new RetryPolicy("Retry-After", ChronoUnit.SECONDS),
policies,
httpClient);
}

@Override
protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) throws IOException {
protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) {
rgName = generateRandomResourceName("rg", 20);
appPlatformManager = AppPlatformManager.authenticate(httpPipeline, profile, sdkContext);
appServiceManager = AppServiceManager.authenticate(httpPipeline, profile, sdkContext);
dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile, sdkContext);
keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext);
appPlatformManager = AppPlatformManager.authenticate(httpPipeline, profile);
appServiceManager = AppServiceManager.authenticate(httpPipeline, profile);
dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile);
keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile);
}

@Override
Expand Down
13 changes: 9 additions & 4 deletions ...ager-appplatform/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 @@ -3,6 +3,7 @@

package com.azure.resourcemanager.appplatform;

import com.azure.core.test.annotation.DoNotRecord;
import com.azure.resourcemanager.appplatform.models.RuntimeVersion;
import com.azure.resourcemanager.appplatform.models.SpringApp;
import com.azure.resourcemanager.appplatform.models.SpringAppDeployment;
Expand Down Expand Up @@ -49,12 +50,12 @@ public class SpringCloudTest extends AppPlatformTest {

private static final String SPRING_CLOUD_SERVICE_PRINCIPAL = "03b39d0f-4213-4864-a245-b1476ec03169";

SpringCloudTest() {
super(RunCondition.LIVE_ONLY); // need storage data-plane and url check
}

@Test
@DoNotRecord
public void canCRUDSpringAppWithDeployment() throws IOException {
if (skipInPlayback()) {
return;
}
String serviceName = generateRandomResourceName("springsvc", 15);
String appName = "gateway";
String deploymentName = generateRandomResourceName("deploy", 15);
Expand Down Expand Up @@ -155,7 +156,11 @@ public void canCRUDSpringAppWithDeployment() throws IOException {
}

@Test
@DoNotRecord
public void canCreateCustomDomainWithSsl() throws Exception {
if (skipInPlayback()) {
return;
}
String domainName = generateRandomResourceName("jsdkdemo-", 20) + ".com";
String certOrderName = generateRandomResourceName("cert", 15);
String vaultName = generateRandomResourceName("vault", 15);
Expand Down
10 changes: 7 additions & 3 deletions sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-test</artifactId>
<version>2.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-test;current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -119,6 +119,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...ager-appservice/src/main/java/com/azure/resourcemanager/appservice/AppServiceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.azure.resourcemanager.resources.fluentcore.arm.AzureConfigurable;
import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl;
import com.azure.resourcemanager.resources.fluentcore.arm.implementation.Manager;
import com.azure.resourcemanager.resources.fluentcore.profile.AzureProfile;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext;
import com.azure.resourcemanager.storage.StorageManager;
Expand Down Expand Up @@ -112,8 +112,9 @@ private AppServiceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCo
profile,
new WebSiteManagementClientBuilder()
.pipeline(httpPipeline)
.endpoint(profile.environment().getResourceManagerEndpoint())
.subscriptionId(profile.subscriptionId())
.environment(profile.getEnvironment())
.endpoint(profile.getEnvironment().getResourceManagerEndpoint())
.subscriptionId(profile.getSubscriptionId())
.buildClient(),
sdkContext);
keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext);
Expand Down
2 changes: 1 addition & 1 deletion ...ice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import com.azure.resourcemanager.appservice.fluent.inner.SlotConfigNamesResourceInner;
import com.azure.resourcemanager.appservice.fluent.inner.StringDictionaryInner;
import com.azure.resourcemanager.authorization.models.BuiltInRole;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
import com.azure.resourcemanager.resources.fluentcore.dag.FunctionalTaskItem;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.azure.resourcemanager.appservice.fluent.inner.SitePatchResourceInner;
import com.azure.resourcemanager.appservice.models.WebAppBase;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.authorization.utils.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.dag.TaskGroup;
import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
Expand Down
14 changes: 14 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module com.azure.resourcemanager.appservice {
requires transitive com.azure.resourcemanager.keyvault;
requires transitive com.azure.resourcemanager.msi;
requires transitive com.azure.resourcemanager.dns;
requires transitive com.azure.resourcemanager.storage;
Comment on lines +2 to +5
Copy link
Member

@srnagar srnagar Aug 19, 2020

Choose a reason for hiding this comment

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

Do these have to be transitive? Will the consumers of azure-resourcemanager-appservice module use the types defined in keyvault, msi, dns and storage modules?


exports com.azure.resourcemanager.appservice;
exports com.azure.resourcemanager.appservice.fluent;
exports com.azure.resourcemanager.appservice.fluent.inner;
exports com.azure.resourcemanager.appservice.models;

opens com.azure.resourcemanager.appservice.fluent.inner to com.fasterxml.jackson.databind, com.azure.core;
opens com.azure.resourcemanager.appservice.models to com.fasterxml.jackson.databind, com.azure.core;
}
Loading