continue object storage (#405)

OpenTOSCA · Sep 11, 2024 · e1cab7b · e1cab7b
1 parent 2aecb85
commit e1cab7b
Show file tree

Hide file tree

Showing 61 changed files with 2,120 additions and 829 deletions.
diff --git a/docs/docs/variability4tosca/rules/index.md b/docs/docs/variability4tosca/rules/index.md
diff --git a/docs/docs/variability4tosca/rules/technology-rules.yaml b/docs/docs/variability4tosca/rules/technology-rules.yaml
@@ -1,68 +1,3 @@
-- technology: ansible
-  component: bucket
-  hosting:
-      - gcp.cloudstorage
-  weight: 1
-  reason: Primary use case due to the specialization of Ansible.
-- technology: terraform
-  component: bucket
-  hosting:
-      - gcp.cloudstorage
-  weight: 1
-  reason: Terraform provides a declarative module.
-- technology: ansible
-  component: bucket
-  artifact: cache.image
-  hosting:
-      - gcp.memorystore
-  weight: 1
-  reason: Primary use case due to the specialization of Ansible.
-- technology: ansible
-  component: bucket
-  hosting:
-      - minio.server
-      - '*'
-      - local.machine
-  weight: 1
-  reason: Primary use case due to the specialization of Ansible.
-- technology: terraform
-  component: bucket
-  hosting:
-      - minio.server
-      - '*'
-      - local.machine
-  weight: 1
-  reason: Terraform provides a declarative module.
-- technology: ansible
-  component: bucket
-  hosting:
-      - minio.server
-      - '*'
-      - remote.machine
-  weight: 1
-  reason: Primary use case due to the specialization of Ansible.
-- technology: terraform
-  component: bucket
-  hosting:
-      - minio.server
-      - '*'
-      - remote.machine
-  weight: 1
-  reason: Terraform provides a declarative module.
-- technology: ansible
-  component: bucket
-  hosting:
-      - minio.server
-      - kubernetes.cluster
-  weight: 1
-  reason: Primary use case due to the specialization of Ansible.
-- technology: terraform
-  component: bucket
-  hosting:
-      - minio.server
-      - kubernetes.cluster
-  weight: 1
-  reason: Terraform provides a declarative module.
 - technology: ansible
   component: docker.engine
   hosting:
@@ -389,6 +324,87 @@
   weight: 0
   reason: Ansible is more specialized. Also using provisioners is a "last resort".
   details: '"terraform_data" resource with an "ssh" connection to the virtual machine to copy the install script using the "file" provisioner on the virtual machine and to execute the script using the "remote-exec" provisioner'
+- technology: ansible
+  component: object.storage
+  hosting:
+      - gcp.cloudstorage
+  weight: 1
+  reason: Primary use case due to the specialization of Ansible.
+- technology: terraform
+  component: object.storage
+  hosting:
+      - gcp.cloudstorage
+  weight: 1
+  reason: Terraform provides a declarative module.
+- technology: ansible
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - local.machine
+  weight: 1
+  reason: Primary use case due to the specialization of Ansible.
+- technology: compose
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - local.machine
+  weight: 0
+  reason: One-time use docker container ("fake Kubernetes job") with imperative parts, while other technologies provide declarative modules.
+- technology: terraform
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - local.machine
+  weight: 1
+  reason: Terraform provides a declarative module.
+- technology: ansible
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - remote.machine
+  weight: 1
+  reason: Primary use case due to the specialization of Ansible.
+- technology: compose
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - remote.machine
+  weight: 0
+  reason: One-time use docker container ("fake Kubernetes job") with imperative parts, while other technologies provide declarative modules.
+- technology: terraform
+  component: object.storage
+  hosting:
+      - minio.server
+      - docker.engine
+      - remote.machine
+  weight: 0.5
+  reason: Terraform provides a declarative module. However, Terraform requires an SSH workaround. Ansible is more specialized.
+- technology: ansible
+  component: object.storage
+  hosting:
+      - minio.server
+      - kubernetes.cluster
+  weight: 1
+  reason: Primary use case due to the specialization of Ansible.
+- technology: kubernetes
+  component: object.storage
+  hosting:
+      - minio.server
+      - kubernetes.cluster
+  weight: 0
+  reason: Kubernetes Job with imperative parts, while declarative other technologies provide declarative modules.
+- technology: terraform
+  component: object.storage
+  hosting:
+      - minio.server
+      - kubernetes.cluster
+  weight: 0
+  reason: Ansible is more specialized.
 - technology: ansible
   component: redis.server
   artifact: cache.image
@@ -443,6 +459,13 @@
   weight: 0.5
   reason: Docker Compose is more specialized.
   details: '"docker_container" and "docker_image" resources'
+- technology: ansible
+  component: redis.server
+  artifact: cache.image
+  hosting:
+      - gcp.memorystore
+  weight: 1
+  reason: Primary use case due to the specialization of Ansible.
 - technology: terraform
   component: redis.server
   artifact: cache.image
@@ -457,6 +480,14 @@
       - kubernetes.cluster
   weight: 0.5
   reason: Kubernetes is more specialized.
+- technology: kubernetes
+  component: redis.server
+  artifact: cache.image
+  hosting:
+      - kubernetes.cluster
+  weight: 1
+  reason: Kubernetes is the underlying technology.
+  details: Kubernetes manifest generated and applied
 - technology: terraform
   component: redis.server
   artifact: cache.image
@@ -646,15 +677,6 @@
   weight: 1
   reason: Terraform provides a declarative module.
   details: '"google_app_engine_standard_app_version", "google_project_iam_member", "google_service_account", "google_storage_bucket", and "google_storage_bucket_object" resources'
-- technology: terraform
-  component: software.application
-  artifact: apt.archive
-  hosting:
-      - '*'
-      - remote.machine
-  weight: 0
-  reason: Ansible is more specialized. Also using provisioners is a "last resort".
-  details: '"file" provisioner to upload scripts and "remote-exec" to execute scripts'
 - technology: ansible
   component: software.application
   artifact: apt.package
@@ -682,6 +704,15 @@
   weight: 1
   reason: Primary use case due to the specialization of Ansible.
   details: '"ansible.builtin.shell", "ansible.builtin.apt_key", "ansible.builtin.apt_repository", "ansible.builtin.apt", and "ansible.builtin.copy", tasks with "when" statements'
+- technology: terraform
+  component: software.application
+  artifact: apt.package
+  hosting:
+      - '*'
+      - remote.machine
+  weight: 0
+  reason: Ansible is more specialized. Also using provisioners is a "last resort".
+  details: '"file" provisioner to upload scripts and "remote-exec" to execute scripts'
 - technology: ansible
   component: software.application
   artifact: tar.archive

diff --git a/src/assets/scripts/install-unfurl.sh b/src/assets/scripts/install-unfurl.sh
@@ -43,4 +43,4 @@ fi
 # See also https://github.com/onecommons/unfurl/blob/main/full-requirements.txt
 # requests==2.31.0 is required, see https://github.com/ansible-collections/community.docker/issues/868
 pip install unfurl==1.0.0 openstacksdk==0.61 python-openstackclient==6.0.0 pymysql==1.1.0 kubernetes==24.2.0 openshift==0.13.2 docker[tls] requests==2.31.0 ansible==8.7.0 ansible-core==2.15.9
-ansible-galaxy collection install community.docker:3.9.0 kubernetes.core:3.2.0 google.cloud:1.2.0 --force
+ansible-galaxy collection install community.docker:3.9.0 kubernetes.core:3.2.0 google.cloud:1.2.0 dubzland.minio:1.2.0 --force
diff --git a/src/assets/scripts/install-xopera.sh b/src/assets/scripts/install-xopera.sh
@@ -37,4 +37,4 @@ fi
 # pyyaml==5.3.1 is required, see https://github.com/yaml/pyyaml/issues/724#issuecomment-1638587228
 # requests==2.31.0 is required, see https://github.com/ansible-collections/community.docker/issues/868
 pip install opera==0.6.9 openstacksdk==0.61 python-openstackclient==6.0.0 pyyaml==5.3.1 pymysql==1.1.0 ansible==8.7.0 ansible-core==2.15.9
-ansible-galaxy collection install community.docker:3.9.0 kubernetes.core:3.2.0 google.cloud:1.2.0 --force
+ansible-galaxy collection install community.docker:3.9.0 kubernetes.core:3.2.0 google.cloud:1.2.0 dubzland.minio:1.2.0 --force
diff --git a/src/normative/dialects/unfurl/core/nodes.ts b/src/normative/dialects/unfurl/core/nodes.ts
@@ -120,6 +120,27 @@ const nodes: RecursivePartial<NodeTypeMap> = {
             },
         },
     },
