fix

OpenTOSCA · Sep 6, 2024 · d2889a4 · d2889a4
1 parent 07a86f2
commit d2889a4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/examples/unfurl-technology---industry---plus-maintenance-automated/lib/rules.yaml b/examples/unfurl-technology---industry---plus-maintenance-automated/lib/rules.yaml
@@ -151,6 +151,7 @@ ansible:
       reason: Docker Compose is more specialized.
       details: '"community.docker.docker_container" task'
     - component: redis.server
+      artifact: cache.image
       hosting:
           - kubernetes.cluster
       weight: 1
@@ -386,6 +387,7 @@ terraform:
       reason: Docker Compose is more specialized.
       details: '"docker_container" and "docker_image" resources'
     - component: redis.server
+      artifact: cache.image
       hosting:
           - kubernetes.cluster
       weight: 1

diff --git a/...echnology---industry---plus-maintenance-automated/lib/tosca-vintner-profile-extended.yaml b/...echnology---industry---plus-maintenance-automated/lib/tosca-vintner-profile-extended.yaml
@@ -14545,7 +14545,7 @@ node_types:
                                 - '--become'
                                 - '--key-file={{ SELF.os_ssh_key_file }}'
                                 - '--user={{ SELF.os_ssh_user }}'
-    redis.server~redis.server::[email protected]:
+    redis.server~redis.server#cache.image::[email protected]:
         derived_from: redis.server
         metadata:
             vintner_generated: 'true'
@@ -15411,7 +15411,7 @@ node_types:
                             docker_image:
                                 image:
                                     - name: '{{ ".artifacts::docker_image::file" | eval }}'
-    redis.server~redis.server::[email protected]:
+    redis.server~redis.server#cache.image::[email protected]:
         derived_from: redis.server
         metadata:
             vintner_generated: 'true'

diff --git a/examples/unfurl-technology---industry---plus-maintenance-automated/scripts/configuration.env b/examples/unfurl-technology---industry---plus-maintenance-automated/scripts/configuration.env
@@ -2,4 +2,4 @@ TEMPLATE_NAME="technology-gcp"
 #VINTNER="node ../../../build/cli/index.js"
 VINTNER="../../../task vintner"
 ORCHESTRATOR="unfurl"
-VARIANT="os-medium"
+VARIANT="local"
diff --git a/examples/unfurl-technology---industry---plus-maintenance-automated/scripts/quality.sh b/examples/unfurl-technology---industry---plus-maintenance-automated/scripts/quality.sh
@@ -5,4 +5,9 @@ set -e
 source configuration.sh
 
 # Quality
-$VINTNER template quality --template ${TEMPLATE_DIR}/variable-service-template.yaml --experimental
+for dir in ../tests/*/;
+#for dir in "../tests/gcp";
+do
+  dir=$(basename $dir)
+  echo "${dir}: $($VINTNER template quality --template ${TEMPLATE_DIR}/variable-service-template.yaml --experimental --inputs ${TEMPLATE_DIR}/tests/${dir}/inputs.yaml)"
+done
diff --git a/.../unfurl-technology---industry---plus-maintenance-automated/variable-service-template.yaml b/.../unfurl-technology---industry---plus-maintenance-automated/variable-service-template.yaml
@@ -111,9 +111,9 @@ topology_template:
 
         # TODO: remove these
         options:
-            technology_constraint: false
-            required_artifact_constraint: false
-            required_incoming_relation_constraint: false
+            #technology_constraint: false
+            #required_artifact_constraint: false
+            #expected_artifact_check: true
 
         inputs:
             env:

diff --git a/...ies/plugins/rules/generators/redis-server/cache-image/kubernetes-cluster/ansible/index.ts b/...ies/plugins/rules/generators/redis-server/cache-image/kubernetes-cluster/ansible/index.ts
@@ -11,6 +11,7 @@ import {
 const generator: ImplementationGenerator = {
     component: 'redis.server',
     technology: 'ansible',
+    artifact: 'cache.image',
     hosting: ['kubernetes.cluster'],
     weight: 1,
     reason: 'Primary use case due to the specialization of Ansible.',

diff --git a/...s/plugins/rules/generators/redis-server/cache-image/kubernetes-cluster/terraform/index.ts b/...s/plugins/rules/generators/redis-server/cache-image/kubernetes-cluster/terraform/index.ts
@@ -11,6 +11,7 @@ import {
 const generator: ImplementationGenerator = {
     component: 'redis.server',
     technology: 'terraform',
+    artifact: 'cache.image',
     hosting: ['kubernetes.cluster'],
     weight: 1,
     reason: 'Terraform provides a declarative module.',