Skip to content
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

Remove cas config #413

Merged
merged 1 commit into from
May 27, 2021
Merged

Remove cas config #413

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
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ services:
- MONGO_HOST=mongo
- IEXEC_IPFS_HOST=ipfs
- IEXEC_SMS_HOST=sms
- IEXEC_SCONE_CAS_HOST=iexec-cas
# - IEXEC_HUB_ADDRESS=${IEXEC_HUB_ADDRESS}
# - POOL_ADDRESS=${POOL_ADDRESS}
- IEXEC_RESULT_REPOSITORY_PROTOCOL=http
- IEXEC_RESULT_REPOSITORY_HOST=result-proxy
- IEXEC_RESULT_REPOSITORY_PORT=18089
- IEXEC_SMS_PORT=15000
- IEXEC_SCONE_CAS_HOST=cas
volumes:
- ./src/main/resources/wallet/encrypted-wallet_scheduler.json:/iexec/wallet/encrypted-wallet.json
ports:
Expand Down
52 changes: 0 additions & 52 deletions src/main/java/com/iexec/core/configuration/SconeCasConfiguration.java
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/main/java/com/iexec/core/worker/WorkerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public class WorkerController {
private final WorkerConfiguration workerConfiguration;
private final ResultRepositoryConfiguration resultRepoConfig;
private final SmsConfiguration smsConfiguration;
private final SconeCasConfiguration sconeCasConfiguration;

public WorkerController(WorkerService workerService,
ChainConfig chainConfig,
Expand All @@ -61,8 +60,7 @@ public WorkerController(WorkerService workerService,
ChallengeService challengeService,
WorkerConfiguration workerConfiguration,
ResultRepositoryConfiguration resultRepoConfig,
SmsConfiguration smsConfiguration,
SconeCasConfiguration sconeCasConfiguration) {
SmsConfiguration smsConfiguration) {
this.workerService = workerService;
this.chainConfig = chainConfig;
this.credentialsService = credentialsService;
Expand All @@ -71,7 +69,6 @@ public WorkerController(WorkerService workerService,
this.workerConfiguration = workerConfiguration;
this.resultRepoConfig = resultRepoConfig;
this.smsConfiguration = smsConfiguration;
this.sconeCasConfiguration = sconeCasConfiguration;
}

@PostMapping(path = "/workers/ping")
Expand Down Expand Up @@ -156,7 +153,6 @@ public ResponseEntity<PublicConfiguration> getPublicConfiguration() {
.schedulerPublicAddress(credentialsService.getCredentials().getAddress())
.resultRepositoryURL(resultRepoConfig.getResultRepositoryURL())
.smsURL(smsConfiguration.getSmsURL())
.sconeCasURL(sconeCasConfiguration.getURL())
.askForReplicatePeriod(workerConfiguration.getAskForReplicatePeriod())
.requiredWorkerVersion(workerConfiguration.getRequiredWorkerVersion())
.build();
Expand Down
5 changes: 0 additions & 5 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ sms:
host: ${IEXEC_SMS_HOST:localhost}
port: ${IEXEC_SMS_PORT:5000}

scone:
cas:
host: ${IEXEC_SCONE_CAS_HOST:localhost}
port: ${IEXEC_SCONE_CAS_PORT:18765}

management:
server:
port: ${IEXEC_CORE_MANAGEMENT_PORT:13001}
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/com/iexec/core/worker/WorkerControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.iexec.core.chain.ChainConfig;
import com.iexec.core.chain.CredentialsService;
import com.iexec.core.configuration.ResultRepositoryConfiguration;
import com.iexec.core.configuration.SconeCasConfiguration;
import com.iexec.core.configuration.SmsConfiguration;
import com.iexec.core.configuration.WorkerConfiguration;
import com.iexec.core.security.ChallengeService;
Expand Down Expand Up @@ -55,8 +54,6 @@ public class WorkerControllerTests {
private ResultRepositoryConfiguration resultRepoConfig;
@Mock
private SmsConfiguration smsConfiguration;
@Mock
private SconeCasConfiguration sconeCasConfiguration;

@InjectMocks
private WorkerController workerController;
Expand Down