Merge pull request #11 from openstandia/feat-residency

feat: add configurable endpoint URL for EMU data residency support

Author: wadahiro

.github/workflows/pull_request.yml

@@ -10,9 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: 11
@@ -22,12 +24,15 @@ jobs:
           server-password: OSSRH_JIRA_PASSWORD
           gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD
+
       - name: Build with Maven
         run: mvn -B package
+
       - name: Deploy SNAPSHOT version
         run: mvn -B -DskipTests deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
           OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
-          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+

.github/workflows/release.yml

@@ -11,9 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          # Disabling shallow clone is needed for correctly determing next release with semantic release
+          fetch-depth: 0
+          persist-credentials: false
+
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: 11
@@ -23,28 +29,22 @@ jobs:
           server-password: OSSRH_JIRA_PASSWORD
           gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: 'yarn'
-      - name: Setup semantic-release
-        run: |
-          yarn global add @conveyal/maven-semantic-release@v4.5.0 semantic-release@15
-          echo "$(yarn global bin)" >> $GITHUB_PATH
+
       - name: Test
         run: mvn -B test
-      - name: Release
-        # maven-semantic-release requires "maven-settings.xml" in the workspace directory
-        run: |
-          mv ~/.m2/settings.xml maven-settings.xml
-          semantic-release --branch main --prepare @conveyal/maven-semantic-release \
-            --publish @semantic-release/github,@conveyal/maven-semantic-release \
-            --verify-conditions @semantic-release/github,@conveyal/maven-semantic-release \
-            --verify-release @conveyal/maven-semantic-release\
-            --use-conveyal-workflow
+
+      - name: Semantic release
+        id: semantic
+        uses: cycjimmy/semantic-release-action@v4
+        with:
+          semantic_version: 23
+          extra_plugins: |
+            @semantic-release/changelog@6
+            @terrestris/maven-semantic-release@2
+            @semantic-release/git@10
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
           OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
-          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+

.releaserc

@@ -0,0 +1,36 @@
+{
+  "branches": [
+    "main"
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    [
+      "@terrestris/maven-semantic-release",
+      {
+        "mavenTarget": "deploy",
+        "clean": false,
+        "updateSnapshotVersion": true,
+        "settingsPath": "/home/runner/.m2/settings.xml",
+        "processAllModules": true
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "CHANGELOG.md", "pom.xml", "**/pom.xml"
+        ],
+        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "successComment": false,
+        "failTitle": false
+      }
+    ]
+  ]
+}

src/main/java/jp/openstandia/connector/github/GitHubEMUConfiguration.java

@@ -28,6 +28,7 @@ public class GitHubEMUConfiguration extends AbstractGitHubConfiguration {
 
     private String enterpriseSlug;
     private GuardedString accessToken;
+    private String endpointURL;
 
     @ConfigurationProperty(
             order = 1,
@@ -57,6 +58,20 @@ public void setAccessToken(GuardedString accessToken) {
         this.accessToken = accessToken;
     }
 
+    @ConfigurationProperty(
+            order = 3,
+            displayMessageKey = "Endpoint URL",
+            helpMessageKey = "Set GitHub endpoint URL (Default: https://api.github.com).",
+            required = false,
+            confidential = false)
+    public String getEndpointURL() {
+        return endpointURL;
+    }
+
+    public void setEndpointURL(String endpointURL) {
+        this.endpointURL = endpointURL;
+    }
+
     @Override
     public void validate() {
     }

src/main/java/jp/openstandia/connector/github/rest/GitHubEMURESTClient.java

@@ -19,6 +19,7 @@
 import jp.openstandia.connector.github.GitHubEMUConfiguration;
 import jp.openstandia.connector.github.GitHubEMUSchema;
 import jp.openstandia.connector.util.QueryHandler;
+import org.identityconnectors.common.StringUtil;
 import org.identityconnectors.common.logging.Log;
 import org.identityconnectors.framework.common.exceptions.*;
 import org.identityconnectors.framework.common.objects.Name;
@@ -96,6 +97,10 @@ public void auth() {
                     .withConnector(new OkHttpConnector(createClient(configuration)))
                     .withOAuthToken(accessToken.get());
 
+            if (!StringUtil.isEmpty(configuration.getEndpointURL())) {
+                builder = builder.withEndpoint(configuration.getEndpointURL());
+            }
+
             apiClient = GitHubExt.build(builder);
             lastAuthenticated = System.currentTimeMillis();