ci: Add new sdk generators

.circleci/config.yml

@@ -2,6 +2,7 @@ version: 2.1
 
 orbs:
   changelog: ory/changelog@0.0.3
+  sdk: ory/sdk@0.0.4
 
 jobs:
   format:
@@ -320,64 +321,6 @@ jobs:
       - run: ./test/e2e/circle-ci.bash plugin
       - run: ./test/e2e/circle-ci.bash plugin-jwt
 
-  release-sdk:
-    docker:
-      - image: circleci/openjdk:10-jdk-node
-    working_directory: ~/hydra
-    steps:
-      - checkout
-      - run: make sdk
-      - run: git config --global user.email "office+ci@ory.sh"
-      - run: git config --global user.name "ORY Continuous Integration"
-      - run: git pull -ff
-      - run: |
-          git commit -a -m "sdk: Update code-generated SDKs $(git describe --tags) [ci skip]"
-      - run: git remote rm origin
-      - run: git remote add origin https://arekkas:$GITHUB_TOKEN@github.com/ory/hydra.git
-      - run: git push origin HEAD:master
-      - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-      - run: |
-          npm version -f --no-git-tag-version $CIRCLE_TAG
-      - run: npm publish --access public
-
-  release-changelog:
-    docker:
-      - image: circleci/ruby:2.5-node
-    steps:
-      - checkout
-      - run: gem install github_changelog_generator -v 1.14.3
-      - run: sudo npm i -g doctoc
-      - restore_cache:
-          keys:
-            - changelog-v1
-      - run: github_changelog_generator -u ory -p hydra -o CHANGELOG.md --token $GITHUB_TOKEN --cache-file /tmp/github_changelog_generator
-      - save_cache:
-          key: changelog-v1
-          paths:
-            - "/tmp/github_changelog_generator"
-      - run: doctoc CHANGELOG.md
-      - run: git config --global user.email "office+ci@ory.sh"
-      - run: git config --global user.name "ORY Continuous Integration"
-      - run: git add CHANGELOG.md
-      - run: git pull -ff
-      - run: |
-          git commit -m "docs: Incorporates changes from version $(git describe --tags) [ci skip]" -- CHANGELOG.md
-      - run: git remote rm origin
-      - run: git remote add origin https://arekkas:$GITHUB_TOKEN@github.com/ory/hydra.git
-      - run: git push origin HEAD:master
-
-  release-docs:
-    docker:
-      - image: alpine/git:1.0.4
-    working_directory: /go/src/github.com/ory/hydra
-    steps:
-      - checkout
-      - run: git config --global user.email "office+ci@ory.sh"
-      - run: git config --global user.name "ORY Continuous Integration"
-      - run: "git clone https://arekkas:$DOCS_TOKEN_PUSH@github.com/ory/docs.git ../docs"
-      - run: "cp ./docs/api.swagger.json ../docs/apis/hydra.json"
-      - run: "(cd ../docs && git add -A && git commit -a -m \"Updates ORY Hydra Swagger definitions\" && git push origin) || exit 0"
-
   benchmark:
     docker:
       - image: circleci/golang:1.13
@@ -446,19 +389,16 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - release-docs:
-          requires:
-            - test
-          filters:
-            branches:
-              only: master
       - benchmark:
           # Avoids race conditions when pushing
           requires:
-            - release-docs
+            - release
+            - sdk/release
           filters:
+            tags:
+              only: /.*/
             branches:
-              only: master
+              ignore: /.*/
       - release:
           requires:
             - test
@@ -473,20 +413,29 @@ workflows:
               only: /.*/
             branches:
               ignore: /.*/
-      - release-sdk:
+      - changelog/generate:
           requires:
-            - release
+            - test
+            - format
+            - sdk/generate
           filters:
             tags:
               only: /.*/
             branches:
-              ignore: /.*/
-      - changelog/generate:
+              only: master
+      - sdk/generate:
+          appname: Ory_Hydra
           requires:
             - test
             - format
+      - sdk/release:
+          requires:
+            - test
+            - format
+            - sdk/generate
+            - release
           filters:
             tags:
               only: /.*/
             branches:
-              only: master
+              ignore: /.*/

Makefile

@@ -89,35 +89,10 @@ gen: mocks sqlbin sdk
 sdk:
 		$$(go env GOPATH)/bin/swagger generate spec -m -o ./docs/api.swagger.json -x sdk
 		$$(go env GOPATH)/bin/swagger validate ./docs/api.swagger.json
-
-		rm -rf ./sdk/go/hydra/client
-		rm -rf ./sdk/go/hydra/models
-		rm -rf ./sdk/js/swagger
-		rm -rf ./sdk/php/swagger
-		rm -rf ./sdk/java
-
+		rm -rf ./sdk/go/hydra
 		$$(go env GOPATH)/bin/swagger generate client -f ./docs/api.swagger.json -t sdk/go/hydra -A Ory_Hydra
-		java -jar scripts/swagger-codegen-cli-2.2.3.jar generate -i ./docs/api.swagger.json -l javascript -o ./sdk/js/swagger
-		java -jar scripts/swagger-codegen-cli-2.2.3.jar generate -i ./docs/api.swagger.json -l php -o sdk/php/ \
-			--invoker-package Hydra\\SDK --git-repo-id swagger --git-user-id ory --additional-properties "packagePath=swagger,description=Client for Hydra"
-		java -DapiTests=false -DmodelTests=false -jar scripts/swagger-codegen-cli-2.2.3.jar generate \
-			--input-spec ./docs/api.swagger.json \
-			--lang java \
-			--library resttemplate \
-			--group-id com.github.ory \
-			--artifact-id hydra-client-resttemplate \
-			--invoker-package com.github.ory.hydra \
-			--api-package com.github.ory.hydra.api \
-			--model-package com.github.ory.hydra.model \
-			--output ./sdk/java/hydra-client-resttemplate
-
 		make format
 
-		rm -f ./sdk/js/swagger/package.json
-		rm -rf ./sdk/js/swagger/test
-		rm -f ./sdk/php/swagger/composer.json ./sdk/php/swagger/phpunit.xml.dist
-		rm -rf ./sdk/php/swagger/test
-		rm -rf ./vendor
 
 .PHONY: install-stable
 install-stable: