Skip to content

GitLab

An error occurred while fetching the assigned milestone of the selected merge_request.
Merged
Created by torgiren@torgirenOwner

fix: fix listing the components using CRD approach - closes #491

Compare
and
6 files
+ 130
- 28
a‎pp‎
appss‎ervice‎
compon‎ents.py‎ +17 -0
dao‎.py‎ +8 -4
te‎sts‎
files/app‎s/test-org‎
test-org.app‎1.v1.2.3.yml‎ +12 -3
test-org‎.app1.yml‎ +13 -4
test_com‎ponent.py‎ +32 -0
test_‎dao.py‎ +48 -17
app/appsservice/components.py
+ 17
- 0
@@ -24,6 +24,23 @@ component_model = api.model(
@api.route('/', endpoint='components')
class Components(Resource):
@has_access_to_org
@required_fields(['org', 'app'])
def get(self):
org = request.args.get('org')
app = request.args.get('app')
try:
components = current_app.dao.get_components(org, app)
except FileNotFoundError as e:
return {'message': str(e)}, 404
if request.args.get('name'):
name = request.args.get('name')
return components.get(name, {}), 200
if request.args.get('type'):
type = request.args.get('type')
return {k: v for k, v in components.items() if v.get('helm', {}).get('type') == type}, 200 # noqa E501
return components
@api.expect(component_model, validate=True)
@has_access_to_org
@required_fields(['org', 'app', 'name', 'spec'])
app/appsservice/components.py
+ 17
- 0
@@ -24,6 +24,23 @@ component_model = api.model(
@api.route('/', endpoint='components')
class Components(Resource):
@has_access_to_org
@required_fields(['org', 'app'])
def get(self):
org = request.args.get('org')
app = request.args.get('app')
try:
components = current_app.dao.get_components(org, app)
except FileNotFoundError as e:
return {'message': str(e)}, 404
if request.args.get('name'):
name = request.args.get('name')
return components.get(name, {}), 200
if request.args.get('type'):
type = request.args.get('type')
return {k: v for k, v in components.items() if v.get('helm', {}).get('type') == type}, 200 # noqa E501
return components
@api.expect(component_model, validate=True)
@has_access_to_org
@required_fields(['org', 'app', 'name', 'spec'])
app/appsservice/dao.py
+ 8
- 4
@@ -118,15 +118,19 @@ class AppsDao(object):
with open(self._app_path(org, app), "w") as f:
f.write(yaml.dump(app_yaml))
def get_component(self, org, app, name):
def get_components(self, org, app):
if not self._is_app(org, app):
raise FileNotFoundError
app_yaml = yaml.safe_load(open(self._app_path(org, app)).read())
if not app_yaml["spec"].get("components", None):
return app_yaml["spec"].get("components", {})
def get_component(self, org, app, name):
components = self.get_components(org, app)
if not components:
raise FileNotFoundError
if not app_yaml["spec"]["components"].get(name, None):
if not components.get(name, None):
raise FileNotFoundError
return app_yaml["spec"]["components"][name]
return components[name]
def create_app(self, org, app, spec={}):
os.makedirs(self._app_dir(org), exist_ok=True)
app/tests/files/apps/test-org/test-org.app1.v1.2.3.yml
+ 12
- 3
@@ -12,27 +12,36 @@ spec:
domain: example.com
components:
frontend:
version: v0.0.3
helm:
type: simple
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: react
config:
hostnames:
- www
backend:
version: v0.0.4
helm:
type: simple
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: python
config:
hostnames:
- api
backend2:
version: v0.0.5
helm:
type: custom
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: custom
config:
app/tests/files/apps/test-org/test-org.app1.yml
+ 13
- 4
@@ -11,27 +11,36 @@ spec:
domain: example.com
components:
frontend:
version: v0.0.0-5-g2b2479d
helm:
type: simple
type: nginx
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: react
config:
hostnames:
- www
backend:
version: v0.0.0-5-g2b2479d
helm:
type: simple
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: python
config:
hostnames:
- api
backend2:
version: v0.0.0-5-g2b2479d
helm:
type: custom
chart:
name: nginx
repository: https://charts.bitnami.com/bitnami
version: 15.10.3
dockerfile:
type: custom
config:
app/tests/test_component.py
+ 32
- 0
@@ -89,3 +89,35 @@ def test_components_add_wrong_org(client):
'name': 'add-app'},
headers={'Authorization': 'Bearer ' + USER})
assert response.status_code == 403
def test_component_list_by_type(client, app):
response = client.get(
'/api/apps/v1/components/?org=test-org&app=app1&type=nginx',
headers={'Authorization': 'Bearer ' + USER})
assert response.status_code == 200
assert len(response.json) == 1
assert 'frontend' in response.json
def test_component_get(client, app):
response = client.get(
'/api/apps/v1/components/?org=test-org&app=app1&name=frontend',
headers={'Authorization': 'Bearer ' + USER})
assert response.status_code == 200
assert response.json == {
'helm': {
'type': 'nginx',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
}
},
'dockerfile': {
'type': 'react'
},
'config': {
'hostnames': ['www']
}
}
app/tests/test_dao.py
+ 48
- 17
@@ -25,9 +25,13 @@ def test_get_app(app):
'components': {
'frontend': {
'helm': {
'type': 'simple'
'type': 'nginx',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.0-5-g2b2479d',
'dockerfile': {
'type': 'react',
},
@@ -39,9 +43,13 @@ def test_get_app(app):
},
'backend': {
'helm': {
'type': 'simple'
'type': 'simple',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.0-5-g2b2479d',
'dockerfile': {
'type': 'python',
},
@@ -53,9 +61,13 @@ def test_get_app(app):
},
'backend2': {
'helm': {
'type': 'custom'
'type': 'custom',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.0-5-g2b2479d',
'dockerfile': {
'type': 'custom',
},
@@ -81,9 +93,13 @@ def test_get_app_version(app):
'components': {
'frontend': {
'helm': {
'type': 'simple'
'type': 'simple',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.3',
'dockerfile': {
'type': 'react',
},
@@ -95,9 +111,13 @@ def test_get_app_version(app):
},
'backend': {
'helm': {
'type': 'simple'
'type': 'simple',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.4',
'dockerfile': {
'type': 'python',
},
@@ -109,9 +129,13 @@ def test_get_app_version(app):
},
'backend2': {
'helm': {
'type': 'custom'
'type': 'custom',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.5',
'dockerfile': {
'type': 'custom',
},
@@ -270,9 +294,13 @@ def test_delete_component(app):
expected = {
'backend': {
'helm': {
'type': 'simple'
'type': 'simple',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.0-5-g2b2479d',
'dockerfile': {
'type': 'python',
},
@@ -284,9 +312,13 @@ def test_delete_component(app):
},
'backend2': {
'helm': {
'type': 'custom'
'type': 'custom',
'chart': {
'name': 'nginx',
'repository': 'https://charts.bitnami.com/bitnami',
'version': '15.10.3'
},
},
'version': 'v0.0.0-5-g2b2479d',
'dockerfile': {
'type': 'custom',
},
@@ -341,7 +373,6 @@ def test_get_component(app):
app="app1",
name="frontend")
assert type(component["helm"]) == dict
assert component["version"] == "v0.0.0-5-g2b2479d"
def test_get_component_non_existing_component(app):