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

openapi: support nullable attribute with temporary generator image #1747

Merged
merged 1 commit into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GOLANGCI_VERSION = 1.10.2
MISSPELL_VERSION = 0.3.4
JQ_VERSION = 1.5
LICENSEI_VERSION = 0.0.7
OPENAPI_GENERATOR_VERSION = 3.3.0
OPENAPI_GENERATOR_VERSION = PR1869
MIGRATE_VERSION = 4.0.2
GOTESTSUM_VERSION = 0.3.2

Expand Down Expand Up @@ -196,12 +196,12 @@ test-integration: ## Run integration tests

.PHONY: validate-openapi
validate-openapi: ## Validate the openapi description
docker run --rm -v $${PWD}:/local openapitools/openapi-generator-cli:v${OPENAPI_GENERATOR_VERSION} validate --recommend -i /local/${OPENAPI_DESCRIPTOR}
docker run --rm -v $${PWD}:/local banzaicloud/openapi-generator-cli:${OPENAPI_GENERATOR_VERSION} validate --recommend -i /local/${OPENAPI_DESCRIPTOR}

.PHONY: generate-client
generate-client: validate-openapi ## Generate go client based on openapi description
@ if [[ "$$OSTYPE" == "linux-gnu" ]]; then sudo rm -rf ./client; else rm -rf ./client/; fi
docker run --rm -v $${PWD}:/local openapitools/openapi-generator-cli:v${OPENAPI_GENERATOR_VERSION} generate \
docker run --rm -v $${PWD}:/local banzaicloud/openapi-generator-cli:${OPENAPI_GENERATOR_VERSION} generate \
--additional-properties packageName=client \
--additional-properties withGoCodegenComment=true \
-i /local/${OPENAPI_DESCRIPTOR} \
Expand Down
2 changes: 1 addition & 1 deletion client/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.0
4.0.0-SNAPSHOT
43 changes: 6 additions & 37 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ Class | Method | HTTP request | Description
*ClustersApi* | [**HelmInit**](docs/ClustersApi.md#helminit) | **Post** /api/v1/orgs/{orgId}/clusters/{id}/helminit | Initialize Helm
*ClustersApi* | [**InstallSecret**](docs/ClustersApi.md#installsecret) | **Post** /api/v1/orgs/{orgId}/clusters/{id}/secrets/{secretName} | Install a particular secret into a cluster with optional remapping
*ClustersApi* | [**InstallSecrets**](docs/ClustersApi.md#installsecrets) | **Post** /api/v1/orgs/{orgId}/clusters/{id}/secrets | Install secrets into cluster
*ClustersApi* | [**ListClusterEndpoints**](docs/ClustersApi.md#listclusterendpoints) | **Get** /api/v1/orgs/{orgId}/clusters/{id}/endpoints | List service public endpoints
*ClustersApi* | [**ListClusterSecrets**](docs/ClustersApi.md#listclustersecrets) | **Get** /api/v1/orgs/{orgId}/clusters/{id}/secrets | List secrets which belongs to cluster
*ClustersApi* | [**ListClusters**](docs/ClustersApi.md#listclusters) | **Get** /api/v1/orgs/{orgId}/clusters | List clusters
*ClustersApi* | [**ListEndpoints**](docs/ClustersApi.md#listendpoints) | **Get** /api/v1/orgs/{orgId}/clusters/{id}/endpoints | List service public endpoints
*ClustersApi* | [**ListNodes**](docs/ClustersApi.md#listnodes) | **Get** /api/v1/orgs/{orgId}/clusters/{id}/nodes | List cluser nodes
*ClustersApi* | [**MergeSecret**](docs/ClustersApi.md#mergesecret) | **Patch** /api/v1/orgs/{orgId}/clusters/{id}/secrets/{secretName} | Merge a particular secret with an existing one with optional remapping
*ClustersApi* | [**PostReadyPKENode**](docs/ClustersApi.md#postreadypkenode) | **Post** /api/v1/orgs/{orgId}/clusters/{id}/pke/ready | List bootstrap commands for namespaces
Expand All @@ -68,7 +68,7 @@ Class | Method | HTTP request | Description
*DomainApi* | [**GetDomain**](docs/DomainApi.md#getdomain) | **Get** /api/v1/orgs/{orgId}/domain |
*HelmApi* | [**HelmChartDetails**](docs/HelmApi.md#helmchartdetails) | **Get** /api/v1/orgs/{orgId}/helm/chart/{repoName}/{chartName} | Chart details
*HelmApi* | [**HelmChartList**](docs/HelmApi.md#helmchartlist) | **Get** /api/v1/orgs/{orgId}/helm/charts/ | Chart List
*HelmApi* | [**HelmInit**](docs/HelmApi.md#helminit) | **Get** /api/v1/orgs/{orgId}/helm/repos | List repositories
*HelmApi* | [**HelmListRepos**](docs/HelmApi.md#helmlistrepos) | **Get** /api/v1/orgs/{orgId}/helm/repos | List repositories
*HelmApi* | [**HelmReposAdd**](docs/HelmApi.md#helmreposadd) | **Post** /api/v1/orgs/{orgId}/helm/repos | Add Repo
*HelmApi* | [**HelmReposDelete**](docs/HelmApi.md#helmreposdelete) | **Delete** /api/v1/orgs/{orgId}/helm/repos/{repoName} | Delete Repo
*HelmApi* | [**HelmReposModify**](docs/HelmApi.md#helmreposmodify) | **Put** /api/v1/orgs/{orgId}/helm/repos/{repoName} | Modify Repo
Expand Down Expand Up @@ -149,10 +149,8 @@ Class | Method | HTTP request | Description
- [AmazonConfigResponse](docs/AmazonConfigResponse.md)
- [AmazonConfigResponseImage](docs/AmazonConfigResponseImage.md)
- [AmazonConfigResponseInstanceType](docs/AmazonConfigResponseInstanceType.md)
- [AmazonLaunchTemplate](docs/AmazonLaunchTemplate.md)
- [AmazonPoviderConfig](docs/AmazonPoviderConfig.md)
- [AnchoreImage](docs/AnchoreImage.md)
- [AnchoreImageList](docs/AnchoreImageList.md)
- [AzureBlobStorageProps](docs/AzureBlobStorageProps.md)
- [AzureConfigResponse](docs/AzureConfigResponse.md)
- [AzureConfigResponseInstanceType](docs/AzureConfigResponseInstanceType.md)
Expand All @@ -166,7 +164,6 @@ Class | Method | HTTP request | Description
- [ClusterConfig](docs/ClusterConfig.md)
- [ClusterDelete200](docs/ClusterDelete200.md)
- [ClusterImage](docs/ClusterImage.md)
- [ClusterImageList](docs/ClusterImageList.md)
- [ClusterNotFound](docs/ClusterNotFound.md)
- [ClusterProfileAks](docs/ClusterProfileAks.md)
- [ClusterProfileAksAks](docs/ClusterProfileAksAks.md)
Expand All @@ -182,9 +179,7 @@ Class | Method | HTTP request | Description
- [CreateAksProperties](docs/CreateAksProperties.md)
- [CreateAksPropertiesAks](docs/CreateAksPropertiesAks.md)
- [CreateAmazonObjectStoreBucketProperties](docs/CreateAmazonObjectStoreBucketProperties.md)
- [CreateAmazonObjectStoreBucketPropertiesAmazon](docs/CreateAmazonObjectStoreBucketPropertiesAmazon.md)
- [CreateAzureObjectStoreBucketProperties](docs/CreateAzureObjectStoreBucketProperties.md)
- [CreateAzureObjectStoreBucketPropertiesAzure](docs/CreateAzureObjectStoreBucketPropertiesAzure.md)
- [CreateClusterRequest](docs/CreateClusterRequest.md)
- [CreateClusterResponse202](docs/CreateClusterResponse202.md)
- [CreateClusterResponse400](docs/CreateClusterResponse400.md)
Expand All @@ -194,11 +189,10 @@ Class | Method | HTTP request | Description
- [CreateGkePropertiesGke](docs/CreateGkePropertiesGke.md)
- [CreateGkePropertiesGkeMaster](docs/CreateGkePropertiesGkeMaster.md)
- [CreateGoogleObjectStoreBucketProperties](docs/CreateGoogleObjectStoreBucketProperties.md)
- [CreateGoogleObjectStoreBucketPropertiesGoogle](docs/CreateGoogleObjectStoreBucketPropertiesGoogle.md)
- [CreateObjectStoreBucketProperties](docs/CreateObjectStoreBucketProperties.md)
- [CreateObjectStoreBucketRequest](docs/CreateObjectStoreBucketRequest.md)
- [CreateObjectStoreBucketResponse](docs/CreateObjectStoreBucketResponse.md)
- [CreateOracleObjectStoreBucketProperties](docs/CreateOracleObjectStoreBucketProperties.md)
- [CreateOracleObjectStoreBucketPropertiesOracle](docs/CreateOracleObjectStoreBucketPropertiesOracle.md)
- [CreatePkeProperties](docs/CreatePkeProperties.md)
- [CreatePkePropertiesClusterTopology](docs/CreatePkePropertiesClusterTopology.md)
- [CreatePkePropertiesClusterTopologyCri](docs/CreatePkePropertiesClusterTopologyCri.md)
Expand All @@ -215,19 +209,14 @@ Class | Method | HTTP request | Description
- [CustomMetric](docs/CustomMetric.md)
- [CustomMetricStatus](docs/CustomMetricStatus.md)
- [DeleteDeploymentResponse](docs/DeleteDeploymentResponse.md)
- [DeploymentImageList](docs/DeploymentImageList.md)
- [DeploymentScaleStatus](docs/DeploymentScaleStatus.md)
- [DeploymentScalingRequest](docs/DeploymentScalingRequest.md)
- [DeploymentScalingResponse](docs/DeploymentScalingResponse.md)
- [DeploymentScalingResponseInner](docs/DeploymentScalingResponseInner.md)
- [EksSubnet](docs/EksSubnet.md)
- [EksVpc](docs/EksVpc.md)
- [EndpointItem](docs/EndpointItem.md)
- [GenTlsForLogging](docs/GenTlsForLogging.md)
- [GetClusterBootstrapResponse](docs/GetClusterBootstrapResponse.md)
- [GetClusterStatusResponse](docs/GetClusterStatusResponse.md)
- [GetDeploymentResourcesResponse](docs/GetDeploymentResourcesResponse.md)
- [GetDeploymentResourcesResponseInner](docs/GetDeploymentResourcesResponseInner.md)
- [GetDeploymentResponse](docs/GetDeploymentResponse.md)
- [GetDomainResponse](docs/GetDomainResponse.md)
- [GetPkeCommandsResponse](docs/GetPkeCommandsResponse.md)
Expand All @@ -238,17 +227,14 @@ Class | Method | HTTP request | Description
- [HelmChartDetailsResponseChart](docs/HelmChartDetailsResponseChart.md)
- [HelmChartDetailsResponseChartMaintainers](docs/HelmChartDetailsResponseChartMaintainers.md)
- [HelmChartDetailsResponseVersions](docs/HelmChartDetailsResponseVersions.md)
- [HelmChartsListResponse](docs/HelmChartsListResponse.md)
- [HelmChartsListResponseInner](docs/HelmChartsListResponseInner.md)
- [HelmInitRequest](docs/HelmInitRequest.md)
- [HelmInitResponse](docs/HelmInitResponse.md)
- [HelmNotFound](docs/HelmNotFound.md)
- [HelmRepoListItem](docs/HelmRepoListItem.md)
- [HelmReposAddRequest](docs/HelmReposAddRequest.md)
- [HelmReposDeleteResponse](docs/HelmReposDeleteResponse.md)
- [HelmReposListResponse](docs/HelmReposListResponse.md)
- [HelmReposModifyRequest](docs/HelmReposModifyRequest.md)
- [HelmReposUpdateResponse](docs/HelmReposUpdateResponse.md)
- [ImageContent](docs/ImageContent.md)
- [ImageDetail](docs/ImageDetail.md)
- [ImageRef](docs/ImageRef.md)
- [ImageSelectionRule](docs/ImageSelectionRule.md)
Expand All @@ -258,18 +244,10 @@ Class | Method | HTTP request | Description
- [InstallSecretsRequest](docs/InstallSecretsRequest.md)
- [InstallSecretsRequestQuery](docs/InstallSecretsRequestQuery.md)
- [LaunchSpotguidesRequest](docs/LaunchSpotguidesRequest.md)
- [ListDeploymentsResponse](docs/ListDeploymentsResponse.md)
- [ListDeploymentsResponseInner](docs/ListDeploymentsResponseInner.md)
- [ListEndpointsResponse](docs/ListEndpointsResponse.md)
- [ListNodesResponse](docs/ListNodesResponse.md)
- [ListNodesResponseMetadata](docs/ListNodesResponseMetadata.md)
- [ListProjectsResponse](docs/ListProjectsResponse.md)
- [ListRouteTablesResponse](docs/ListRouteTablesResponse.md)
- [ListSpotguidesResponse](docs/ListSpotguidesResponse.md)
- [ListStorageBucketsResponse](docs/ListStorageBucketsResponse.md)
- [ListUserResponse](docs/ListUserResponse.md)
- [ListVpcNetworksResponse](docs/ListVpcNetworksResponse.md)
- [ListVpcSubnetsResponse](docs/ListVpcSubnetsResponse.md)
- [LoggingPostHook](docs/LoggingPostHook.md)
- [LoggingPostHookInstallLogging](docs/LoggingPostHookInstallLogging.md)
- [MappingRule](docs/MappingRule.md)
Expand Down Expand Up @@ -301,20 +279,17 @@ Class | Method | HTTP request | Description
- [OrganizationNotFound](docs/OrganizationNotFound.md)
- [PkeHosts](docs/PkeHosts.md)
- [PodCondition](docs/PodCondition.md)
- [PodDetailsResponse](docs/PodDetailsResponse.md)
- [PodItem](docs/PodItem.md)
- [PodItemLabels](docs/PodItemLabels.md)
- [Policy](docs/Policy.md)
- [PolicyBundle](docs/PolicyBundle.md)
- [PolicyBundleList](docs/PolicyBundleList.md)
- [PolicyBundleRecord](docs/PolicyBundleRecord.md)
- [PolicyRule](docs/PolicyRule.md)
- [PolicyRuleParams](docs/PolicyRuleParams.md)
- [PostHooks](docs/PostHooks.md)
- [PostReadyPkeNodeRequest](docs/PostReadyPkeNodeRequest.md)
- [ProfileListResponse](docs/ProfileListResponse.md)
- [ProjectDetails](docs/ProjectDetails.md)
- [ReRunPostHook](docs/ReRunPostHook.md)
- [ReleaseWhiteList](docs/ReleaseWhiteList.md)
- [ReleaseWhiteListItem](docs/ReleaseWhiteListItem.md)
- [RepoNotFound](docs/RepoNotFound.md)
- [RequestedResources](docs/RequestedResources.md)
Expand All @@ -326,7 +301,6 @@ Class | Method | HTTP request | Description
- [RouteTableInfo](docs/RouteTableInfo.md)
- [ScanLogItem](docs/ScanLogItem.md)
- [ScanLogItemImage](docs/ScanLogItemImage.md)
- [ScanLogList](docs/ScanLogList.md)
- [SecretItem](docs/SecretItem.md)
- [SecretKeyValueAmazon](docs/SecretKeyValueAmazon.md)
- [SecretKeyValueAzure](docs/SecretKeyValueAzure.md)
Expand All @@ -335,16 +309,12 @@ Class | Method | HTTP request | Description
- [SecretKeyValueKubernetes](docs/SecretKeyValueKubernetes.md)
- [SecretKeyValueOracle](docs/SecretKeyValueOracle.md)
- [SecretKeyValueTls](docs/SecretKeyValueTls.md)
- [SecretTags](docs/SecretTags.md)
- [SecretsNotFound](docs/SecretsNotFound.md)
- [ServiceMeshPostHook](docs/ServiceMeshPostHook.md)
- [ServiceMeshPostHookInstallServiceMesh](docs/ServiceMeshPostHookInstallServiceMesh.md)
- [SpotguideDetailsResponse](docs/SpotguideDetailsResponse.md)
- [SpotguideNotFound](docs/SpotguideNotFound.md)
- [SpotguideOptionsMonitor](docs/SpotguideOptionsMonitor.md)
- [SpotguideOptionsMysqlDatabaseName](docs/SpotguideOptionsMysqlDatabaseName.md)
- [SpotguideOptionsMysqlDatabaseSize](docs/SpotguideOptionsMysqlDatabaseSize.md)
- [SpotguideOptionsMysqlVersion](docs/SpotguideOptionsMysqlVersion.md)
- [SpotguideOption](docs/SpotguideOption.md)
- [SubnetInfo](docs/SubnetInfo.md)
- [SupportedCloudItem](docs/SupportedCloudItem.md)
- [SupportedCloudsResponse](docs/SupportedCloudsResponse.md)
Expand All @@ -369,7 +339,6 @@ Class | Method | HTTP request | Description
- [User](docs/User.md)
- [VpcNetworkInfo](docs/VpcNetworkInfo.md)
- [Vulnerability](docs/Vulnerability.md)
- [VulnerabilityList](docs/VulnerabilityList.md)
- [VulnerabilityResponse](docs/VulnerabilityResponse.md)
- [Whitelist](docs/Whitelist.md)
- [WhitelistItem](docs/WhitelistItem.md)
Expand Down
2 changes: 1 addition & 1 deletion client/SHA256SUMS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1b4cd0962774889cc308a86da416d0eef536d61b6e6d93615e8d3c185112ae3f docs/openapi/pipeline.yaml
5f188ff5e87bc81c83bf8758b96eb983510e3c5ab6167e0b4af8fbe2499b40ae docs/openapi/pipeline.yaml
Loading