+    cache: {
+        attributes: {
+            application_endpoint: {
+                default: {
+                    concat: [
+                        {
+                            eval: '.::application_protocol',
+                        },
+                        '://',
+                        {
+                            eval: '.::application_address',
+                        },
+                        ':',
+                        {
+                            eval: '.::application_port',
+                        },
+                    ],
+                },
+            },
+        },
+    },
 }
 
 export default nodes
diff --git a/src/normative/types/core/nodes.ts b/src/normative/types/core/nodes.ts
@@ -228,37 +228,59 @@ const nodes: NodeTypeMap = {
     },
     cache: {
         derived_from: 'software.application',
+        properties: {
+            cache_name: {
+                type: 'string',
+            },
+            cache_port: {
+                type: 'string',
+            },
+        },
+        attributes: {
+            application_endpoint: {
+                type: 'string',
+            },
+            application_address: {
+                type: 'string',
+            },
+        },
     },
     storage: {
         derived_from: 'node',
+        metadata: {
+            ...MetadataNormative(),
+        },
     },
     'block.storage': {
         derived_from: 'storage',
+        metadata: {
+            ...MetadataNormative(),
+        },
     },
     'object.storage': {
         derived_from: 'storage',
-    },
-    'file.storage': {
-        derived_from: 'storage',
-    },
-    bucket: {
-        derived_from: 'object.storage',
         metadata: {
             ...MetadataNormative(),
         },
         properties: {
-            bucket_name: {
+            storage_name: {
+                type: 'string',
+            },
+            storage_dialect: {
                 type: 'string',
             },
-            bucket_dialect: {
+            storage_user: {
+                type: 'string',
+            },
+            storage_token: {
                 type: 'string',
             },
         },
         attributes: {
-            bucket_endpoint: {
+            storage_endpoint: {
                 type: 'string',
             },
-            bucket_token: {
+            storage_token: {
                 type: 'string',
             },
         },
@@ -271,6 +293,12 @@ const nodes: NodeTypeMap = {
             },
         ],
     },
+    'file.storage': {
+        derived_from: 'storage',
+        metadata: {
+            ...MetadataNormative(),
+        },
+    },
     ingress: {
         derived_from: 'node',
         metadata: {

diff --git a/src/normative/types/extended/nodes.ts b/src/normative/types/extended/nodes.ts
@@ -1,4 +1,5 @@
 import {NodeTypeMap} from '#spec/node-type'
+import {METADATA} from '#technologies/plugins/rules/types'
 import {MetadataAbstract, MetadataNormative} from '../utils'
 
 const nodes: NodeTypeMap = {
@@ -585,19 +586,27 @@ const nodes: NodeTypeMap = {
         metadata: {
             ...MetadataNormative(),
         },
+        properties: {
+            access_key: {
+                type: 'string',
+                metadata: {
+                    [METADATA.VINTNER_NAME]: 'MINIO_ROOT_USER',
+                },
+            },
+            secret_key: {
+                type: 'string',
+                metadata: {
+                    [METADATA.VINTNER_NAME]: 'MINIO_ROOT_PASSWORD',
+                },
+            },
+        },
     },
     'redis.server': {
         derived_from: 'cache',
         metadata: {
             ...MetadataNormative(),
         },
         properties: {
-            cache_name: {
-                type: 'string',
-            },
-            cache_port: {
-                type: 'string',
-            },
             application_protocol: {
                 type: 'string',
                 default: 'redis',