Skip to content

Commit

Permalink
change prefix of database config to db
Browse files Browse the repository at this point in the history
- for consistency/makes this play nicely with Spring's auto-inferring of env vars
  • Loading branch information
celloman committed Mar 31, 2022
1 parent 9686ec7 commit 329d4d4
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data class ProvenanceProperties(

@Validated
@ConstructorBinding
@ConfigurationProperties(prefix = "database")
@ConfigurationProperties(prefix = "db")
data class DatabaseProperties(
val type: String,
val name: String,
Expand Down
16 changes: 8 additions & 8 deletions server/src/main/resources/application-container.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ provenance.chain_id=${PROVENANCE_CHAIN_ID}
provenance.channel_uri=${PROVENANCE_CHANNEL_URI}

# Database
database.type=${DATABASE_TYPE}
database.name=${DATABASE_NAME}
database.username=${DATABASE_USERNAME}
database.password=${DATABASE_PASSWORD}
database.host=${DATABASE_HOST}
database.port=${DATABASE_PORT}
database.schema=${DATABASE_SCHEMA}
database.connectionPoolSize=${DATABASE_CONNECTION_POOL_SIZE}
db.type=${DB_TYPE}
db.name=${DB_NAME}
db.username=${DB_USERNAME}
db.password=${DB_PASSWORD}
db.host=${DB_HOST}
db.port=${DB_PORT}
db.schema=${DB_SCHEMA}
db.connectionPoolSize=${DB_CONNECTION_POOL_SIZE}

# Contract
contract.address=${CONTRACT_ADDRESS}
16 changes: 8 additions & 8 deletions server/src/main/resources/application-development.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ provenance.chain_id=chain-local
provenance.channel_uri=http://localhost:9090

# Database
database.type=memory
database.name=object-store-gateway
database.username=user
database.password=pass
database.host=memory
database.port=""
database.schema=object-store-gateway
database.connectionPoolSize=1
db.type=memory
db.name=object-store-gateway
db.username=user
db.password=pass
db.host=memory
db.port=""
db.schema=object-store-gateway
db.connectionPoolSize=1

# Contract
contract.address=${CONTRACT_ADDRESS}
16 changes: 8 additions & 8 deletions server/src/main/resources/application-testnet_local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ provenance.chain_id=chain-local
provenance.channel_uri=grpcs://grpc.test.provenance.io:443

# Database
database.type=memory
database.name=object-store-gateway
database.username=user
database.password=pass
database.host=memory
database.port=""
database.schema=object-store-gateway
database.connectionPoolSize=1
db.type=memory
db.name=object-store-gateway
db.username=user
db.password=pass
db.host=memory
db.port=""
db.schema=object-store-gateway
db.connectionPoolSize=1

# Contract
contract.address=${CONTRACT_ADDRESS:tp1rr5lgmc8felstg9elq27wwdwk6thxz59899yjckel5ql2q5t88dsdkt9v9}
16 changes: 8 additions & 8 deletions server/src/test/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ provenance.chain_id=chain-local
provenance.channel_uri=http://localhost:9090

# Database
database.type=memory
database.name=object-store-gateway
database.username=user
database.password=pass
database.host=memory
database.port=""
database.schema=object-store-gateway
database.connectionPoolSize=1
db.type=memory
db.name=object-store-gateway
db.username=user
db.password=pass
db.host=memory
db.port=""
db.schema=object-store-gateway
db.connectionPoolSize=1

# Contract
contract.address=tpFakeContract

0 comments on commit 329d4d4

Please sign in to comment.