Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 22:57:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11777 from heww/fix-issue-11771

Browse Source 
fix(swagger): enable security in swagger.yaml
This commit is contained in:
He Weiwei 2020-04-28 12:08:16 +08:00 committed by GitHub
commit 9cc7a5547a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -518,7 +518,6 @@ swagger_client:
mkdir -p harborclient/harbor_client mkdir -p harborclient/harbor_client
mkdir -p harborclient/harbor_swagger_client mkdir -p harborclient/harbor_swagger_client
mkdir -p harborclient/harbor_v2_swagger_client mkdir -p harborclient/harbor_v2_swagger_client
sed -i "/type: basic/ a\\security:\n - basicAuth: []" api/v2.0/swagger.yaml
java -jar swagger-codegen-cli.jar generate -i api/swagger.yaml -l python -o harborclient/harbor_client -DpackageName=client java -jar swagger-codegen-cli.jar generate -i api/swagger.yaml -l python -o harborclient/harbor_client -DpackageName=client
java -jar swagger-codegen-cli.jar generate -i api/v2.0/legacy_swagger.yaml -l python -o harborclient/harbor_swagger_client -DpackageName=swagger_client java -jar swagger-codegen-cli.jar generate -i api/v2.0/legacy_swagger.yaml -l python -o harborclient/harbor_swagger_client -DpackageName=swagger_client
java -jar swagger-codegen-cli.jar generate -i api/v2.0/swagger.yaml -l python -o harborclient/harbor_v2_swagger_client -DpackageName=v2_swagger_client java -jar swagger-codegen-cli.jar generate -i api/v2.0/swagger.yaml -l python -o harborclient/harbor_v2_swagger_client -DpackageName=v2_swagger_client

5
api/v2.0/swagger.yaml
View File

@ -13,8 +13,11 @@ produces:
consumes: consumes:
- application/json - application/json
securityDefinitions: securityDefinitions:
basicAuth: basic:
type: basic type: basic
security:
- basic: []
- {}
paths: paths:
/projects/{project_name}/repositories: /projects/{project_name}/repositories:
get: get:

5
tests/apitests/python/library/base.py
View File

@ -23,7 +23,12 @@ class Credential:
self.password = password self.password = password
def _create_client(server, credential, debug, api_type="products"): def _create_client(server, credential, debug, api_type="products"):
cfg = None
if api_type in ('projectv2', 'artifact', 'repository', 'scan'):
cfg = v2_swagger_client.Configuration()
else:
cfg = swagger_client.Configuration() cfg = swagger_client.Configuration()
cfg.host = server.endpoint cfg.host = server.endpoint
cfg.verify_ssl = server.verify_ssl cfg.verify_ssl = server.verify_ssl
# support basic auth only for now # support basic auth only for now