Merge pull request #27 from andreaTP/styra-org

After repo transfer follow up

Author: charlieegan3

.github/workflows/ci.yml

@@ -26,7 +26,6 @@ jobs:
       with:
         repository: open-policy-agent/opa
         ref: main
-        # ref: v0.67.1
         path: opa
     - name: Prep OPA cases
       working-directory: opa
@@ -44,7 +43,7 @@ jobs:
       matrix:
         java-version: [11, 17, 21]
         opa-version:
-        - 0.67.1 # latest
+        - 0.70.0 # latest
 
     steps:
     - uses: actions/checkout@v4
@@ -65,7 +64,7 @@ jobs:
       with:
         version: ${{ matrix.opa-version }}
 
-    - name: Test OPA-Chicory
+    - name: Test opa-java-wasm
       run: mvn -B spotless:apply clean install
 
     - name: Publish Test Report

.github/workflows/release.yaml

@@ -0,0 +1,77 @@
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-version:
+        description: 'Version being released'
+        required: true
+      branch:
+        description: 'Branch to release from'
+        required: true
+        default: 'main'
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_CENTRAL_TOKEN
+          gpg-private-key: ${{ secrets.java_gpg_secret_key }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - id: install-secret-key
+        name: Install gpg secret key
+        run: |
+          cat <(echo -e "${{ secrets.java_gpg_secret_key }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
+
+      - name: Compile
+        run: mvn --batch-mode clean install -DskipTests
+
+      - name: Setup Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+      - name: Set the version
+        run: |
+          mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }}
+          git add .
+          git commit -m "Release version update ${{ github.event.inputs.release-version }}"
+          git push
+          git tag ${{ github.event.inputs.release-version }}
+          git push origin ${{ github.event.inputs.release-version }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Release to Maven Central
+        run: |
+          mvn --batch-mode clean deploy -Drelease -DskipTests=true -X
+        env:
+          MAVEN_USERNAME: ${{ secrets.ossrh_username }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.ossrh_password }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.java_gpg_passphrase }}
+
+      - name: Back to Snapshot
+        run: |
+          mvn versions:set -DgenerateBackupPoms=false -DnewVersion=999-SNAPSHOT
+          git add .
+          git commit -m "Snapshot version update"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Readme.md

@@ -1,5 +1,5 @@
-[![CI](https://github.com/andreaTP/opa-chicory/workflows/CI/badge.svg)](https://github.com/andreaTP/opa-chicory)
-[![](https://jitpack.io/v/andreaTP/opa-chicory.svg)](https://jitpack.io/#andreaTP/opa-chicory)
+[![CI](https://github.com/StyraInc/opa-java-wasm/workflows/CI/badge.svg)](https://github.com/StyraInc/opa-java-wasm)
+[![](https://jitpack.io/v/StyraInc/opa-java-wasm.svg)](https://jitpack.io/#StyraInc/opa-java-wasm)
 
 > **This repo was recently transferred to the Styra organization and work is currently under way to get everything set up here**
 
@@ -20,24 +20,13 @@ We want fast in-process OPA policies evaluations, and avoid network bottlenecks
 
 ## Install the module
 
-With Maven, add Jitpack to the `repositories` section:
-
-```xml
-<repositories>
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-</repositories>
-```
-
-and add the core module dependency:
+With Maven add the core module dependency:
 
 ```xml
 <dependency>
-    <groupId>com.github.andreaTP.opa-chicory</groupId>
-    <artifactId>opa-chicory-core</artifactId>
-    <version>main-SNAPSHOT</version>
+    <groupId>com.styra.opa</groupId>
+    <artifactId>opa-java-wasm</artifactId>
+    <version>latest_release</version>
 </dependency>
 ```
 
@@ -48,13 +37,13 @@ There are only a couple of steps required to start evaluating the policy.
 ### Import the module
 
 ```java
-import com.github.andreaTP.opa.chicory.Opa;
+import com.styra.opa.wasm.Opa;
 ```
 
 ### Load the policy
 
 ```java
-var policy = Opa.loadPolicy(policyWasm);
+var policy = OpaPolicy.builder().withPolicy(policyWasm).build();
 ```
 
 The `policyWasm` ca be a variety of things, including raw byte array, `InputStream`, `Path`, `File`.
@@ -63,7 +52,7 @@ The content should be the compiled policy Wasm file, a valid WebAssembly module.
 For example:
 
 ```java
-var policy = Opa.loadPolicy(new File("policy.wasm"));
+var policy = OpaPolicy.builder().withPolicy(new File("policy.wasm")).build();
 ```
 
 ### Evaluate the Policy
@@ -85,7 +74,7 @@ Example:
 ```java
 input = '{"path": "/", "role": "admin"}';
 
-var policy = Opa.loadPolicy(policyWasm);
+var policy = OpaPolicy.builder().withPolicy(policyWasm).build();
 var result = policy.evaluate(input);
 System.out.println("Result is: " + result);
 ```

core/pom.xml

@@ -2,12 +2,12 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.github.andreaTP.opa.chicory</groupId>
-    <artifactId>opa-chicory-parent</artifactId>
+    <groupId>com.styra.opa</groupId>
+    <artifactId>opa-java-wasm-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>opa-chicory-core</artifactId>
-  <name>Opa Wasm Chicory</name>
+  <artifactId>opa-java-wasm</artifactId>
+  <name>Java Opa Wasm</name>
   <dependencies>
     <dependency>
       <groupId>com.dylibso.chicory</groupId>