From bcd23bd6a7e50ce0d1d2e79f078bca61155857f3 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Wed, 25 Oct 2023 12:13:55 -0700 Subject: [PATCH 01/18] test java 11 build --- build.gradle | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 0a886ad..c2b3f1d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,5 @@ buildscript { repositories { - //ivy { - // url 'https://cae-artifactory.jpl.nasa.gov/artifactory/plugins-release' - //} maven { url "https://plugins.gradle.org/m2/" } @@ -28,17 +25,14 @@ allprojects { repositories { maven { url 'https://repo.osgeo.org/repository/release/' } - //maven { url 'https://cae-artifactory.jpl.nasa.gov/artifactory/maven-libs-release-local' } - //maven { url 'https://cae-artifactory.jpl.nasa.gov/artifactory/apache-maven-remote' } - //maven { url 'https://cae-artifactory.jpl.nasa.gov/artifactory/clojars-remote' } maven { url 'https://clojars.org/repo/'} maven { url "https://jitpack.io" } mavenCentral() } group = 'gov.nasa.podaac' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 1.11 +targetCompatibility = 1.11 configurations { developmentOnly @@ -48,22 +42,6 @@ configurations { } } -/* -artifactory { - contextUrl = "https://cae-artifactory.jpl.nasa.gov/artifactory" - //The base Artifactory URL if not overridden by the publisher/resolver - publish { - repository { - repoKey = 'libs-release-local' - maven = false - ivy { - ivyLayout = '[organization]/[module]/[revision]/[module]-[revision](-[classifier]).pom' - artifactLayout = '[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]' - mavenCompatible = true - } - } - } -}*/ dependencies { compile group: 'com.vividsolutions', name: 'jts', version: '1.13' @@ -330,13 +308,24 @@ shadowJar { archiveBaseName.set('shadow') archiveClassifier.set('') archiveVersion.set('') -} -jar { manifest { attributes 'Main-Class': 'ActivityHandler' } + } +/* +cliForge{ + // Second Shadow JAR + archiveBaseName.set('shadow') + archiveClassifier.set('') + archiveVersion.set('') + + manifest { + attributes 'Main-Class': 'ActivityHandler' + } +}*/ + buildZip.dependsOn build buildArtifact.dependsOn buildLambda, copyTFFiles, cleanDist \ No newline at end of file From e70cc4db1f9c4f365d5b33a5036143275fa2c160 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 11:17:22 -0700 Subject: [PATCH 02/18] /deploy sit --- build.gradle | 11 +++++------ docker/Dockerfile | 4 ++-- terraform/forge.tf | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index c2b3f1d..bfaaa0c 100644 --- a/build.gradle +++ b/build.gradle @@ -45,11 +45,10 @@ configurations { dependencies { compile group: 'com.vividsolutions', name: 'jts', version: '1.13' - compile group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '1.3.9' + compile group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '2.0.0' //implementation group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '1.3.9' - - compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.393' + compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.574' compile group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.1' compile group: 'com.amazonaws', name: 'aws-java-sdk-stepfunctions', version: '1.12.363' @@ -57,13 +56,13 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0' compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' - compile group: 'org.json', name: 'json', version: '20220924' + compile group: 'org.json', name: 'json', version: '20231013' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' compile group: 'commons-io', name: 'commons-io', version: '2.8.0' compile group: 'edu.ucar', name: 'cdm', version: '4.6.20' - compile group: 'org.geotools', name: 'gt-shapefile', version: '28.0' + compile group: 'org.geotools', name: 'gt-shapefile', version: '29.2' compile group: 'commons-cli', name: 'commons-cli', version: '1.4' compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.17.2' @@ -78,7 +77,7 @@ dependencies { testImplementation 'org.openjdk.jmh:jmh-core:1.26' testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.26' - antJUnit 'org.apache.ant:ant-junit:1.10.10' + antJUnit 'org.apache.ant:ant-junit:1.10.11' compile group: "com.github.everit-org.json-schema", name: "org.everit.json.schema", version: "1.14.1" compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2' diff --git a/docker/Dockerfile b/docker/Dockerfile index c0f0e5c..99c121a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM openjdk:11-jdk-alpine RUN apk add gradle RUN apk add python3==3.6.9-r3 @@ -16,7 +16,7 @@ USER dockeruser RUN ./gradlew shadowJar -RUN wget https://github.com/nasa/cumulus-message-adapter/releases/download/v2.0.2/cumulus-message-adapter.zip +RUN wget https://github.com/nasa/cumulus-message-adapter/releases/download/v2.0.3/cumulus-message-adapter.zip RUN mkdir cumulus-message-adapter RUN unzip -d cumulus-message-adapter cumulus-message-adapter.zip diff --git a/terraform/forge.tf b/terraform/forge.tf index b9a7fb5..55f5c8e 100644 --- a/terraform/forge.tf +++ b/terraform/forge.tf @@ -5,7 +5,7 @@ resource "aws_lambda_function" "forge_task" { source_code_hash = filebase64sha256("${path.module}/forge-lambda.zip") handler = "gov.nasa.podaac.forge.FootprintHandler::handleRequestStreams" role = var.lambda_role - runtime = "java8" + runtime = "java11" timeout = var.timeout memory_size = var.memory_size From 52b6ab0830cae5b19c3b54b54fef4b683caab2a4 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 11:35:40 -0700 Subject: [PATCH 03/18] /deploy sit --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 99c121a..5dad8d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-alpine +FROM openjdk:11 RUN apk add gradle RUN apk add python3==3.6.9-r3 From 0115fb83caccd804d2bd56ba580d34b7f0642b91 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 12:59:15 -0700 Subject: [PATCH 04/18] /deploy sit --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5dad8d9..c24648a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM adoptopenjdk/openjdk11 RUN apk add gradle RUN apk add python3==3.6.9-r3 From d8f32b65349dcb2cc9d74b1c5f2e0187623f64f9 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 13:23:42 -0700 Subject: [PATCH 05/18] /deploy sit --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c24648a..14cfe7e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ -FROM adoptopenjdk/openjdk11 +FROM adoptopenjdk/openjdk11:alpine RUN apk add gradle -RUN apk add python3==3.6.9-r3 +#RUN apk add python3==3.6.9-r3 #RUN adduser dockeruser --disabled-password From 8b4aa75988431c9851fe732d9ad97e82e107fe1d Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 13:45:01 -0700 Subject: [PATCH 06/18] /deploy sit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6865591..60e3fc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -444,6 +444,6 @@ jobs: cat override.tf.json echo "End show override contents" terraform --version - source bin/config.sh ${{ env.venue }} - terraform plan -var-file=tfvars/"${{ env.venue }}".tfvars -var="app_version=${{ env.the_version }}" -out="tfplan" + source bin/config.sh ${{ env.TARGET_ENV_LOWERCASE }} + terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.the_version }}" -out="tfplan" terraform apply -auto-approve tfplan \ No newline at end of file From 7dd863b4aebbf51737dafa1e45c49367443e6f32 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 26 Oct 2023 14:21:57 -0700 Subject: [PATCH 07/18] /deploy sit --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 14cfe7e..a8f6777 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM adoptopenjdk/openjdk11:alpine +#FROM adoptopenjdk/openjdk11:alpine +FROM amazoncorretto:11-alpine-jdk RUN apk add gradle #RUN apk add python3==3.6.9-r3 From 022237ffb3f5ad86dc5271992bb2a55f055c82b9 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Fri, 27 Oct 2023 10:20:17 -0700 Subject: [PATCH 08/18] /deploy sit --- docker/Dockerfile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a8f6777..1cb31d5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,12 @@ #FROM adoptopenjdk/openjdk11:alpine FROM amazoncorretto:11-alpine-jdk -RUN apk add gradle +#RUN apk update +#RUN apk add --upgrade apk-tools +#RUN apk add gradle + +RUN apk add wget +RUN apk add unzip #RUN apk add python3==3.6.9-r3 #RUN adduser dockeruser --disabled-password @@ -11,6 +16,17 @@ RUN addgroup -S dockergroup && adduser -S dockeruser -G dockergroup WORKDIR /home/dockeruser COPY . /home/dockeruser +# Download and install Gradle +RUN wget https://services.gradle.org/distributions/gradle-6.3-bin.zip && \ + unzip gradle-6.3-bin.zip && \ + rm gradle-6.3-bin.zip + +# Add Gradle binaries to the PATH +ENV PATH="/home/dockeruser/gradle-6.3/bin:${PATH}" + +# Display Gradle version to verify the installation +RUN gradle --version + RUN chown dockeruser:dockergroup -R /home/dockeruser USER dockeruser From cb9683695a297bb469b7b4fd6b449d5077934e8d Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Fri, 27 Oct 2023 10:57:53 -0700 Subject: [PATCH 09/18] /deploy sit --- docker/Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1cb31d5..94eb13e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,17 +1,26 @@ #FROM adoptopenjdk/openjdk11:alpine -FROM amazoncorretto:11-alpine-jdk +#FROM amazoncorretto:11-alpine-jdk +FROM amazoncorretto:11 #RUN apk update #RUN apk add --upgrade apk-tools #RUN apk add gradle -RUN apk add wget -RUN apk add unzip +#RUN apk add wget +#RUN apk add unzip + +RUN yum install -y wget +RUN yum install -y unzip +RUN yum install -y /usr/sbin/adduser + #RUN apk add python3==3.6.9-r3 #RUN adduser dockeruser --disabled-password -RUN addgroup -S dockergroup && adduser -S dockeruser -G dockergroup +#RUN addgroup -S dockergroup && adduser -S dockeruser -G dockergroup + +RUN groupadd dockergroup +RUN useradd -m -g dockergroup dockeruser WORKDIR /home/dockeruser COPY . /home/dockeruser From cd8b87399541684a009cd661915d4ccdca73a50a Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Wed, 1 Nov 2023 14:16:17 -0700 Subject: [PATCH 10/18] /deploy sit --- build.gradle | 11 +++++++++-- docker/Dockerfile | 9 ++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index bfaaa0c..f4f3c57 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id 'java' id 'jacoco' - id "com.github.johnrengelman.shadow" version "6.1.0" + id "com.github.johnrengelman.shadow" version "7.0.0" } allprojects { @@ -307,10 +307,17 @@ shadowJar { archiveBaseName.set('shadow') archiveClassifier.set('') archiveVersion.set('') + mergeServiceFiles() + manifest { - attributes 'Main-Class': 'ActivityHandler' + attributes 'Multi-Release': 'true', + 'Main-Class': 'ActivityHandler' } + /* + manifest { + attributes 'Main-Class': 'ActivityHandler' + }*/ } /* diff --git a/docker/Dockerfile b/docker/Dockerfile index 94eb13e..ced1752 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,7 @@ #FROM adoptopenjdk/openjdk11:alpine #FROM amazoncorretto:11-alpine-jdk FROM amazoncorretto:11 +#FROM public.ecr.aws/lambda/java:11 #RUN apk update #RUN apk add --upgrade apk-tools @@ -9,10 +10,12 @@ FROM amazoncorretto:11 #RUN apk add wget #RUN apk add unzip +RUN yum -y update RUN yum install -y wget RUN yum install -y unzip RUN yum install -y /usr/sbin/adduser - +#RUN yum install -y shadow-utils +#RUN yum install -y passwd #RUN apk add python3==3.6.9-r3 #RUN adduser dockeruser --disabled-password @@ -36,9 +39,9 @@ ENV PATH="/home/dockeruser/gradle-6.3/bin:${PATH}" # Display Gradle version to verify the installation RUN gradle --version -RUN chown dockeruser:dockergroup -R /home/dockeruser +#RUN chown dockeruser:dockergroup -R /home/dockeruser -USER dockeruser +#USER dockeruser RUN ./gradlew shadowJar From fdbfcefe78d79d7fbb8911aa82252957f61a3297 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Wed, 1 Nov 2023 15:38:47 -0700 Subject: [PATCH 11/18] /deploy sit --- build.gradle | 19 ------------------- docker/Dockerfile | 21 ++------------------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index f4f3c57..68ab8cc 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,6 @@ configurations { } } - dependencies { compile group: 'com.vividsolutions', name: 'jts', version: '1.13' compile group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '2.0.0' @@ -309,29 +308,11 @@ shadowJar { archiveVersion.set('') mergeServiceFiles() - manifest { attributes 'Multi-Release': 'true', 'Main-Class': 'ActivityHandler' } - /* - manifest { - attributes 'Main-Class': 'ActivityHandler' - }*/ - } -/* -cliForge{ - // Second Shadow JAR - archiveBaseName.set('shadow') - archiveClassifier.set('') - archiveVersion.set('') - - manifest { - attributes 'Main-Class': 'ActivityHandler' - } -}*/ - buildZip.dependsOn build buildArtifact.dependsOn buildLambda, copyTFFiles, cleanDist \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index ced1752..3cbeaab 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,26 +1,9 @@ -#FROM adoptopenjdk/openjdk11:alpine -#FROM amazoncorretto:11-alpine-jdk FROM amazoncorretto:11 -#FROM public.ecr.aws/lambda/java:11 - -#RUN apk update -#RUN apk add --upgrade apk-tools -#RUN apk add gradle - -#RUN apk add wget -#RUN apk add unzip RUN yum -y update RUN yum install -y wget RUN yum install -y unzip RUN yum install -y /usr/sbin/adduser -#RUN yum install -y shadow-utils -#RUN yum install -y passwd -#RUN apk add python3==3.6.9-r3 - -#RUN adduser dockeruser --disabled-password - -#RUN addgroup -S dockergroup && adduser -S dockeruser -G dockergroup RUN groupadd dockergroup RUN useradd -m -g dockergroup dockeruser @@ -39,9 +22,9 @@ ENV PATH="/home/dockeruser/gradle-6.3/bin:${PATH}" # Display Gradle version to verify the installation RUN gradle --version -#RUN chown dockeruser:dockergroup -R /home/dockeruser +RUN chown dockeruser:dockergroup -R /home/dockeruser -#USER dockeruser +USER dockeruser RUN ./gradlew shadowJar From a7e13ce8ca3eb4165896aa9633ea94c966f494bd Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 9 Nov 2023 15:45:22 -0800 Subject: [PATCH 12/18] /deploy sit --- .github/workflows/build.yml | 7 +++- build.gradle | 8 ++--- .../gov/nasa/podaac/forge/FootprintCLI.java | 34 +++++++++++++++++++ terraform/forge_fargate.tf | 2 +- terraform_deploy/variable.tf | 2 +- 5 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 src/main/java/gov/nasa/podaac/forge/FootprintCLI.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60e3fc9..0fc7fb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -215,12 +215,17 @@ jobs: # NOTE: This step is platform-specific # These are gradle-specific steps for installing the application - name: Build Software + env: + VERSION: ${{ env.the_version }} run: | rm -rf dist ./gradlew --scan buildArtifact + ./gradlew shadowJar + mv build/libs/*.jar build/libs/footprint_${VERSION}.jar ls -al ls -al dist/ ls -al docker/ + ls -al builds/libs ls -al terraform/ ls -al terraform_deploy/ @@ -298,7 +303,7 @@ jobs: uses: ncipollo/release-action@v1.12.0 with: tag: ${{ env.the_version }} - artifacts: "dist/*.zip" + artifacts: "dist/*.zip, builds/libs/*.jar" token: ${{ secrets.GITHUB_TOKEN }} body: "Version ${{ env.the_version }}" makeLatest: "${{ github.ref == 'refs/heads/main' }}" diff --git a/build.gradle b/build.gradle index 68ab8cc..40ef23b 100644 --- a/build.gradle +++ b/build.gradle @@ -303,10 +303,10 @@ task setCurrentVersion(){ // Output to build/libs/shadow.jar shadowJar { - archiveBaseName.set('shadow') - archiveClassifier.set('') - archiveVersion.set('') - mergeServiceFiles() + archiveBaseName.set('footprint') + archiveClassifier.set('') + archiveVersion.set('') + mergeServiceFiles() manifest { attributes 'Multi-Release': 'true', diff --git a/src/main/java/gov/nasa/podaac/forge/FootprintCLI.java b/src/main/java/gov/nasa/podaac/forge/FootprintCLI.java new file mode 100644 index 0000000..bf61521 --- /dev/null +++ b/src/main/java/gov/nasa/podaac/forge/FootprintCLI.java @@ -0,0 +1,34 @@ +import gov.nasa.podaac.forge.Footprinter; +import java.util.Map; + +/** + * A simple command-line interface for the Footprinter class. + */ +class FootprintCLI { + + public FootprintCLI() { + // Constructor, if needed + } + + public static void main(String[] args) { + if (args.length != 2) { + System.err.println("Usage: java FootprintCLI "); + System.exit(1); + } + + String granuleFile = args[0]; + String configFile = args[1]; + + try { + System.out.println("Processing File"); + Footprinter footprinter = new Footprinter(granuleFile, configFile); + Map fp = footprinter.footprint(); + System.out.println("Process retrieved footprint"); + System.out.println(fp.get("FOOTPRINT")); + } catch (Exception e) { + System.err.println("Error processing: " + granuleFile); + // Log the exception or handle it appropriately + e.printStackTrace(System.err); + } + } +} diff --git a/terraform/forge_fargate.tf b/terraform/forge_fargate.tf index 49aaae9..564fece 100644 --- a/terraform/forge_fargate.tf +++ b/terraform/forge_fargate.tf @@ -21,7 +21,7 @@ module "forge_fargate" { command = [ "java", "-jar", - "/home/dockeruser/build/libs/shadow.jar", + "/home/dockeruser/build/libs/footprint.jar", aws_sfn_activity.forge_ecs_task.id ] diff --git a/terraform_deploy/variable.tf b/terraform_deploy/variable.tf index b23fbdf..9912aa9 100644 --- a/terraform_deploy/variable.tf +++ b/terraform_deploy/variable.tf @@ -17,7 +17,7 @@ variable "profile" { variable "cma_version" { type = string - default = "v1.3.0" + default = "v2.0.3" } variable "app_name" { From c98070a1a0c818b66d989238d1587f3379a280a6 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 9 Nov 2023 15:48:54 -0800 Subject: [PATCH 13/18] /deploy sit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fc7fb0..b7edbdb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,7 +225,7 @@ jobs: ls -al ls -al dist/ ls -al docker/ - ls -al builds/libs + ls -al build/libs ls -al terraform/ ls -al terraform_deploy/ From 50aec79c470ac2c2cc23da1b8dfbc9cbb6dbf77a Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 9 Nov 2023 15:52:33 -0800 Subject: [PATCH 14/18] /deploy sit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7edbdb..2d9d9ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -303,7 +303,7 @@ jobs: uses: ncipollo/release-action@v1.12.0 with: tag: ${{ env.the_version }} - artifacts: "dist/*.zip, builds/libs/*.jar" + artifacts: "dist/*.zip, build/libs/*.jar" token: ${{ secrets.GITHUB_TOKEN }} body: "Version ${{ env.the_version }}" makeLatest: "${{ github.ref == 'refs/heads/main' }}" From d3f0590e139783131e193412f9fc186962aa2960 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 30 Nov 2023 10:38:47 -0800 Subject: [PATCH 15/18] add deploy images to swot cumulus and update readme --- .github/workflows/build.yml | 19 ++++++++++++++++++- README.md | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d9d9ab..1ee38f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -333,7 +333,6 @@ jobs: echo "THE_ENV=${override_env}" >> $GITHUB_ENV echo "TARGET_ENV_UPPERCASE=${override_env_upper}" >> $GITHUB_ENV - - name: Lower Case Target Env run: | original_env_value="${TARGET_ENV_UPPERCASE}" @@ -412,6 +411,24 @@ jobs: create_repo: true dockerfile: ./docker/Dockerfile + - name: Upload Docker image to SWOT Cumulus ECR + if: | + github.ref == 'refs/heads/develop' || + github.ref == 'refs/heads/main' || + startsWith(github.ref, 'refs/heads/release') || + github.event.head_commit.message == '/deploy sit' || + github.event.head_commit.message == '/deploy uat' || + github.event.head_commit.message == '/deploy sandbox' + uses: vitr/actions-build-and-upload-to-ecs@master + with: + access_key_id: ${{ secrets[format('AWS_ACCESS_KEY_ID_CUMULUS_SWOT_{0}', env.TARGET_ENV_UPPERCASE)] }} + secret_access_key: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_CUMULUS_SWOT_{0}', env.TARGET_ENV_UPPERCASE)] }} + account_id: ${{ secrets[format('AWS_ACCOUNT_ID_CUMULUS_SWOT_{0}', env.TARGET_ENV_UPPERCASE)] }} + repo: podaac/forge + region: us-west-2 + tags: ${{ env.the_version }} + create_repo: true + dockerfile: ./docker/Dockerfile ######################################################################### # Deploy to AWS via Terraform diff --git a/README.md b/README.md index 401895b..da422a0 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,20 @@ Then, to build the project simply run: ./gradlew buildZip ``` +Build local jar to run footprint +```shell script +./gradlew shadowJar +``` + +You need java 11 to run the jar locally +``` +java -cp build/libs/footprint.jar FootprintCLI +``` + +example: +``` +java -cp build/libs/footprint.jar FootprintCLI test.nc test.cfg +``` ```shell script From 73ed55cd731dabc3eedfd1fb000f18f0eb9a303e Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 30 Nov 2023 12:24:30 -0800 Subject: [PATCH 16/18] update checkout actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ee38f0..217c8a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: # Checks out this repository and sets up the build/test environment with # gradle - name: Checkout project sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Gradle uses: gradle/gradle-build-action@v2 From 5fe3cd2bd308b6a3227efe323c4f3b9d9387a96e Mon Sep 17 00:00:00 2001 From: James Wood Date: Thu, 30 Nov 2023 14:07:52 -0800 Subject: [PATCH 17/18] update docker login action version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 217c8a9..fc49951 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -314,7 +314,7 @@ jobs: ######################################################################### # Setup docker to build and push images - name: Log in to the Container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From 4a80d50e48844dbdb4c52b80aad794e0d24367d4 Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Thu, 30 Nov 2023 14:24:03 -0800 Subject: [PATCH 18/18] update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d071e49..83307d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- **JAVA 11** + - Update forge to java 11 +- **Forge CLI** + - Added a cli command to run forge with jar file +- **Github actions update** + - Update various github actions commands +- **Forge Update** + - Updated java libraries with security holes, and update libraries for cumulus 16 ### Changed ### Deprecated ### Removed