Change to CLI app

Author: rwinch

build.gradle.kts

@@ -33,33 +33,26 @@ tasks.withType<KotlinCompile> {
 	}
 }
 
+tasks.withType<Test> {
+	useJUnitPlatform()
+}
+
 repositories {
 	mavenCentral()
 }
 
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-security")
-	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
-	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
-	implementation("org.springframework.boot:spring-boot-devtools")
-	implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
-	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-webflux")
 	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 
-	implementation("org.webjars:webjars-locator-core")
-	implementation("org.webjars:bootstrap:3.3.6")
-	implementation("org.webjars:jquery:1.11.3")
+	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
 	testImplementation("com.squareup.okhttp3:mockwebserver")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
-	testImplementation("org.springframework.security:spring-security-test")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
 	testImplementation("org.skyscreamer:jsonassert")
-	implementation("org.seleniumhq.selenium:htmlunit-driver")
 }

src/main/kotlin/io/spring/github/BackportBotApplication.kt

@@ -19,41 +19,19 @@ package io.spring.github
 import io.spring.github.api.WebClientGitHubApi
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
-import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
-import org.springframework.core.Ordered
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
-import org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizedClientRepository
-import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository
-import org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction
-import org.springframework.web.filter.ForwardedHeaderFilter
 import org.springframework.web.reactive.function.client.WebClient
 
 @SpringBootApplication
-class BackportBotApplication(val personalAccessToken: GitHubPersonalAccessToken) {
-
-    @Bean
-    fun authorizedClientRepository() : OAuth2AuthorizedClientRepository {
-        return HttpSessionOAuth2AuthorizedClientRepository()
-    }
-
+class BackportBotApplication {
     @Bean
-    fun githubApi(clientRegistrationRepository: ClientRegistrationRepository,
-                  authorizedClientRepository: OAuth2AuthorizedClientRepository) : WebClientGitHubApi {
+    internal fun webClientGitHubApi(gitHubAccessToken: GitHubAccessToken) : WebClientGitHubApi {
         val webClient = WebClient.builder()
-            .defaultHeaders { h -> h.setBearerAuth(personalAccessToken.personalAccessToken) }
-            .apply(ServletOAuth2AuthorizedClientExchangeFilterFunction(clientRegistrationRepository, authorizedClientRepository).oauth2Configuration())
-            .build()
-
+                .defaultHeaders { headers -> headers.setBearerAuth(gitHubAccessToken.accessToken) }
+                .build()
         return WebClientGitHubApi(webClient)
     }
 
-    @Bean
-    fun forwardedHeaderFilter() : FilterRegistrationBean<ForwardedHeaderFilter> {
-        val result = FilterRegistrationBean(ForwardedHeaderFilter())
-        result.order = Ordered.HIGHEST_PRECEDENCE
-        return result
-    }
 }
 
 fun main(args: Array<String>) {

src/main/kotlin/io/spring/github/BackportBotCommandLineRunner.kt

@@ -0,0 +1,42 @@
+package io.spring.github
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.spring.github.event.GitHubHooksController
+import io.spring.github.event.IssueEvent
+import io.spring.github.event.PullRequestEvent
+import io.spring.github.event.PushEvent
+import org.springframework.boot.CommandLineRunner
+import org.springframework.stereotype.Component
+
+@Component
+class BackportBotCommandLineRunner(val controller : GitHubHooksController, val objectMapper : ObjectMapper) : CommandLineRunner {
+    var created : GitHubHooksController.Result = GitHubHooksController.Result.UNDEFINED
+    override fun run(vararg args: String?) {
+        if (args.size < 2) {
+            usage(args);
+        }
+        val command = args[0]
+        val json = args[1]
+        when(command) {
+            "--pull-request" -> {
+                val pullRequest = this.objectMapper.readValue(json, PullRequestEvent::class.java)
+                this.created = controller.githubPullRequestEvent(pullRequest)
+            }
+            "--issues" -> {
+                val issues = this.objectMapper.readValue(json, IssueEvent::class.java)
+                this.created = controller.githubEvent(issues)
+            }
+            "--push" -> {
+                val push = this.objectMapper.readValue(json, PushEvent::class.java)
+                this.created = controller.githubEventPush(push)
+            }
+            else -> {
+                usage(args)
+            }
+        }
+    }
+
+    private fun usage(args: Array<out String?>) {
+        throw java.lang.IllegalArgumentException("Invalid usage. Got " + args)
+    }
+}

src/main/kotlin/io/spring/github/ContentCachingFilter.kt

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.spring.github
 
 import org.springframework.boot.context.properties.ConfigurationProperties
@@ -24,6 +23,6 @@ import org.springframework.context.annotation.Configuration
  */
 @Configuration
 @ConfigurationProperties(prefix = "github")
-class GitHubWebHookSecret {
-    lateinit var webhookSecret: String
+internal class GitHubAccessToken {
+    lateinit var accessToken : String
 }

src/main/kotlin/io/spring/github/GitHubWebHookSecret.kt renamed to src/main/kotlin/io/spring/github/GitHubAccessToken.kt

@@ -69,8 +69,6 @@ interface GitHubApi {
      */
     fun updateLabels(issueRef : IssueRef, labels: List<String>): Mono<Void>
 
-    fun saveHook(saveHook: SaveHook): Mono<Void>
-
     /**
      * Finds all the labels for a Repository
      */