Skip to content

Commit

Permalink
Revert "adding vault integration code to fetch credentials"
Browse files Browse the repository at this point in the history
This reverts commit cc79476.
  • Loading branch information
namankhurpia committed May 7, 2023
1 parent cc79476 commit 5cc6eaa
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 55 deletions.
Binary file removed .DS_Store
Binary file not shown.
10 changes: 0 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,6 @@
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-config</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>4.0.2</version>
</dependency>

</dependencies>
<dependencyManagement>
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/com/rabbitMq/rabbitmqscheduler/DTO/Properties.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
package com.rabbitMq.rabbitmqscheduler;

import com.rabbitMq.rabbitmqscheduler.DTO.Properties;
import com.rabbitmq.client.Command;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;


@SpringBootApplication
@EnableEurekaClient
@EnableConfigurationProperties({Properties.class})
public class RabbitmqSchedulerApplication {
public class RabbitmqSchedulerApplication {

public static void main(String[] args) {
SpringApplication.run(RabbitmqSchedulerApplication.class, args);

}

}
11 changes: 4 additions & 7 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka.client.enabled=true
eureka.client.serviceUrl.defaultZone= http://${EUREKA_USER:admin}:${EUREKA_PASS:admin}@${EUREKA_URI:localhost:8090}/eureka
eureka.client.healthcheck.enabled=true
eureka.instance.metadata-map.startup= ${random.int}
cred.service.eureka.uri=http://EndpointCredentialService/v1/endpoint-cred
#cred.service.eureka.uri=http://localhost:8081/v1/endpoint-cred

gdrive.appname=OneDataShare-Prod
gdrive.client.id=${ODS_GDRIVE_CLIENT_ID}
Expand All @@ -15,14 +17,9 @@ cred.service.uri=http://localhost:8081/v1/endpoint-cred/
ods.rabbitmq.exchange=ods.exchange
ods.rabbitmq.queue=transferqueue
ods.rabbitmq.routingkey=ods.routing

spring.rabbitmq.addresses=${RMQ_ADDRESS}
spring.rabbitmq.port=${AMPQ_PORT:5672}

dropbox.identifier=${ODS_DROPBOX_IDENTIFIER:OneDataShare-DIDCLab}

#cred.service.eureka.uri=http://localhost:8081/v1/endpoint-cred
cred.service.eureka.uri=http://EndpointCredentialService/v1/endpoint-cred

spring.rabbitmq.username=${AMPQ_USER:guest}
spring.rabbitmq.password=${AMPQ_PWD:guest}

dropbox.identifier=${ODS_DROPBOX_IDENTIFIER:OneDataShare-DIDCLab}
16 changes: 0 additions & 16 deletions src/main/resources/bootstrap.yaml

This file was deleted.

0 comments on commit 5cc6eaa

Please sign in to comment.