Import Java SDK as Experimental #5504

gerhard · 2023-07-24T18:44:49Z

This imports https://github.com/jcsirot/dagger-java-sdk under sdk/java as an experimental SDK.

@gerhard action items (part of this PR)

Open PR with https://github.com/jcsirot/dagger-java-sdk history import
- Capture commands used for history import

git remote add dagger-sdk-java https://github.com/jcsirot/dagger-java-sdk
git fetch dagger-sdk-java --no-tags
git checkout -b sdk/java dagger-sdk-java/main
mkdir -p sdk/java
git ls-tree -z --name-only HEAD | xargs -0 -I {} git mv {} sdk/java/
git commit --gpg-sign --signoff

git checkout main
git pull
git checkout -b import-sdk-java

git merge --gpg-sign --signoff --allow-unrelated-histories sdk/java

git push -u fork

Give @jcsirot write permissions to dagger repository
Add @jcsirot to CODEOWNERS (@dagger/sdk-dotnet group)
Mention in SDK's README that it is currently experimental
Review internal/mage/sdk/java.go
Complete https://central.sonatype.org/publish/ for dagger.io
Ensure we are using Apache 2.0 license, same as all other SDKs
Merge PR 🚀

@jcsirot action items (part of this PR)

Rename package names org.chelonix.dagger.* to io.dagger.*
Move (and rename) GHA workflows from sdk/java/.github to .github/
- you may want to add the Java workflow to internal/mage/sdk, e.g. https://github.com/dagger/dagger/blob/e454aa6b8ff40bf1502927fcdf1badb6cb4998a7/internal/mage/sdk/elixir.go
Review & approve the PR

Follow-ups (outside / after this PR)

Migrate fix(engineconn): delay the download of the CLI at CLIRunner startup jcsirot/dagger-java-sdk#10
Migrate feat: upgrade to dagger engine v0.6.4 jcsirot/dagger-java-sdk#12
Add commit to https://github.com/jcsirot/dagger-java-sdk that removes all files except the README
- Add repo migration notice to README.md, e.g. https://github.com/nabsul/DaggerSDK/blob/main/README.md
- Archive repository in GitHub, e.g. Close out this repo and point to its new home nabsul/DaggerSDK#2

Did I miss anything @jcsirot?

Fixes DEV-2320 cc @shykes @helderco @mircubed @d3rp3tt3

Signed-off-by: Jean-Christophe Sirot <[email protected]>

Initial version of the SDK --------- Signed-off-by: Jean-Christophe Sirot <[email protected]>

* build: clean up build update pom.xml dependency management remove unused dependencies remove unused import * build: Add maven exec plugin to run the code samples from the CLI

Set the log level to debug in integration tests

fix(connection): refactoring of the engine connection package Move CLIRunner and ConnectParams to a dedicated class file Replace JSON-B by JSON-P to deserialize the connection parameters Move the Dagger CLI process execution to the CLI runner (Single-responsibility principle) Fix process hanging when connection to the engine failed Improve code style Add some tests for Connection class --------- Signed-off-by: Jean-Christophe Sirot <[email protected]>

macos is limited to PR builds So far windows VM does not support Linux containers Signed-off-by: Jean-Christophe Sirot <[email protected]>

) package jar with dependencies and upload artifact in github upload artifact only on push to main update README.md --------- Signed-off-by: Jean-Christophe Sirot <[email protected]>

So that this can be imported into dagger/dagger repository Signed-off-by: Gerhard Lazu <[email protected]>

Signed-off-by: Gerhard Lazu <[email protected]>

But keep as is, same as we did for other experimental SDKs. Signed-off-by: Gerhard Lazu <[email protected]>

Signed-off-by: Gerhard Lazu <[email protected]>

jcsirot · 2023-07-24T20:42:48Z

@gerhard among the actions which are part of this PR I would also add:

rename package names org.chelonix.dagger.* to io.dagger.*

gerhard · 2023-07-25T11:51:22Z

