merge local and external resources (discriminate by attr)

gardener-attic · Oct 27, 2020 · 0eefd62 · 0eefd62
1 parent a734e11
commit 0eefd62
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/bindings-python/gci/componentmodel.py b/bindings-python/gci/componentmodel.py
@@ -32,6 +32,11 @@ class ResourceType(enum.Enum):
     GENERIC = 'generic'
 
 
+class ResourceRelation(enum.Enum):
+    LOCAL = 'local'
+    EXTERNAL = 'external'
+
+
 @dc(frozen=True)
 class ResourceAccess:
     type: AccessType
@@ -156,8 +161,7 @@ class Component:
 
     sources: typing.List[ComponentSource]
     componentReferences: typing.List[ComponentReference]
-    localResources: typing.List[Resource]
-    externalResources: typing.List[Resource]
+    resources: typing.List[Resource]
 
     labels: typing.List[Label] = dataclasses.field(default_factory=list)
 
@@ -166,6 +170,10 @@ def current_repository_ctx(self):
             return None
         return self.repositoryContexts[-1]
 
+    # XXX rm asap - keep for backards-compat
+    localResources: typing.List[Resource] = dataclasses.field(default_factory=list)
+    externalResources: typing.List[Resource] = dataclasses.field(default_factory=list)
+
 
 @dc
 class ComponentDescriptor:

diff --git a/bindings-python/tests/gci/componentmodel_test.py b/bindings-python/tests/gci/componentmodel_test.py
@@ -42,8 +42,7 @@ def test_component():
         provider=None,
         sources=(),
         componentReferences=(),
-        localResources=(),
-        externalResources=(),
+        resources=(),
         labels=(),
     )
 

diff --git a/component-descriptor-v2-schema.yaml b/component-descriptor-v2-schema.yaml
@@ -103,8 +103,9 @@ definitions:
     description: 'base type for resources'
     required:
       - 'name'
-      - 'version' # for localResources, this must match component's version
+      - 'version' # for local resources, this must match component's version
       - 'type'
+      - 'relation'
       - 'access'
     properties:
       name:
@@ -113,6 +114,9 @@ definitions:
         type: 'string'
       type:
         type: 'string'
+      relation:
+        type: 'string'
+        enum: ['local', 'external']
       labels:
         type: 'array'
         items:
@@ -207,8 +211,7 @@ definitions:
       - 'provider'
       - 'sources'
       - 'componentReferences'
-      - 'localResources'
-      - 'externalResources'
+      - 'resources'
     properties:
       name:
         type: 'string' # actually: component-type w/ special restrictions
@@ -233,14 +236,7 @@ definitions:
         type: 'array'
         items:
           $ref: '#/definitions/componentReference'
-      localResources:
-        type: 'array'
-        items:
-          anyOf:
-            - $ref: '#/definitions/resourceType'
-            - $ref: '#/definitions/ociImageResource'
-            - $ref: '#/definitions/genericResource'
-      externalResources:
+      resources:
         type: 'array'
         items:
           anyOf:

diff --git a/language-independent/test-resources/component_descriptor_v2.yaml b/language-independent/test-resources/component_descriptor_v2.yaml
@@ -30,19 +30,19 @@ component:
       version: 'v0.3.0'
       labels: []
 
-  localResources:
+  resources:
     - name: 'apiserver'
       version: 'v1.7.2' # version is implied by component, i.e. v1.7.2 in this case
       type: 'ociImage'
+      relation: 'local'
       labels: []
       access:
         type: 'ociRegistry'
         imageReference: 'eu.gcr.io/gardener-project/gardener/apiserver:v1.7.4'
-
-  externalResources:
     - name: 'grafana'
       version: '7.0.3'
       type: 'ociImage'
+      relation: 'external'
       labels: []
       access:
         type: 'ociRegistry'