Merge pull request #250 from aodn/feature/5235-reference-stacmodel-from-codeartifact

utas-raymondng · web-flow · commit 43c25aef818f · 2026-03-04T16:37:08.000+11:00
Feature/5235 reference stacmodel from codeartifact
diff --git a/.github/environment/test.env b/.github/environment/test.env
@@ -0,0 +1,6 @@
+AWS_REGION=ap-southeast-2
+AWS_ROLE_ARN=arn:aws:iam::851725428481:role/AodnGitHubActionReadOnlyRole
+CODEARTIFACT_DOMAIN=central-aodn-org-au
+CODEARTIFACT_REPO=maven-aodn-store
+ECR_REGISTRY=851725428481.dkr.ecr.ap-southeast-2.amazonaws.com
+ECR_REPOSITORY=ogcapi-java
diff --git a/.github/workflows/build_deploy_edge.yml b/.github/workflows/build_deploy_edge.yml
@@ -45,6 +45,26 @@ jobs:
           aws-region: ${{ vars.AWS_REGION }}
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
 
+      - name: Get CodeArtifact Repository Authentication Token
+        run: |
+          TOKEN=$(aws codeartifact get-authorization-token \
+            --domain ${{ vars.CODEARTIFACT_DOMAIN }} \
+            --domain-owner ${{ steps.aws_auth.outputs.aws-account-id }} \
+            --region ${{ vars.AWS_REGION }} \
+            --query authorizationToken \
+            --output text)
+          echo "CODEARTIFACT_AUTH_TOKEN=$TOKEN" >> "$GITHUB_ENV"
+
+      - name: Get CodeArtifact Repository URL
+        run: |
+          REPO_URL=$(aws codeartifact get-repository-endpoint \
+            --domain ${{ vars.CODEARTIFACT_DOMAIN }} \
+            --repository ${{ vars.CODEARTIFACT_REPO }} \
+            --format maven \
+            --region ${{ vars.AWS_REGION }} \
+            --output text)
+          echo "CODEARTIFACT_REPO_URL=$REPO_URL" >> "$GITHUB_ENV"
+
       - name: Build with Maven
         run: mvn -B verify --file pom.xml
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,6 +17,7 @@ permissions:
 jobs:
   build_test:
     runs-on: ubuntu-latest
+    environment: test
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -40,6 +41,36 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'maven'
+          server-id: 'codeartifact'
+          server-password: 'CODEARTIFACT_AUTH_TOKEN'
+
+      - name: Configure AWS Credentials
+        id: aws_auth
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          audience: sts.amazonaws.com
+          aws-region: ${{ vars.AWS_REGION }}
+          role-to-assume: ${{ vars.AWS_ROLE_ARN }}
+
+      - name: Get CodeArtifact Repository Authentication Token
+        run: |
+          TOKEN=$(aws codeartifact get-authorization-token \
+            --domain ${{ vars.CODEARTIFACT_DOMAIN }} \
+            --domain-owner ${{ steps.aws_auth.outputs.aws-account-id }} \
+            --region ${{ vars.AWS_REGION }} \
+            --query authorizationToken \
+            --output text)
+          echo "CODEARTIFACT_AUTH_TOKEN=$TOKEN" >> "$GITHUB_ENV"
+
+      - name: Get CodeArtifact Repository URL
+        run: |
+          REPO_URL=$(aws codeartifact get-repository-endpoint \
+            --domain ${{ vars.CODEARTIFACT_DOMAIN }} \
+            --repository ${{ vars.CODEARTIFACT_REPO }} \
+            --format maven \
+            --region ${{ vars.AWS_REGION }} \
+            --output text)
+          echo "CODEARTIFACT_REPO_URL=$REPO_URL" >> "$GITHUB_ENV"
 
       - name: Build with Maven
         run: mvn clean -B verify --file pom.xml
diff --git a/.mvn/codeartifact.env b/.mvn/codeartifact.env
@@ -0,0 +1,5 @@
+CA_DOMAIN=central-aodn-org-au
+CA_DOMAIN_OWNER=851725428481
+CA_REGION=ap-southeast-2
+CA_DURATION_SECONDS=43200
+CA_REPOSITORY=maven-aodn-store
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
diff --git a/README.md b/README.md
@@ -54,6 +54,32 @@ The server module contains the implementation of those interfaces, for details p
 |-------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | score | The min score value of the return record, the higher the value, the more relevance it will be. By default the score isn't set, it is Elastic Search field not STAC field |
 
