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

New module for backup_restore_api #238

Merged
merged 58 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
713e526
New module for backup_restore_api
sushantpatil1214 May 10, 2024
dbaf42e
Created gid all API
sushantpatil1214 May 10, 2024
211bdd8
Created gid all API
sushantpatil1214 May 10, 2024
f66d8d3
Created API forfetch golden record, Also added logic to creat json fi…
sushantpatil1214 May 13, 2024
7a54341
Automated python command
sushantpatil1214 May 13, 2024
67a33f9
Added separate script for backup_restore
sushantpatil1214 May 13, 2024
f3fef6c
added logic for back date time and folder structure
sushantpatil1214 May 15, 2024
7b89180
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 May 20, 2024
b9ee397
Removed unwanted code
sushantpatil1214 May 20, 2024
b0f8ac3
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 May 23, 2024
83d4394
Restore Script
sushantpatil1214 May 27, 2024
7215c76
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 May 31, 2024
221ea38
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 May 31, 2024
3a90c42
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 Jun 18, 2024
d907b07
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 Jun 20, 2024
907cb69
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 Jun 20, 2024
eb565bf
Fixed configuration issue in new backup-restore app
sushantpatil1214 Jun 21, 2024
177c03d
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 Jun 21, 2024
0d64bfd
updated controller routing logic when upload config is null
MatthewErispe Jun 21, 2024
cfcc40f
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 Jun 21, 2024
1295e17
draft commit with raw code for insert golden record
sushantpatil1214 Jun 25, 2024
c1cfba9
Added logic for restore Golden records with sourceId'd and Interaction
sushantpatil1214 Jul 8, 2024
2db6844
removed unused dependancy
sushantpatil1214 Jul 8, 2024
0416652
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 Jul 9, 2024
fc2e185
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 Jul 9, 2024
50d046e
Added bash script logic for restore records using python script
sushantpatil1214 Jul 9, 2024
b443b43
Merge branch 'CU-86bymxhug_Create-restore-endpoint-in-backup-api' of …
sushantpatil1214 Jul 9, 2024
039d700
Handeled AuxGID and AuxIID for old implimantations
sushantpatil1214 Jul 9, 2024
1ae62b6
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 Jul 10, 2024
0a2f7f0
Merge branch 'backup_restore_api_86bymxdnb' into CU-86bymxhug_Create-…
sushantpatil1214 Jul 10, 2024
c8d7bdd
Merge pull request #253 from jembi/CU-86bymxhug_Create-restore-endpoi…
MatthewErispe Jul 14, 2024
c88aa67
CU-86bzh9jxb - Update Restore to Set UIDs
MatthewErispe Jul 15, 2024
8bec83a
add backup restore api to docker stack high
MatthewErispe Jul 15, 2024
1e3ab2d
add data system config dir
MatthewErispe Jul 15, 2024
e2f56b9
add volume to bootstrapper
MatthewErispe Jul 15, 2024
b8f2d7b
fix volume config
MatthewErispe Jul 15, 2024
c6b9421
add scale config to high setting
MatthewErispe Jul 15, 2024
af6c8ba
add volume data-config
MatthewErispe Jul 15, 2024
530a092
add placement node config
MatthewErispe Jul 16, 2024
dfce8d4
add missing config volume
MatthewErispe Jul 16, 2024
c79b45c
add missing config_system volume
MatthewErispe Jul 16, 2024
4152ec7
Merge branch 'dev' into backup_restore_api_86bymxdnb
MatthewErispe Jul 16, 2024
1f75059
remove jsonFields request
MatthewErispe Jul 16, 2024
ca2148c
code cleanup and nitpick
MatthewErispe Jul 16, 2024
592f755
remove unused methods
MatthewErispe Jul 16, 2024
2c04a86
add validate and match topic to kafka config
MatthewErispe Jul 16, 2024
935cb03
Handled date format for Aux
sushantpatil1214 Jul 16, 2024
25caaf0
Handled date format for Aux
sushantpatil1214 Jul 16, 2024
75595fb
Handle exception during API call and updated logs
sushantpatil1214 Jul 16, 2024
d0cbcc5
Added API to retrieve expanded golden records for UID list and optimi…
sushantpatil1214 Jul 17, 2024
f47c02b
Moved old backup logic files in old folder
sushantpatil1214 Jul 17, 2024
3037ce9
resolved coderabbitai suggetions
sushantpatil1214 Jul 17, 2024
c739e0a
Merge branch 'dev' into backup_restore_api_86bymxdnb
sushantpatil1214 Jul 17, 2024
4a8090d
Refactored backup and restore functionality for Dgraph and Postgres i…
sushantpatil1214 Jul 17, 2024
fcbbb89
fix code rabbit comments
sushantpatil1214 Jul 17, 2024
6e34d74
fix code rabbit comments
sushantpatil1214 Jul 17, 2024
ccb4714
Removed logic of Auxgid and AuxIid
sushantpatil1214 Jul 17, 2024
462833f
CU-86bzmec77 - Remove AuxIID AuxGID
MatthewErispe Jul 17, 2024
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
116 changes: 116 additions & 0 deletions JeMPI_Apps/JeMPI_BackupRestoreAPI/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
### Java template
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### Maven template
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
.mvn/wrapper/maven-wrapper.jar

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# SonarLint
.idea/sonarlint

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

# Ignore config-api.json, should be copied from JeMPI_Apps/JeMPI_Configuration on build
config-api.json
12 changes: 12 additions & 0 deletions JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -e
set -u

source $PROJECT_DEVOPS_DIR/conf/images/conf-app-images.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tip

Codebase Verification

The PROJECT_DEVOPS_DIR environment variable is not set correctly. Please ensure that this variable is set and points to a valid directory before running the script. Additionally, consider quoting the variable to prevent globbing and word splitting.

  • Ensure PROJECT_DEVOPS_DIR is set in your environment.
  • Verify that it points to a valid directory.
  • Update the script to quote the variable: source "$PROJECT_DEVOPS_DIR/conf/images/conf-app-images.sh"
Analysis chain

Ensure the path variable $PROJECT_DEVOPS_DIR is correctly set and consider quoting it to prevent globbing and word splitting.

Scripts Executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Verify that PROJECT_DEVOPS_DIR is set and points to a valid directory
if [ -z "$PROJECT_DEVOPS_DIR" ] || [ ! -d "$PROJECT_DEVOPS_DIR" ]; then
  echo "PROJECT_DEVOPS_DIR is not set correctly."
else
  echo "PROJECT_DEVOPS_DIR is set to $PROJECT_DEVOPS_DIR."
fi

Length of output: 106

source ../build-check-jdk.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tip

Codebase Verification

Ensure the relative path to build-check-jdk.sh is correct and consider quoting it to prevent potential issues. The correct path should be source ../../build-check-jdk.sh.

  • JeMPI_Apps/JeMPI_BackupRestoreAPI/build.sh: Update the path to build-check-jdk.sh.
Analysis chain

Ensure the relative path to build-check-jdk.sh is correct and consider quoting it to prevent potential issues.

Scripts Executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Verify that build-check-jdk.sh can be sourced correctly
if [ ! -f "../build-check-jdk.sh" ]; then
  echo "build-check-jdk.sh does not exist in the expected directory."
else
  echo "build-check-jdk.sh exists and can be sourced."
fi

Length of output: 169



Script:

#!/bin/bash
# Search for build-check-jdk.sh in the repository
fd build-check-jdk.sh

Length of output: 53


JAR_FILE=${BACKUP_RESTORE_API_JAR}
APP_IMAGE=${BACKUP_RESTORE_API_IMAGE}
APP=backup-restore-api
source ../build-app-image.sh
34 changes: 34 additions & 0 deletions JeMPI_Apps/JeMPI_BackupRestoreAPI/checkstyle/suppression.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>

<suppress
checks="(JavadocMethod|JavadocVariable|JavadocStyle|JavadocPackage|JavadocType)"
files="().java"
/>

<suppress
checks="(LineLength|AvoidStarImport|MagicNumber)"
files="().java"
/>

<suppress
checks="(VisibilityModifier|HiddenField)"
files="().java"
/>

<suppress
checks="(DesignForExtension)"
files="User.java"
/>

<suppress
checks="(ParameterNumber)"
files="(PsqlQueries|BackEnd|Routes).java"
/>

</suppressions>
3 changes: 3 additions & 0 deletions JeMPI_Apps/JeMPI_BackupRestoreAPI/docker/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!.gitignore
!Dockerfile
13 changes: 13 additions & 0 deletions JeMPI_Apps/JeMPI_BackupRestoreAPI/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ARG JAVA_VERSION

FROM eclipse-temurin:${JAVA_VERSION}-jre

ADD JeMPI_BackupRestoreAPI-1.0-SNAPSHOT-spring-boot.jar /app/app.jar

RUN printf "#!/bin/bash\n\
cd /app\n\
java -server -XX:MaxRAMPercentage=80 -jar /app/app.jar\n" > /entrypoint.sh

RUN chmod +x /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
Loading