OK! I just added that.

Signed-off-by: Jean-Christophe Sirot <[email protected]>

…es and use it when schema is not available. Inject the CLI version in the code at build time Signed-off-by: Jean-Christophe Sirot <[email protected]>

Signed-off-by: Jean-Christophe Sirot <[email protected]>

…le dedicated to deployment Signed-off-by: Jean-Christophe Sirot <[email protected]>

…ome log messages Signed-off-by: Jean-Christophe Sirot <[email protected]>

Signed-off-by: Jean-Christophe Sirot <[email protected]>

- add initial build worflow in internal/mage/sdk/java.go - add test & lint actions in github action worflow Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot · 2023-08-21T07:58:51Z

@wingyplus I tried to rebase on main but the process encounters a lot of conflicts. I think this is because a lot of files were moved from the root of the repo to sdk/java when @gerhard imported the code from the original SDK repo. Maybe for the moment I could cherry-pick the commits that fixes the issue with the Rust SDK?

@gerhard I also tried to squash the commits in the PR but I also have the same issues with a lot of conflicts, for instance on README.md or the files in .github/ directory. Maybe you acquired some experience with the SDK you previously imported?

talios · 2023-08-21T09:25:51Z

@jcsirot If the branch you're rebasing has just moved wholesale into the sub dir - you could possibly rewrite your local checkout with filter-branch with the --index-filter (https://git-scm.com/docs/git-filter-branch) - so you're existing version is now under that path, then return to normal rebasing?

It almost feels similar to what I did when migrating our old subversion repos which I wrote about ages ago on https://www.theoryinpractice.net/post/1350252794/repository-migration-from-subversion-to-git using that and a bit of awk.

wingyplus · 2023-08-21T15:43:30Z

@wingyplus I tried to rebase on main but the process encounters a lot of conflicts. I think this is because a lot of files were moved from the root of the repo to sdk/java when @gerhard imported the code from the original SDK repo. Maybe for the moment I could cherry-pick the commits that fixes the issue with the Rust SDK?

@gerhard I also tried to squash the commits in the PR but I also have the same issues with a lot of conflicts, for instance on README.md or the files in .github/ directory. Maybe you acquired some experience with the SDK you previously imported?

I remember that I face a similar issue during move Elixir SDK into Dagger. But at that time, I manually resolved it one-by-one. 😂

github-actions · 2023-09-05T01:46:53Z

This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days.

gerhard · 2023-09-08T10:03:14Z

I am picking this one up now @jcsirot.

The merge with main addressed all conflicts.

I am going over the remaining action items now.

gerhard · 2023-09-08T10:40:17Z

I submitted a JIRA ticket for https://central.sonatype.org/publish/, waiting for https://issues.sonatype.org/browse/OSSRH-94866 to be resolved.

gerhard · 2023-09-08T10:44:06Z

Also finished reviewing internal/mage/sdk/java.go, all these work as expected & pass locally:

dagger run ./hack/make sdk:java:lint
dagger run ./hack/make sdk:java:test
dagger run ./hack/make sdk:java:generate

gerhard · 2023-09-08T10:49:33Z

The last thing to check are the GHA workflows.

As I do that, do you want to review the PR @jcsirot?

Signed-off-by: Gerhard Lazu <[email protected]>

Leverage the re-usable _hack_make workflow. Signed-off-by: Gerhard Lazu <[email protected]>

gerhard · 2023-09-08T19:19:23Z

All checks are now green, including: https://github.com/dagger/dagger/actions/runs/6125459830?pr=5504

There are 2 actions items for you @jcsirot before this can be merged:

Use Apache 2.0 license in sdk/java/LICENSE so that we are consistent (Engine + CLI & all our SDKs use it), e.g. https://github.com/dagger/dagger/blob/main/sdk/elixir/LICENSE
Approve this PR

This one has been a long time coming, it will be so amazing to merge this as soon as the above are done @jcsirot 💪

gerhard · 2023-09-08T19:21:57Z

