Skip to content

Commit

Permalink
Merge pull request #7 from TheJumpCloud/ra-update-workday-and-more
Browse files Browse the repository at this point in the history
Update JCAPI for Workday and misc other changes
  • Loading branch information
Renaud Amar authored Apr 6, 2018
2 parents bca5826 + bfb48cc commit e449426
Show file tree
Hide file tree
Showing 140 changed files with 20,481 additions and 3,632 deletions.
10 changes: 7 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This repository relies on the following docker file in order to run swagger-codegen inside a docker container:
https://hub.docker.com/r/jimschubert/swagger-codegen-cli/

We're currently using the version 2.3.0 of swagger-codegen.
We're currently using the version 2.3.1 of swagger-codegen.

### Generating the API Client

Expand All @@ -14,11 +14,15 @@ The API v2 json/yaml spec can be found using the StopLight export link on our do
To generate the API v2 client, run the command below (assuming your API v2 yaml file is `input/index2.yaml`):

```
$ docker-compose run --rm swagger-codegen generate -i /swagger-api/yaml/index2.yaml -l go -c /config/config_v2.json -o /swagger-api/out/v2
docker-compose run --rm swagger-codegen generate -i /swagger-api/yaml/index2.yaml -l go -c /config/config_v2.json -o /swagger-api/out/v2
```
This will generate the API v2 client files under `output/v2`

Once you are satisfied with the generated API client, you can replace the existing files under the `v2` folder with your generated files.
Once you are satisfied with the generated API client, you can replace the existing files under the `v2` folder with your generated files:
```
rm -rf v2
mv output/v2 .
```

There currently is a bug with swagger-codegen where it generates redundant enums for certain structures (namely GraphType and GroupType).
Make sure to run the following commands in order to remove the enums declarations:
Expand Down
2 changes: 1 addition & 1 deletion config_v2.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packageName": "v2",
"packageVersion": "1.0.0"
"packageVersion": "1.2.1"
}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
swagger-codegen:
image: jimschubert/swagger-codegen-cli:latest
image: jimschubert/swagger-codegen-cli:2.3.1
volumes:
- ./input:/swagger-api/yaml # volume for input yaml files
- ./output:/swagger-api/out # volume for generated files
Expand Down
2 changes: 1 addition & 1 deletion v2/.swagger-codegen/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0-SNAPSHOT
2.3.1
240 changes: 146 additions & 94 deletions v2/README.md

Large diffs are not rendered by default.

203 changes: 101 additions & 102 deletions v2/active_directory_api.go

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions v2/active_directory_input.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/*
/*
* JumpCloud APIs
*
* V1 & V2 versions of JumpCloud's API. The next version of JumpCloud's API. This set of endpoints allows JumpCloud customers to manage objects, groupings and mappings. The most recent version of JumpCloud's API. This set of endpoints allows JumpCloud customers to manage objects, groupings and mappings.
*
* OpenAPI spec version: 2.0
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
* API version: 2.0
* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
*/

package v2
Expand Down
7 changes: 3 additions & 4 deletions v2/active_directory_output.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/*
/*
* JumpCloud APIs
*
* V1 & V2 versions of JumpCloud's API. The next version of JumpCloud's API. This set of endpoints allows JumpCloud customers to manage objects, groupings and mappings. The most recent version of JumpCloud's API. This set of endpoints allows JumpCloud customers to manage objects, groupings and mappings.
*
* OpenAPI spec version: 2.0
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
* API version: 2.0
* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
*/

package v2
Expand Down
Loading

0 comments on commit e449426

Please sign in to comment.