Skip to content

refactor(retrofit2): refactor the code to align with the retrofit2 upgrade of fiat-api #4809

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
wants to merge 1 commit into from
Closed

refactor(retrofit2): refactor the code to align with the retrofit2 upgrade of fiat-api #4809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions orca-web/orca-web.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ dependencies {
testImplementation("io.strikt:strikt-core")
testImplementation("io.mockk:mockk")
testImplementation("org.apache.groovy:groovy-json")
testImplementation ("com.squareup.retrofit2:retrofit-mock")
}

test {
Expand Down
3 changes: 2 additions & 1 deletion orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.netflix.spinnaker.fiat.shared.FiatService
import com.netflix.spinnaker.fiat.shared.FiatStatus
import com.netflix.spinnaker.kork.exceptions.ConfigurationException
import com.netflix.spinnaker.kork.exceptions.SpinnakerException
import com.netflix.spinnaker.kork.retrofit.Retrofit2SyncCall
import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException
import com.netflix.spinnaker.orca.api.pipeline.models.PipelineExecution
Expand Down Expand Up @@ -390,7 +391,7 @@ class OperationsController {
def userPermissionRoles = [new Role.View(new Role("anonymous"))] as Set<Role.View>
try {
String user = AuthenticatedRequest.getSpinnakerUser().orElse("anonymous")
UserPermission.View userPermission = fiatService.getUserPermission(user)
UserPermission.View userPermission = Retrofit2SyncCall.execute(fiatService.getUserPermission(user))
userPermissionRoles = userPermission.roles
} catch (Exception e) {
log.error("Unable to determine roles for current user, falling back to 'anonymous'", e)
Expand Down
3 changes: 2 additions & 1 deletion ...eb/src/test/groovy/com/netflix/spinnaker/orca/controllers/OperationsControllerSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import org.springframework.http.HttpHeaders
import org.springframework.http.HttpMethod
import org.springframework.http.MediaType
import org.springframework.test.web.servlet.setup.MockMvcBuilders
import retrofit2.mock.Calls
import rx.Observable
import spock.lang.Specification
import spock.lang.Subject
Expand Down Expand Up @@ -682,7 +683,7 @@ class OperationsControllerSpec extends Specification {
def role = new Role().setName("some-role")
def permission = new UserPermission().setId("foo").setAccounts([account] as Set).setRoles([role] as Set)

fiatService.getUserPermission(*_) >> permission.getView()
fiatService.getUserPermission(*_) >> Calls.response(permission.getView())

when:
def preconfiguredWebhooks = controller.preconfiguredWebhooks()
Expand Down
1 change: 1 addition & 0 deletions orca-webhook/orca-webhook.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies {
implementation(project(":orca-core"))
implementation(project(":orca-api"))
implementation("io.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-retrofit")
implementation("io.spinnaker.kork:kork-web")
implementation("org.springframework.boot:spring-boot-autoconfigure")
compileOnly("org.projectlombok:lombok")
Expand Down
3 changes: 2 additions & 1 deletion .../src/main/java/com/netflix/spinnaker/orca/webhook/pipeline/PreconfiguredWebhookStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.netflix.spinnaker.fiat.shared.FiatService;
import com.netflix.spinnaker.kork.exceptions.SystemException;
import com.netflix.spinnaker.kork.retrofit.Retrofit2SyncCall;
import com.netflix.spinnaker.orca.api.pipeline.graph.TaskNode;
import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution;
import com.netflix.spinnaker.orca.webhook.config.WebhookProperties.PreconfiguredWebhook;
Expand Down Expand Up @@ -70,7 +71,7 @@ public void taskGraph(@Nonnull StageExecution stage, @Nonnull TaskNode.Builder b
var permissions = preconfiguredWebhook.getPermissions();
if (permissions != null && !permissions.isEmpty()) {
String user = AuthenticatedRequest.getSpinnakerUser().orElse("anonymous");
var userPermission = fiatService.getUserPermission(user);
var userPermission = Retrofit2SyncCall.execute(fiatService.getUserPermission(user));

boolean isAllowed = preconfiguredWebhook.isAllowed("WRITE", userPermission.getRoles());
if (!isAllowed) {
Expand Down
Loading