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

Remove java-legacy client from the codebase and build process #8390

Merged
merged 2 commits into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
42 changes: 0 additions & 42 deletions .github/workflows/java-api-client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,6 @@ on:
description: Tag/version to publish

jobs:
deploy-legacy: # TODO(1.0): Remove this job after releasing 1.0
runs-on: ubuntu-22.04
environment: Treeverse signing
steps:
- name: Checkout
uses: actions/checkout@v4

# Extract the version to 'version' based on workflow_dispatch or triggered tag in the published event
- name: Extract version
shell: bash
run: |
if [ "${{ github.event.inputs.tag }}" != "" ]; then
echo "tag=$(echo ${{ github.event.inputs.tag }} | sed s/^v//)" >> $GITHUB_OUTPUT
else
echo "tag=$(echo ${GITHUB_REF##*/} | sed s/^v//)" >> $GITHUB_OUTPUT
fi
id: version

- name: Java generate package
run: make client-java-legacy PACKAGE_VERSION=${{ steps.version.outputs.tag }}

- name: Install secret key for signing
run: |
cat <(echo -e '${{ secrets.OSSRH_GPG_SECRET_KEY }}') | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG

- name: Set up Java and Maven Central Repository
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- name: Build and publish package
working-directory: clients/java-legacy
run: mvn --batch-mode deploy -Dgpg.executable="${GITHUB_WORKSPACE}/scripts/gpg_loopback.sh" --activate-profiles sign-artifacts
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

deploy:
runs-on: ubuntu-22.04
environment: Treeverse signing
Expand Down
15 changes: 2 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,6 @@ sdk-rust: api/swagger.yml ## Generate SDK for Rust client - openapi generator v
--additional-properties=infoName=Treeverse,[email protected],packageName=lakefs_sdk,packageVersion=$(PACKAGE_VERSION),packageUrl=https://github.com/treeverse/lakeFS/tree/master/clients/rust \
-o /mnt/clients/rust

client-java-legacy: api/swagger.yml api/java-gen-ignore ## Generate legacy SDK for Java (and Scala) client
rm -rf clients/java-legacy
$(OPENAPI_LEGACY_GENERATOR) generate \
-i /mnt/$< \
--ignore-file-override /mnt/api/java-gen-ignore \
-g java \
--invoker-package io.lakefs.clients.api \
--http-user-agent "lakefs-java-sdk/$(PACKAGE_VERSION)-legacy" \
--additional-properties hideGenerationTimestamp=true,artifactVersion=$(PACKAGE_VERSION),parentArtifactId=lakefs-parent,parentGroupId=io.lakefs,parentVersion=0,groupId=io.lakefs,artifactId='api-client',artifactDescription='lakeFS OpenAPI Java client legacy SDK',artifactUrl=https://lakefs.io,apiPackage=io.lakefs.clients.api,modelPackage=io.lakefs.clients.api.model,mainPackage=io.lakefs.clients.api,[email protected],developerName='Treeverse lakeFS dev',developerOrganization='lakefs.io',developerOrganizationUrl='https://lakefs.io',licenseName=apache2,licenseUrl=http://www.apache.org/licenses/,scmConnection=scm:git:[email protected]:treeverse/lakeFS.git,scmDeveloperConnection=scm:git:[email protected]:treeverse/lakeFS.git,scmUrl=https://github.com/treeverse/lakeFS \
-o /mnt/clients/java-legacy

client-java: api/swagger.yml api/java-gen-ignore ## Generate SDK for Java (and Scala) client
rm -rf clients/java
mkdir -p clients/java
Expand All @@ -177,8 +166,8 @@ client-java: api/swagger.yml api/java-gen-ignore ## Generate SDK for Java (and
--additional-properties disallowAdditionalPropertiesIfNotPresent=false,useSingleRequestParameter=true,hideGenerationTimestamp=true,artifactVersion=$(PACKAGE_VERSION),parentArtifactId=lakefs-parent,parentGroupId=io.lakefs,parentVersion=0,groupId=io.lakefs,artifactId='sdk',artifactDescription='lakeFS OpenAPI Java client',artifactUrl=https://lakefs.io,apiPackage=io.lakefs.clients.sdk,modelPackage=io.lakefs.clients.sdk.model,mainPackage=io.lakefs.clients.sdk,[email protected],developerName='Treeverse lakeFS dev',developerOrganization='lakefs.io',developerOrganizationUrl='https://lakefs.io',licenseName=apache2,licenseUrl=http://www.apache.org/licenses/,scmConnection=scm:git:[email protected]:treeverse/lakeFS.git,scmDeveloperConnection=scm:git:[email protected]:treeverse/lakeFS.git,scmUrl=https://github.com/treeverse/lakeFS \
-o /mnt/clients/java

.PHONY: clients client-python sdk-python-legacy sdk-python client-java client-java-legacy
clients: client-python client-java client-java-legacy sdk-rust
.PHONY: clients client-python sdk-python-legacy sdk-python client-java
clients: client-python client-java sdk-rust

package-python: package-python-client package-python-sdk

Expand Down
1 change: 0 additions & 1 deletion clients/.gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
java/** linguist-generated
java-legacy/** linguist-generated
python/** linguist-generated
python-legacy/** linguist-generated
python/Gemfile linguist-generated=false
Expand Down
21 changes: 0 additions & 21 deletions clients/java-legacy/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions clients/java-legacy/.openapi-generator-ignore

This file was deleted.

Loading
Loading