Skip to content

1.1.5.5 pms1 #369

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.

Sign up for GitHub

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

Open
nagendra0721 wants to merge 8 commits into
base: 1.1.5.5
Choose a base branch
from
Open

1.1.5.5 pms1 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f0b576
MOSIP-40926: push_trigger.yml and test case update
nagendra0721 Apr 8, 2025
7e0b9c0
MOSIP-40926: push_trigger.yml
nagendra0721 Apr 8, 2025
f7f8342
MOSIP-40926: docker-file change
nagendra0721 Apr 8, 2025
0238bfd
MOSIP-40926: docker-file change
nagendra0721 Apr 8, 2025
94eff0f
MOSIP-40926: docker-file change
nagendra0721 Apr 8, 2025
ebabc0b
MOSIP-40926: pom change
nagendra0721 Apr 8, 2025
8569acc
MOSIP-40926: docker-file change
nagendra0721 Apr 8, 2025
5e55ce4
MOSIP-40926: upload partner certificate bug fix
nagendra0721 Apr 16, 2025
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
14 changes: 7 additions & 7 deletions .github/workflows/push_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg

- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -53,7 +53,7 @@ jobs:
run: find -name '*.jar' -executable -type f -exec zip release.zip {} +

- name: Upload the springboot jars
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: release
path: ./release.zip
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg

- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -136,8 +136,8 @@ jobs:
SERVICE_LOCATION: kernel/kernel-keymanager-service

steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v1
- uses: actions/checkout@v3
- uses: actions/download-artifact@v4
with:
name: release
path: ./
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: release
path: ./
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
sudo apt-get --yes install gnupg2
gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
- uses: actions/cache@v1
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .../java/io/mosip/kernel/keymanagerservice/repository/PartnerCertificateStoreRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ public interface PartnerCertificateStoreRepository extends JpaRepository<Partner
* @param partnerDomain Partner Domain
* @return PartnerCertificateStore
*/
PartnerCertificateStore findByCertThumbprintAndPartnerDomain(String certThumbprint, String partnerDomain);
List<PartnerCertificateStore> findByCertThumbprintAndPartnerDomain(String certThumbprint, String partnerDomain);
}
4 changes: 2 additions & 2 deletions ...e/src/main/java/io/mosip/kernel/partnercertservice/helper/PartnerCertManagerDBHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public boolean isCertificateExist(String certThumbprint, String partnerDomain){
}

public boolean isPartnerCertificateExist(String certThumbprint, String partnerDomain){
PartnerCertificateStore partnerCertificate = partnerCertificateStoreRepository
List<PartnerCertificateStore> partnerCertificateList = partnerCertificateStoreRepository
.findByCertThumbprintAndPartnerDomain(certThumbprint, partnerDomain);
if (Objects.nonNull(partnerCertificate)) {
if (!partnerCertificateList.isEmpty()) {
return true;
}
return false;
Expand Down
4 changes: 2 additions & 2 deletions ...st/java/io/mosip/kernel/keymanagerservice/test/integration/KeymanagerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public void encryptWithMultipleAliasReferenceId() throws Exception {
ResponseWrapper<SignatureResponseDto> responseWrapper = objectMapper.readValue(
result.getResponse().getContentAsString(), new TypeReference<ResponseWrapper<SignatureResponseDto>>() {
});
assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMA-005"));
assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMS-002"));
}

@WithUserDetails("reg-processor")
Expand Down Expand Up @@ -366,7 +366,7 @@ public void encryptWithEmptyAliasReferenceId() throws Exception {
ResponseWrapper<SignatureResponseDto> responseWrapper = objectMapper.readValue(
result.getResponse().getContentAsString(), new TypeReference<ResponseWrapper<SignatureResponseDto>>() {
});
assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMA-005"));
assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMS-002"));
}

}
5 changes: 4 additions & 1 deletion kernel/keys-generator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ ADD configure_start.sh configure_start.sh

RUN chmod +x configure_start.sh

ADD target/keys-generator-*.jar keys-generator.jar
ADD ./target/*.jar /target/
RUN find /target -name '*.jar' -executable -type f "-print0" | xargs "-0" cp -t / \
&& rm -rf /target \
&& mv /*.jar ${work_dir}/keys-generator.jar

ENTRYPOINT [ "/configure_start.sh" ]

Expand Down
2 changes: 1 addition & 1 deletion kernel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<modules>
<module>kernel-keymanager-service</module>
<!-- <module>keys-generator</module> -->
<module>keys-generator</module>
</modules>


Expand Down