Skip to content

Fix/azure rest url properties #53

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

Merged
jordivx merged 2 commits into from
May 15, 2026
Merged

Fix/azure rest url properties #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42e5a5
Fix azure token rest url references
jordivx May 15, 2026
c371578
Rename property to be less redundant
jordivx May 15, 2026
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
4 changes: 2 additions & 2 deletions ...ava/org/opendevstack/component_provisioner/config/ApplicationPropertiesConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public ExternalServiceProps projectsInfoServiceServiceProps() {
}

@Bean("azureAdTokenServiceProps")
@ConfigurationProperties(prefix = "component-provisioner.azure.token.url")
@ConfigurationProperties(prefix = "component-provisioner.azure.token")
public AzureAdTokenServiceProps azureAdTokenServiceProps() {
return AzureAdTokenServiceProps.builder().build();
}
Expand Down Expand Up @@ -123,7 +123,7 @@ public static class OdsApiServerServiceProps {
@Builder // useful for unit testing
@Data
public static class AzureAdTokenServiceProps {
private String tokenRestUrl;
private String url;
}

@Builder // useful for unit testing
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/opendevstack/component_provisioner/server/services/AzureAdTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public String getAccessToken(String clientId, String clientSecret, String scope)
HttpEntity<MultiValueMap<String, String>> request =
new HttpEntity<>(body, headers);

var tokenRestUrl = azureAdTokenServiceProps.getTokenRestUrl();
var tokenRestUrl = azureAdTokenServiceProps.getUrl();

ResponseEntity<AzureTokenResponse> response =
restTemplate.postForEntity(
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/opendevstack/component_provisioner/server/services/AzureAdTokenServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void getAccessToken_shouldReturnToken_whenResponseIsSuccessful() {

ResponseEntity<AzureTokenResponse> responseEntity = new ResponseEntity<>(mockResponse, HttpStatus.OK);

when(azureAdTokenServiceProps.getTokenRestUrl()).thenReturn("https://login.microsoftonline.com/example-tenant/oauth2/v2.0/token");
when(azureAdTokenServiceProps.getUrl()).thenReturn("https://login.microsoftonline.com/example-tenant/oauth2/v2.0/token");

when(restTemplate.postForEntity(anyString(), any(), eq(AzureTokenResponse.class)))
.thenReturn(responseEntity);
Expand Down
Loading