fixed typos and imports

r0light · Sep 16, 2024 · 15b2762 · 15b2762
1 parent 661f1b0
commit 15b2762
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/tosca-profiles/v2dot0-profiles/cna-modeling-profile/artifact_types.yaml b/tosca-profiles/v2dot0-profiles/cna-modeling-profile/artifact_types.yaml
@@ -10,7 +10,6 @@ artifact_types:
   Kubernetes.Resource:
     description: >
       A Kubernetes resource (like Deployment, Service, etc) which is described in a file
-    derived_from: Root
     file_ext: [ yaml, yml ]
 
   Implementation.Java:
@@ -21,30 +20,27 @@ artifact_types:
 
   Terraform.Script:
     description: A configuration file which can be used by Terraform to set up components or infrastructure.
-    derived_from: Root
     file_ext: [ tf, tf.json ] 
 
   CloudFormation.Script:
     description: A configuration file which can be used by AWS tools to set up components or infrastructure.
-    derived_from: Root
     file_ext: [ yaml, yml, json ]
 
   AWS.Resource:
     description: An abstract type for resources created in the AWS cloud.
-    derived_from: Root
 
   AWS.EKS.Cluster:
     description: An AWS EKS Cluster
     derived_from: AWS.Resource
 
   AWS.EC2.Instance:
-    desription: An AWS EC2 Instance
+    description: An AWS EC2 Instance
     derived_from: AWS.Resource
 
   AWS.Beanstalk.Application:
-    descriptio: An AWS Beanstalk application
+    description: An AWS Beanstalk application
     derived_from: AWS.Resource
 
   AWS.RDS.Instance:
-    descriptioN: An AWS RDS instance
+    description: An AWS RDS instance
     derived_from: AWS.Resource
diff --git a/tosca-profiles/v2dot0-profiles/cna-modeling-profile/node_types.yaml b/tosca-profiles/v2dot0-profiles/cna-modeling-profile/node_types.yaml
@@ -8,8 +8,11 @@ metadata:
 description: >-
   This TOSCA definitions document contains the CNA Modeling node types.
 
-node_types:
+imports:
+  - url: capability_types.yaml
+  - url: relationship_types.yaml
 
+node_types:
   cna-modeling.entities.Component:
     derived_from: SoftwareComponent
     description: Node Type to model Component entities
@@ -206,7 +209,6 @@ node_types:
           count_range: [0, UNBOUNDED]
 
   cna-modeling.entities.Endpoint:
-    derived_from: Root
     description: Endpoint type to explicitly model endpoints as entities
     properties:
       kind:
@@ -269,7 +271,6 @@ node_types:
           count_range: [0, UNBOUNDED]
 
   cna-modeling.entities.BackingData:
-    derived_from: Root
     description: Node Type to model Backing Data entities
     properties:
       included_data:
@@ -293,7 +294,6 @@ node_types:
         #count_range: [1, UNBOUNDED]
 
   cna-modeling.entities.DataAggregate:
-    derived_from: Root
     description: Node Type to model Data Aggregate entities
     capabilities:
       # Allows Data Aggregate to be used by other entities
@@ -307,7 +307,6 @@ node_types:
         #count_range: [1, UNBOUNDED]
 
   cna-modeling.entities.RequestTrace:
-    derived_from: Root
     description: Node Type to model Request Trace entities
     properties:
       referred_endpoint:

diff --git a/tosca-profiles/v2dot0-profiles/cna-modeling-profile/profile.yaml b/tosca-profiles/v2dot0-profiles/cna-modeling-profile/profile.yaml
@@ -11,6 +11,7 @@ description: >-
   This TOSCA definitions document contains the CNA Modeling TOSCA profile
 
 imports:
+  - url: artifact_types.yaml
   - url: capability_types.yaml
   - url: relationship_types.yaml
   - url: node_types.yaml