Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Configure the Graph RBAC API and allow mocking service endpoints
- Loading branch information
Showing
11 changed files
with
302 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,50 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jclouds.azurecompute.arm.features; | ||
|
||
import javax.ws.rs.Consumes; | ||
import javax.ws.rs.GET; | ||
import javax.ws.rs.Path; | ||
import javax.ws.rs.core.MediaType; | ||
|
||
import org.jclouds.azurecompute.arm.config.GraphRBAC; | ||
import org.jclouds.azurecompute.arm.config.OAuthResource; | ||
import org.jclouds.azurecompute.arm.domain.ServicePrincipal; | ||
import org.jclouds.azurecompute.arm.filters.ApiVersionFilter; | ||
import org.jclouds.oauth.v2.filters.OAuthFilter; | ||
import org.jclouds.rest.annotations.Endpoint; | ||
import org.jclouds.rest.annotations.OnlyElement; | ||
import org.jclouds.rest.annotations.QueryParams; | ||
import org.jclouds.rest.annotations.RequestFilters; | ||
import org.jclouds.rest.annotations.SelectJson; | ||
|
||
import com.google.inject.name.Named; | ||
|
||
@RequestFilters({ OAuthFilter.class, ApiVersionFilter.class }) | ||
@Consumes(MediaType.APPLICATION_JSON) | ||
@Endpoint(GraphRBAC.class) | ||
@OAuthResource(GraphRBAC.ENDPOINT) | ||
public interface GraphRBACApi { | ||
|
||
@Named("servicePrincipal:get") | ||
@GET | ||
@Path("/servicePrincipals") | ||
@QueryParams(keys = "$filter", values = "appId eq '{jclouds.identity}'") | ||
@SelectJson("value") | ||
@OnlyElement | ||
ServicePrincipal getCurrentServicePrincipal(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,50 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jclouds.azurecompute.arm.config; | ||
|
||
import static org.testng.Assert.assertEquals; | ||
import static org.testng.Assert.fail; | ||
|
||
import org.testng.annotations.Test; | ||
|
||
@Test(groups = "unit", testName = "ParseTenantIdTest") | ||
public class ParseTenantIdTest { | ||
|
||
@Test | ||
public void testParseTenantId() { | ||
AzureComputeHttpApiModule module = new AzureComputeHttpApiModule(); | ||
|
||
assertEquals(module.provideTenant("https://login.microsoftonline.com/tenantId/oauth2/token"), "tenantId"); | ||
assertEquals(module.provideTenant("https://login.microsoft.com/tenant2/oauth2/token"), "tenant2"); | ||
|
||
assertInvalid(module, "https://login.microsoftonline.com/a/b/c/oauth2/token"); | ||
assertInvalid(module, "https://login.microsoft.com/a/b/c/oauth2/token"); | ||
assertInvalid(module, "https://login.microsoftonline.com//oauth2/token"); | ||
assertInvalid(module, "https://login.microsoft.com//oauth2/token"); | ||
assertInvalid(module, "https://login.microsoftabc.com/tenant/oauth2/token"); | ||
} | ||
|
||
private static void assertInvalid(AzureComputeHttpApiModule module, String endpoint) { | ||
try { | ||
module.provideTenant(endpoint); | ||
fail("Expected an IllegalArgumentException for endpoint: " + endpoint); | ||
} catch (IllegalArgumentException ex) { | ||
assertEquals(ex.getMessage(), "Could not parse tenantId from: " + endpoint); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,39 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.jclouds.azurecompute.arm.features; | ||
|
||
import static org.testng.Assert.assertEquals; | ||
|
||
import java.io.IOException; | ||
|
||
import org.jclouds.azurecompute.arm.domain.ServicePrincipal; | ||
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiMockTest; | ||
import org.testng.annotations.Test; | ||
|
||
@Test(groups = "unit", testName = "GraphRBACApiMockTest", singleThreaded = true) | ||
public class GraphRBACApiMockTest extends BaseAzureComputeApiMockTest { | ||
|
||
public void testGetCurrentServicePrincipal() throws IOException, InterruptedException { | ||
server.enqueue(jsonResponse("/serviceprincipals.json")); | ||
|
||
ServicePrincipal sp = api.getGraphRBACApi().getCurrentServicePrincipal(); | ||
|
||
assertEquals(sp.appId(), "applicationId"); | ||
assertSent(server, "GET", "/graphrbac/tenant-id/servicePrincipals?$filter=appId%20eq%20%27mock%27&api-version=1.6"); | ||
} | ||
|
||
} |
Oops, something went wrong.