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.

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

PO-45: Rename backend service #29

Merged
merged 2 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG APP_INSIGHTS_AGENT_VERSION=3.4.18
FROM hmctspublic.azurecr.io/base/java:21-distroless

COPY lib/applicationinsights.json /opt/app/
COPY build/libs/opal-account-enquiry.jar /opt/app/
COPY build/libs/opal-fines-service.jar /opt/app/

EXPOSE 4550
CMD [ "opal-account-enquiry.jar" ]
CMD [ "opal-fines-service.jar" ]
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

def type = "java"
def product = "opal"
def component = "account-enquiry"
def component = "fines-service"

withPipeline(type, product, component) {
}
2 changes: 1 addition & 1 deletion Jenkinsfile_nightly
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ properties([

def type = "java"
def product = "opal"
def component = "account-enquiry"
def component = "fines-service"

withNightlyPipeline(type, product, component) {}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Opal Account Enquiry
# Opal Fine Service

## Getting Started

Expand Down Expand Up @@ -49,7 +49,7 @@ Create docker image:
docker-compose build
```

Run the distribution (created in `build/install/opal-account-enquiry` directory)
Run the distribution (created in `build/install/opal-fines-service` directory)
by executing the following command:

```bash
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ project.tasks['check'].dependsOn integration

sonarqube {
properties {
property "sonar.projectName", "HMCTS :: opal-account-enquiry"
property "sonar.projectKey", "uk.gov.hmcts:opal-account-enquiry"
property "sonar.projectName", "HMCTS :: opal-fines-service"
property "sonar.projectKey", "uk.gov.hmcts:opal-fines-service"
}
}

Expand Down Expand Up @@ -182,7 +182,7 @@ dependencies {
mainClassName = 'uk.gov.hmcts.opal.Application'

bootJar {
archiveFileName = "opal-account-enquiry.jar"
archiveFileName = "opal-fines-service.jar"

manifest {
attributes('Implementation-Version': project.version.toString())
Expand Down
21 changes: 0 additions & 21 deletions charts/opal-account-enquiry/values.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: "1.0"
description: A Helm chart for opal-account-enquiry app
name: opal-account-enquiry
home: https://github.com/hmcts/opal-account-enquiry
description: A Helm chart for opal-fines-service app
name: opal-fines-service
home: https://github.com/hmcts/opal-fines-service
version: 0.0.16
maintainers:
- name: HMCTS Opal Team
Expand Down
21 changes: 21 additions & 0 deletions charts/opal-fines-service/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
java:
applicationPort: 4550
image: 'sdshmctspublic.azurecr.io/opal/fines-service:latest'
ingressHost: opal-fines-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
keyVaults:
opal:
secrets:
- name: app-insights-connection-string
alias: app-insights-connection-string
- name: fines-service-POSTGRES-HOST
alias: OPAL_FINES_DB_HOST
- name: fines-service-POSTGRES-PASS
alias: OPAL_FINES_DB_PASSWORD
- name: fines-service-POSTGRES-PORT
alias: OPAL_FINES_DB_PORT
- name: fines-service-POSTGRES-USER
alias: OPAL_FINES_DB_USERNAME
- name: fines-service-POSTGRES-DATABASE
alias: OPAL_FINES_DB_NAME
environment:
RUN_DB_MIGRATION_ON_STARTUP: true
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.1'

services:
opal-account-enquiry:
opal-fines-service:
build:
context: .
args:
Expand Down
2 changes: 1 addition & 1 deletion lib/applicationinsights.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"connectionString": "${file:/mnt/secrets/opal/app-insights-connection-string}",
"role": {
"name": "opal-account-enquiry"
"name": "opal-fines-service"
},
"preview": {
"sampling": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ public class OpenAPIConfiguration {
@Bean
public OpenAPI openAPI() {
return new OpenAPI()
.info(new Info().title("Opal Account Enquiry")
.description("Opal Account Enquiry")
.info(new Info().title("Opal Fines Service")
.description("Opal Fines Service")
.version("v0.0.1")
.license(new License().name("MIT").url("https://opensource.org/licenses/MIT")))
.externalDocs(new ExternalDocumentation()
.description("README")
.url("https://github.com/hmcts/opal-account-enquiry"));
.url("https://github.com/hmcts/opal-fines-service"));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public class RootController {
*/
@GetMapping("/")
public ResponseEntity<String> welcome() {
return ok("Welcome to opal-account-enquiry");
return ok("Welcome to opal-fines-service");
}
}
2 changes: 1 addition & 1 deletion src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spring:
config:
import: "optional:configtree:/mnt/secrets/opal/"
application:
name: Opal Account Enquiry
name: Opal Fines Service
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://${OPAL_FINES_DB_HOST:localhost}:${OPAL_FINES_DB_PORT:5432}/${OPAL_FINES_DB_NAME:opal-fines-db}${OPAL_FINES_DB_OPTIONS:}
Expand Down