https://issues.sonatype.org/browse/OSSRH-94866 has now been solved too.

How do we move ahead with publishing @jcsirot?

FTR:

gerhard · 2023-09-11T17:56:04Z

Anything else that I can do @jcsirot to help move this one along?

jcsirot · 2023-09-12T10:11:09Z

@gerhard I'm planning to review everything tonight or tomorrow

gerhard · 2023-09-12T13:57:56Z

Looking forward to it!

gerhard · 2023-09-15T09:51:08Z

If you agree with my last commit @jcsirot:

edit the commit message & remove this paragraph
append your Signed-off-by
commit & force push

Once that is done, the only thing left for you is to approve this PR. I can handle the merge, no worries!

Today is a great day to get this finally done @jcsirot 💪

jcsirot · 2023-09-15T14:33:38Z

@gerhard everything LGTM

Should I squash all commits or leave the history as is?

gerhard · 2023-09-15T16:57:59Z

Hey @jcsirot!

First step for you is to make the change that I mentioned in my previous comment.

Second step is to approve the PR via:

As you can see above, I cannot approve my own PR.

Engine & CLI use the same Apache 2.0 license. Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot

LGTM

gerhard · 2023-09-18T17:42:43Z

Thank you @jcsirot!

Will get this merged as soon as v0.8.6 is out - mid-release right now.

jcsirot and others added 15 commits May 29, 2023 01:56

Initial commit

7f29943

Signed-off-by: Jean-Christophe Sirot <[email protected]>