+# Use AWS CodeArtifact
+We are using AWS CodeArtifact to get stacmodel dependency deployed by es-indexer.
+
+Since AWS CodeArtifact is private repository, and AWS CodeArtifact doesn't support direct mvn login,
+
+So, please use:`./mvnw-ca install` to instead`mvn install` for dependency installation at root of the project.
+
+Before running `./mvnw-ca install`, you need to:
+ - Authenticate to AWS (export vars or refresh ~/.aws/credentials) using `AodnElevatedDeveloperAccess` role in `AODN-central` account (in which the images and artifacts of AODN are stored).
+ -  make sure you have settings.xml in your ~/.m2 folder. If not, run the following command:
+```bash
+cd ~/.m2
+cat > settings.xml << 'EOF'
+<!-- ~/.m2/settings.xml -->
+<settings>
+  <servers>
+    <server>
+      <id>codeartifact</id>
+      <username>aws</username>
+      <password>${env.CODEARTIFACT_AUTH_TOKEN}</password>
+    </server>
+  </servers>
+</settings>
+
+EOF
+```
 
 
 # Sort
diff --git a/mvnw-ca b/mvnw-ca
@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+# mvnw-ca: fetch AWS CodeArtifact token and repo URL
+
+[ -f ".mvn/codeartifact.env" ] && . ".mvn/codeartifact.env"
+
+if command -v aws >/dev/null 2>&1 &&
+   [ -n "${CA_DOMAIN:-}" ] && [ -n "${CA_DOMAIN_OWNER:-}" ] && [ -n "${CA_REGION:-}" ]; then
+
+  # Get auth token if not set
+  if [ -z "${CODEARTIFACT_AUTH_TOKEN:-}" ]; then
+    CA_DURATION_SECONDS="${CA_DURATION_SECONDS:-43200}"
+    CODEARTIFACT_AUTH_TOKEN="$(
+      aws codeartifact get-authorization-token \
+        --domain "$CA_DOMAIN" \
+        --domain-owner "$CA_DOMAIN_OWNER" \
+        --region "$CA_REGION" \
+        --duration-seconds "$CA_DURATION_SECONDS" \
+        --query authorizationToken --output text 2>/dev/null || true
+    )"
+    export CODEARTIFACT_AUTH_TOKEN
+  fi
+
+  # Get repository URL if not set
+  if [ -z "${CODEARTIFACT_REPO_URL:-}" ] && [ -n "${CA_REPOSITORY:-}" ]; then
+    CODEARTIFACT_REPO_URL="$(
+      aws codeartifact get-repository-endpoint \
+        --domain "$CA_DOMAIN" \
+        --domain-owner "$CA_DOMAIN_OWNER" \
+        --repository "$CA_REPOSITORY" \
+        --region "$CA_REGION" \
+        --format maven \
+        --query repositoryEndpoint --output text 2>/dev/null || true
+    )"
+    export CODEARTIFACT_REPO_URL
+  else
+    echo
+  fi
+fi
+
+exec mvn "$@"
diff --git a/pom.xml b/pom.xml
@@ -36,6 +36,10 @@
 			<id>repo.osgeo.org</id>
 			<url>https://repo.osgeo.org/repository/release/</url>
 		</repository>
+		<repository>
+			<id>codeartifact</id>
+			<url>${env.CODEARTIFACT_REPO_URL}</url>
+		</repository>
 	</repositories>
 	<modules>
 		<module>common</module>
@@ -185,6 +189,11 @@
 				<artifactId>log4j-layout-template-json</artifactId>
 				<version>2.24.3</version> <!-- Check for the latest version -->
 			</dependency>
+			<dependency>
+				<groupId>au.org.aodn</groupId>
+				<artifactId>stacmodel</artifactId>
+				<version>0.0.52</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<distributionManagement>
diff --git a/server/pom.xml b/server/pom.xml
@@ -195,6 +195,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-layout-template-json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.org.aodn</groupId>
+            <artifactId>stacmodel</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java
@@ -1,10 +1,10 @@
 package au.org.aodn.ogcapi.server.core.model;
 
+import au.org.aodn.stac.model.Citation;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import java.util.List;
 
 @Data
@@ -15,4 +15,9 @@ public class ThemeModel {
     protected String scheme;
     protected List<ConceptModel> concepts;
 
+    // This is just a test to make sure the stac model can be used in this module, we can remove it when all the stac models are using the stacmodel from es-indexer
+    private void testStacmodelReference() {
+        Citation citation = Citation.builder().build();
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+wrapperVersion=3.3.4`
	`2`	`+distributionType=only-script`
	`3`	`+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip`