Merge branch 'master' into nais-deploy

statisticsnorway · Dec 4, 2024 · 3d5d3bc · 3d5d3bc
2 parents 5b40d46 + e0d4e85
commit 3d5d3bc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build-deploy-app.yml b/.github/workflows/build-deploy-app.yml
@@ -2,8 +2,12 @@ on:
   release:
     types: [ published ]
   pull_request: ## ONLY FOR TESTING, SHOULD BE REMOVED AFTER DEPLOY PR IS MERGED
+<<<<<<< HEAD
     branches: 
       - master
+=======
+    branches: [nais-deploy]
+>>>>>>> master
   push:
     branches:
       - master

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 FROM azul/zulu-openjdk:21
 RUN apt-get -qq update && apt-get -y dist-upgrade && apt-get -y --no-install-recommends install curl
-COPY target/dapla-dlp-pseudo-service-*.jar dapla-dlp-pseudo-service.jar
+COPY target/pseudo-service-*.jar pseudo-service.jar
 COPY src/main/resources/logback*.xml /conf/
 COPY conf/bootstrap.yml /conf/
 COPY conf/application.yml /conf/
 COPY conf/application-sid-client.yml /conf/
 EXPOSE 10210
-CMD ["java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dcom.sun.management.jmxremote", "-Dmicronaut.bootstrap.context=true", "-Xmx8g", "-jar", "dapla-dlp-pseudo-service.jar"]
+CMD ["java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Dcom.sun.management.jmxremote", "-Dmicronaut.bootstrap.context=true", "-Xmx8g", "-jar", "pseudo-service.jar"]
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ build-mvn: ## Build project and install to you local maven repo
 
 .PHONY: build-docker
 build-docker: ## Build dev docker image
-	docker build -t dapla-dlp-pseudo-service:dev -f Dockerfile .
+	docker build -t pseudo-service:dev -f Dockerfile .
 
 .PHONY: init-local-config
 init-local-config: ## Initialize the private folder to hold your local offline untracked configuration
@@ -28,7 +28,7 @@ validate-local-config: ## Validate and echo local app config
 
 .PHONY: run-local
 run-local: validate-local-config
-	java ${JAVA_OPTS} --enable-preview -Dmicronaut.config.files=conf/application-local.yml  -Dmicronaut.environments=local,local-sid -jar target/dapla-dlp-pseudo-service-*-SNAPSHOT.jar
+	java ${JAVA_OPTS} --enable-preview -Dmicronaut.config.files=conf/application-local.yml  -Dmicronaut.environments=local,local-sid -jar target/pseudo-service-*-SNAPSHOT.jar
 
 .PHONY: release-dryrun
 release-dryrun: ## Simulate a release in order to detect any issues

diff --git a/SECURITY.md b/SECURITY.md
@@ -9,4 +9,4 @@ the security and privacy of all our users.
 ## Reporting a Vulnerability
 
 If you believe you have found a security vulnerability in any of SSB's GitHub
-repositories, please report it to us using the [Github Private vulnerability reporting tool](https://github.com/statisticsnorway/dapla-dlp-pseudo-service/security/advisories).
+repositories, please report it to us using the [Github Private vulnerability reporting tool](https://github.com/statisticsnorway/pseudo-service/security/advisories).
diff --git a/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml b/conf/idea/runConfigurations/pseudo-service-local-gcp.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="pseudo-service-local-gcp" type="MicronautRunConfigurationType" factoryName="Micronaut">
-    <module name="dapla-dlp-pseudo-service" />
+    <module name="pseudo-service" />
     <option name="alternativeJrePath" />
     <option name="alternativeJrePathEnabled" value="false" />
     <option name="includeProvidedScope" value="true" />

diff --git a/conf/idea/runConfigurations/pseudo-service-local.run.xml b/conf/idea/runConfigurations/pseudo-service-local.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="pseudo-service-local" type="MicronautRunConfigurationType" factoryName="Micronaut">
-    <module name="dapla-dlp-pseudo-service" />
+    <module name="pseudo-service" />
     <option name="alternativeJrePath" />
     <option name="alternativeJrePathEnabled" value="false" />
     <option name="includeProvidedScope" value="true" />

diff --git a/conf/idea/runConfigurations/pseudo-service-remote-debug.run.xml b/conf/idea/runConfigurations/pseudo-service-remote-debug.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="pseudo-service-remote-debug" type="Remote">
-    <module name="dapla-dlp-pseudo-service" />
+    <module name="pseudo-service" />
     <option name="USE_SOCKET_TRANSPORT" value="true" />
     <option name="SERVER_MODE" value="false" />
     <option name="SHMEM_ADDRESS" />

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>no.ssb.dapla.dlp.pseudo</groupId>
-  <artifactId>dapla-dlp-pseudo-service</artifactId>
+  <artifactId>pseudo-service</artifactId>
   <version>3.1.11-SNAPSHOT</version>
   <name>pseudo-service</name>
 
@@ -19,7 +19,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <dapla-artifact-registry.url>artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-pseudo-maven</dapla-artifact-registry.url>
-    <github.repository>statisticsnorway/dapla-dlp-pseudo-service</github.repository>
+    <github.repository>statisticsnorway/pseudo-service</github.repository>
     <exec.mainClass>no.ssb.dlp.pseudo.service.Application</exec.mainClass>
     <dapla-datadoc-model.version>1.2</dapla-datadoc-model.version>