Initial version (#1)

9358b08

Initial version of the SDK --------- Signed-off-by: Jean-Christophe Sirot <[email protected]>

Clean up build process & better samples (#2)

801e006

* build: clean up build update pom.xml dependency management remove unused dependencies remove unused import * build: Add maven exec plugin to run the code samples from the CLI

build: support dependency caching in github action (#3)

1756f5a

fix: add missing sample in the sample code demo app (#4)

721359f

feat(log): add debug log when response is contains errors. (#5)

3fa0ae8

Set the log level to debug in integration tests

fix: support macos arm64 architure by cli downloader (#7)

6964570

build(workflow): enable build on linux and macos (#9)

782839a

macos is limited to PR builds So far windows VM does not support Linux containers Signed-off-by: Jean-Christophe Sirot <[email protected]>

build: package jar with dependencies and upload artifacts in github (#11

366c947

) package jar with dependencies and upload artifact in github upload artifact only on push to main update README.md --------- Signed-off-by: Jean-Christophe Sirot <[email protected]>

Move all files into sdk/java subdir

330c8a2

So that this can be imported into dagger/dagger repository Signed-off-by: Gerhard Lazu <[email protected]>

Import jcsirot/dagger-java-sdk into sdk/java subdir

36dbc48

Signed-off-by: Gerhard Lazu <[email protected]>

sdk(java): Add experimental warning to README

f8c4509

Signed-off-by: Gerhard Lazu <[email protected]>

sdk(java): Rename LICENSE

1dc83ea

But keep as is, same as we did for other experimental SDKs. Signed-off-by: Gerhard Lazu <[email protected]>

chore: Add /sdk/java to CODEOWNERS

f5460ae

Signed-off-by: Gerhard Lazu <[email protected]>

build: rename package name from 'org.chelonix.dagger.*' to 'io.dagger.*'

0001e77

Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot force-pushed the import-sdk-java branch from 8647a5a to fc6788a Compare July 27, 2023 21:03

jcsirot added 2 commits July 28, 2023 14:26

build(codegen): add introspection query in the codegen plugin resourc…

e02f9e2

…es and use it when schema is not available. Inject the CLI version in the code at build time Signed-off-by: Jean-Christophe Sirot <[email protected]>

build: add linter plugin and lint current code

10a887b

Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot force-pushed the import-sdk-java branch from fc6788a to 10a887b Compare July 28, 2023 12:27

jcsirot added 6 commits July 28, 2023 17:22

build: set development version to 1.0.0-SNAPSHOT. Add "release" profi…

830e169

…le dedicated to deployment Signed-off-by: Jean-Christophe Sirot <[email protected]>

fix: correctly return the dagger CLI path in codegen plugin and fix s…

98055b3

…ome log messages Signed-off-by: Jean-Christophe Sirot <[email protected]>

build: Add schema for 0.6.4

1992c80

Signed-off-by: Jean-Christophe Sirot <[email protected]>

fix: fix coding style for linter

5bd4a47

Signed-off-by: Jean-Christophe Sirot <[email protected]>

build: fix maven versions plugin groupId

d74c20c

Signed-off-by: Jean-Christophe Sirot <[email protected]>

ci: add java sdk CI

fd0fe24

- add initial build worflow in internal/mage/sdk/java.go - add test & lint actions in github action worflow Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot force-pushed the import-sdk-java branch 2 times, most recently from c1b6bdf to 1a32215 Compare July 28, 2023 16:13

github-actions bot added the kind/stale label Sep 5, 2023

gerhard mentioned this pull request Sep 7, 2023

Backport: services via gateway, minus API changes #5764

Merged

gerhard removed the kind/stale label Sep 8, 2023

gerhard requested a review from jcsirot September 8, 2023 10:49

Gerhard Lazu added 2 commits September 8, 2023 19:54

Remove redundant return & go fmt

eab13ae

Signed-off-by: Gerhard Lazu <[email protected]>

Merge branch 'main' into import-sdk-java

bb00ee2

gerhard force-pushed the import-sdk-java branch from 3a556fc to bb00ee2 Compare September 8, 2023 18:54

Make Java SDK workflow standalone, same as the Elixir one

1df6eb8

Leverage the re-usable _hack_make workflow. Signed-off-by: Gerhard Lazu <[email protected]>

Use same Apache 2.0 license as all other SDKs

d428853

Engine & CLI use the same Apache 2.0 license. Signed-off-by: Jean-Christophe Sirot <[email protected]>

jcsirot force-pushed the import-sdk-java branch from ab8e5ab to d428853 Compare September 18, 2023 17:24

jcsirot approved these changes Sep 18, 2023

View reviewed changes

gerhard merged commit 989165c into dagger:main Sep 18, 2023

gerhard deleted the import-sdk-java branch September 18, 2023 18:58

Import Java SDK as Experimental #5504

Import Java SDK as Experimental #5504

Uh oh!

Conversation

gerhard commented Jul 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

@gerhard action items (part of this PR)

@jcsirot action items (part of this PR)

Follow-ups (outside / after this PR)

Uh oh!

jcsirot commented Jul 24, 2023

Uh oh!

gerhard commented Jul 25, 2023

Uh oh!

jcsirot commented Aug 21, 2023

Uh oh!

talios commented Aug 21, 2023

Uh oh!

wingyplus commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Sep 5, 2023

Uh oh!

gerhard commented Sep 8, 2023

Uh oh!

gerhard commented Sep 8, 2023

Uh oh!

gerhard commented Sep 8, 2023

Uh oh!

gerhard commented Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gerhard commented Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gerhard commented Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gerhard commented Sep 11, 2023

Uh oh!

jcsirot commented Sep 12, 2023

Uh oh!

gerhard commented Sep 12, 2023

Uh oh!

gerhard commented Sep 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jcsirot commented Sep 15, 2023

Uh oh!

gerhard commented Sep 15, 2023

Uh oh!

jcsirot left a comment

Choose a reason for hiding this comment

Uh oh!

gerhard commented Sep 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gerhard commented Jul 24, 2023 •

edited

Loading

wingyplus commented Aug 21, 2023 •

edited

Loading

gerhard commented Sep 8, 2023 •

edited

Loading

gerhard commented Sep 8, 2023 •

edited

Loading

gerhard commented Sep 8, 2023 •

edited

Loading

gerhard commented Sep 15, 2023 •

edited

Loading