Skip to content

Commit

Permalink
GA Graph RBAC (#702)
Browse files Browse the repository at this point in the history
  • Loading branch information
jianghaolu authored Mar 4, 2019
1 parent 6ee7e89 commit d8a4aaf
Show file tree
Hide file tree
Showing 21 changed files with 3 additions and 112 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ If you are looking for Java client libraries for *consuming* (rather than *manag
</tr>
<tr>
<td>More services</td>
<td>Resource Manager<br>Key Vault<br>Redis<br>CDN<br>Batch<br>Service bus</td>
<td valign="top">Web apps<br>Function Apps<br>Graph RBAC<br>Cosmos DB<br>Monitor<br>Batch AI<br>Search<br>Event Hub</td>
<td>Resource Manager<br>Key Vault<br>Redis<br>CDN<br>Batch<br>Service bus<br>Graph RBAC</td>
<td valign="top">Web apps<br>Function Apps<br>Cosmos DB<br>Monitor<br>Batch AI<br>Search<br>Event Hub</td>
<td valign="top">Data Lake<br>More Monitor features<br>Logic Apps<br>Event Grid</td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.ApplicationInner;
import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
Expand All @@ -24,7 +22,6 @@
* An immutable client-side representation of an Azure AD application.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta(SinceVersion.V1_1_0)
public interface ActiveDirectoryApplication extends
ActiveDirectoryObject,
HasInner<ApplicationInner>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.ApplicationsInner;
import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
Expand All @@ -24,7 +22,6 @@
* Entry point to application management API.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta(SinceVersion.V1_1_0)
public interface ActiveDirectoryApplications extends
SupportsListing<ActiveDirectoryApplication>,
SupportsGettingById<ActiveDirectoryApplication>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.ADGroupInner;
import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
Expand All @@ -22,7 +20,6 @@
* An immutable client-side representation of an Azure AD group.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta
public interface ActiveDirectoryGroup extends
ActiveDirectoryObject,
HasInner<ADGroupInner>,
Expand All @@ -41,14 +38,12 @@ public interface ActiveDirectoryGroup extends
* Lists the members in the group.
* @return an unmodifiable set of the members
*/
@Beta(SinceVersion.V1_2_0)
Set<ActiveDirectoryObject> listMembers();

/**
* Lists the members in the group.
* @return an unmodifiable set of the members
*/
@Beta(SinceVersion.V1_2_0)
Observable<ActiveDirectoryObject> listMembersAsync();

/**
Expand All @@ -74,7 +69,6 @@ interface Blank extends WithEmailAlias {
* An AD Group definition allowing mail nickname to be specified.
*/
interface WithEmailAlias {
@Beta(SinceVersion.V1_2_0)
WithCreate withEmailAlias(String mailNickname);
}

Expand All @@ -87,31 +81,27 @@ interface WithMember {
* @param objectId the Active Directory object's id
* @return the next AD Group definition stage
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withMember(String objectId);

/**
* Adds a user as a member in the group.
* @param user the Active Directory user to add
* @return the next AD group definition stage
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withMember(ActiveDirectoryUser user);

/**
* Adds a group as a member in the group.
* @param group the Active Directory group to add
* @return the next AD group definition stage
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withMember(ActiveDirectoryGroup group);

/**
* Adds a service principal as a member in the group.
* @param servicePrincipal the service principal to add
* @return the next AD group definition stage
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withMember(ServicePrincipal servicePrincipal);
}

Expand All @@ -120,7 +110,6 @@ interface WithMember {
* group in the cloud, but exposing additional optional inputs to
* specify.
*/
@Beta(SinceVersion.V1_2_0)
interface WithCreate extends
Creatable<ActiveDirectoryGroup>,
WithMember {
Expand All @@ -140,71 +129,62 @@ interface WithMember {
* @param objectId the Active Directory object's id
* @return the next AD Group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withMember(String objectId);

/**
* Adds a user as a member in the group.
* @param user the Active Directory user to add
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withMember(ActiveDirectoryUser user);

/**
* Adds a group as a member in the group.
* @param group the Active Directory group to add
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withMember(ActiveDirectoryGroup group);

/**
* Adds a service principal as a member in the group.
* @param servicePrincipal the service principal to add
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withMember(ServicePrincipal servicePrincipal);

/**
* Removes a member based on its object id.
* @param objectId the Active Directory object's id
* @return the next AD Group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withoutMember(String objectId);

/**
* Removes a user as a member in the group.
* @param user the Active Directory user to remove
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withoutMember(ActiveDirectoryUser user);

/**
* Removes a group as a member in the group.
* @param group the Active Directory group to remove
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withoutMember(ActiveDirectoryGroup group);

/**
* Removes a service principal as a member in the group.
* @param servicePrincipal the service principal to remove
* @return the next AD group update stage
*/
@Beta(SinceVersion.V1_2_0)
Update withoutMember(ServicePrincipal servicePrincipal);
}
}

/**
* The template for a group update operation, containing all the settings that can be modified.
*/
@Beta(SinceVersion.V1_2_0)
interface Update extends
Appliable<ActiveDirectoryGroup>,
UpdateStages.WithMember {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
import com.microsoft.azure.management.graphrbac.implementation.GroupsInner;
Expand All @@ -22,7 +21,6 @@
* Entry point to AD group management API.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta
public interface ActiveDirectoryGroups extends
SupportsListing<ActiveDirectoryGroup>,
SupportsGettingById<ActiveDirectoryGroup>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
import com.microsoft.azure.management.resources.fluentcore.arm.models.HasId;
Expand All @@ -19,7 +17,6 @@
* An immutable client-side representation of an Azure AD object.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta(SinceVersion.V1_2_0)
public interface ActiveDirectoryObject extends
Indexable,
HasId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.UserInner;
import com.microsoft.azure.management.resources.fluentcore.arm.CountryIsoCode;
Expand All @@ -20,7 +18,6 @@
* An immutable client-side representation of an Azure AD user.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta
public interface ActiveDirectoryUser extends
ActiveDirectoryObject,
HasInner<UserInner>,
Expand Down Expand Up @@ -48,7 +45,6 @@ public interface ActiveDirectoryUser extends
/**
* @return the usage location of the user
*/
@Beta(SinceVersion.V1_2_0)
CountryIsoCode usageLocation();

/**************************************************************
Expand Down Expand Up @@ -85,15 +81,13 @@ interface WithUserPrincipalName {
* @param userPrincipalName the user principal name
* @return the next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithPassword withUserPrincipalName(String userPrincipalName);

/**
* Specifies the email alias of the new user.
* @param emailAlias the email alias of the new user
* @return the next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithPassword withEmailAlias(String emailAlias);
}

Expand All @@ -106,7 +100,6 @@ interface WithPassword {
* @param password the password of the user
* @return the next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withPassword(String password);
}

Expand All @@ -119,7 +112,6 @@ interface WithPromptToChangePasswordOnLogin {
* @param promptToChangePasswordOnLogin true if the user should change password on next login.
* @return the next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withPromptToChangePasswordOnLogin(boolean promptToChangePasswordOnLogin);
}

Expand All @@ -132,7 +124,6 @@ interface WithAccontEnabled {
* @param accountEnabled true if account is enabled, false otherwise
* @return the next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withAccountEnabled(boolean accountEnabled);
}

Expand All @@ -147,7 +138,6 @@ interface WithUsageLocation {
* @param usageLocation A two letter country code (ISO standard 3166).
* @return The next stage of user definition
*/
@Beta(SinceVersion.V1_2_0)
WithCreate withUsageLocation(CountryIsoCode usageLocation);
}

Expand All @@ -156,7 +146,6 @@ interface WithUsageLocation {
* user in the cloud, but exposing additional optional inputs to
* specify.
*/
@Beta(SinceVersion.V1_2_0)
interface WithCreate extends
Creatable<ActiveDirectoryUser>,
DefinitionStages.WithAccontEnabled,
Expand All @@ -178,7 +167,6 @@ interface WithPassword {
* @param password the password of the user
* @return the next stage of user update
*/
@Beta(SinceVersion.V1_2_0)
Update withPassword(String password);
}

Expand All @@ -191,7 +179,6 @@ interface WithPromptToChangePasswordOnLogin {
* @param promptToChangePasswordOnLogin true if the user should change password on next login.
* @return the next stage of user update
*/
@Beta(SinceVersion.V1_2_0)
Update withPromptToChangePasswordOnLogin(boolean promptToChangePasswordOnLogin);
}

Expand All @@ -204,7 +191,6 @@ interface WithAccontEnabled {
* @param accountEnabled true if account is enabled, false otherwise
* @return the next stage of user update
*/
@Beta(SinceVersion.V1_2_0)
Update withAccountEnabled(boolean accountEnabled);
}

Expand All @@ -219,15 +205,13 @@ interface WithUsageLocation {
* @param usageLocation A two letter country code (ISO standard 3166).
* @return The next stage of user update
*/
@Beta(SinceVersion.V1_2_0)
Update withUsageLocation(CountryIsoCode usageLocation);
}
}

/**
* The template for a user update operation, containing all the settings that can be modified.
*/
@Beta(SinceVersion.V1_2_0)
interface Update extends
Appliable<ActiveDirectoryUser>,
UpdateStages.WithAccontEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
import com.microsoft.azure.management.graphrbac.implementation.UsersInner;
Expand All @@ -22,7 +21,6 @@
* Entry point to AD user management API.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta
public interface ActiveDirectoryUsers extends
SupportsGettingById<ActiveDirectoryUser>,
SupportsGettingByNameAsync<ActiveDirectoryUser>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

package com.microsoft.azure.management.graphrbac;

import com.microsoft.azure.management.apigeneration.Beta;
import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.graphrbac.implementation.KeyCredentialInner;
import com.microsoft.azure.management.resources.fluentcore.model.Attachable;
Expand All @@ -21,7 +19,6 @@
* An immutable client-side representation of an Azure AD credential.
*/
@Fluent(ContainerName = "/Microsoft.Azure.Management.Graph.RBAC.Fluent")
@Beta(SinceVersion.V1_1_0)
public interface CertificateCredential extends
Credential,
HasInner<KeyCredentialInner> {
Expand Down
Loading

0 comments on commit d8a4aaf

Please sign in to comment.