Skip to content

Commit

Permalink
fix(config): Use kork-config to set the standard properties for spinn…
Browse files Browse the repository at this point in the history
…aker services
  • Loading branch information
jasonmcintosh committed Jun 28, 2024
1 parent b95a7ed commit 49ce8dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,12 @@ import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import
import org.springframework.scheduling.annotation.EnableAsync
import org.springframework.scheduling.annotation.EnableScheduling
import com.netflix.spinnaker.kork.boot.DefaultPropertiesBuilder

object MainDefaults {
val PROPS = mapOf(
"netflix.environment" to "test",
"netflix.account" to "\${netflix.environment}",
"netflix.stack" to "test",
"spring.config.location" to "\${user.home}/.spinnaker/",
"spring.application.name" to "swabbie",
"spring.config.name" to "spinnaker,\${spring.application.name}",
"spring.profiles.active" to "\${netflix.environment},local"
)
val PROPS = DefaultPropertiesBuilder().property("spring.application.name", "swabbie")
.property("spring.mvc.pathmatch.matching-strategy","ANT_PATH_MATCHER")
.build()
}

@Configuration
Expand Down
2 changes: 2 additions & 0 deletions swabbie-web/swabbie-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-data-rest"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-config"

implementation project(":swabbie-aws")
implementation project(":swabbie-clouddriver")
implementation project(":swabbie-core")
Expand Down

0 comments on commit 49ce8dc

Please sign in to comment.