diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 39e8be57..c16d5319 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +3.2.4: NE-11404-plugins-and-blueprints-employ-invalid-YAML-merge. 3.2.3: NE-12058-client-config-LoginProfile 3.2.2: NE-10823-aws-VpnGatewayLimitExceeded. 3.2.1: RND-1195 Add Subnet placement logic. diff --git a/cloudify_aws/__version__.py b/cloudify_aws/__version__.py index d760c886..fcfed138 100644 --- a/cloudify_aws/__version__.py +++ b/cloudify_aws/__version__.py @@ -1 +1 @@ -version = '3.2.3' +version = '3.2.4' diff --git a/plugin.yaml b/plugin.yaml index a23f5beb..036c3c82 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: 3.2.3 + package_version: 3.2.4 data_types: cloudify.datatypes.swift.Connection: @@ -1107,7 +1107,7 @@ dsl_definitions: required: false default: {} external_resource: - use_external_resource: &id001 + use_external_resource: &id003 type: boolean default: false client_config: @@ -1115,7 +1115,7 @@ dsl_definitions: type: cloudify.datatypes.aws.ConnectionConfig required: false resource_id: - resource_id: &id003 + resource_id: &id001 type: string default: '' swift_config: @@ -1138,9 +1138,9 @@ node_types: cloudify.nodes.aws.dynamodb.Table: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.dynamodb.Table.config required: false @@ -1163,9 +1163,9 @@ node_types: cloudify.nodes.aws.iam.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.Group.config required: false @@ -1223,9 +1223,9 @@ node_types: cloudify.nodes.aws.iam.User: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.User.config required: false @@ -1248,9 +1248,9 @@ node_types: cloudify.nodes.aws.iam.Role: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 policy_arns: type: list default: [] @@ -1283,9 +1283,9 @@ node_types: cloudify.nodes.aws.iam.RolePolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.RolePolicy.config required: false @@ -1308,9 +1308,9 @@ node_types: cloudify.nodes.aws.iam.InstanceProfile: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.InstanceProfile.config required: false @@ -1333,9 +1333,9 @@ node_types: cloudify.nodes.aws.iam.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.Policy.config required: false @@ -1358,9 +1358,9 @@ node_types: cloudify.nodes.aws.lambda.Function: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.lambda.Function.config required: false @@ -1402,9 +1402,9 @@ node_types: cloudify.nodes.aws.lambda.Permission: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.lambda.Permission.config required: false @@ -1434,9 +1434,9 @@ node_types: cloudify.nodes.aws.rds.Instance: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Instance.config required: false @@ -1473,9 +1473,9 @@ node_types: cloudify.nodes.aws.rds.InstanceReadReplica: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.InstanceReadReplica.config required: false @@ -1505,9 +1505,9 @@ node_types: cloudify.nodes.aws.rds.SubnetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.SubnetGroup.config required: false @@ -1537,9 +1537,9 @@ node_types: cloudify.nodes.aws.rds.OptionGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.OptionGroup.config required: false @@ -1562,9 +1562,9 @@ node_types: cloudify.nodes.aws.rds.Option: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Option.config required: false @@ -1580,9 +1580,9 @@ node_types: cloudify.nodes.aws.rds.ParameterGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.ParameterGroup.config required: false @@ -1612,9 +1612,9 @@ node_types: cloudify.nodes.aws.rds.Parameter: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Parameter.config required: false @@ -1630,9 +1630,9 @@ node_types: cloudify.nodes.aws.route53.HostedZone: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.route53.HostedZone.config required: false @@ -1674,9 +1674,9 @@ node_types: cloudify.nodes.aws.route53.RecordSet: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.route53.RecordSet.config required: false @@ -1706,9 +1706,9 @@ node_types: cloudify.nodes.aws.SQS.Queue: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SQS.Queue.config required: false @@ -1738,9 +1738,9 @@ node_types: cloudify.nodes.aws.SNS.Topic: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SNS.Topic.config required: false @@ -1770,9 +1770,9 @@ node_types: cloudify.nodes.aws.SNS.Subscription: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SNS.Subscription.config required: false @@ -1809,9 +1809,9 @@ node_types: cloudify.nodes.aws.elb.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1851,9 +1851,9 @@ node_types: cloudify.nodes.aws.elb.Classic.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1893,9 +1893,9 @@ node_types: cloudify.nodes.aws.elb.Classic.HealthCheck: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1921,9 +1921,9 @@ node_types: cloudify.nodes.aws.elb.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1956,9 +1956,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1991,9 +1991,9 @@ node_types: cloudify.nodes.aws.elb.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2026,9 +2026,9 @@ node_types: cloudify.nodes.aws.elb.TargetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2068,9 +2068,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2125,8 +2125,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucket: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.Bucket.config required: false @@ -2156,8 +2156,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucketObject: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketObject.config required: false @@ -2197,9 +2197,9 @@ node_types: cloudify.nodes.aws.s3.BucketPolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketPolicy.config required: false @@ -2229,9 +2229,9 @@ node_types: cloudify.nodes.aws.s3.BucketLifecycleConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketLifecycleConfiguration.config required: false @@ -2261,9 +2261,9 @@ node_types: cloudify.nodes.aws.s3.BucketTagging: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketTagging.config required: false @@ -2297,10 +2297,10 @@ node_types: cloudify.nodes.aws.ec2.BaseType: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2390,9 +2390,9 @@ node_types: cloudify.nodes.aws.ec2.VpcPeeringRequest: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VpcPeeringRequest.config required: false @@ -2505,9 +2505,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleIngress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SecurityGroupRules.config required: false @@ -2525,9 +2525,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleEgress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SecurityGroupRules.config required: false @@ -2646,10 +2646,10 @@ node_types: cloudify.nodes.aws.ec2.Instances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2723,10 +2723,10 @@ node_types: cloudify.nodes.aws.ec2.SpotInstances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SpotInstances.config required: false @@ -2850,10 +2850,10 @@ node_types: cloudify.nodes.aws.ec2.ElasticIP: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.ElasticIP.config required: false @@ -2947,9 +2947,9 @@ node_types: cloudify.nodes.aws.ec2.NetworkAclEntry: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.NetworkAclEntry.config required: false @@ -2979,9 +2979,9 @@ node_types: cloudify.nodes.aws.ec2.DHCPOptions: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.DHCPOptions.config required: false @@ -3068,9 +3068,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnection: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VPNConnection.config required: false @@ -3100,9 +3100,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnectionRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VPNConnectionRoute.config required: false @@ -3277,9 +3277,9 @@ node_types: cloudify.nodes.aws.ec2.TransitGatewayRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.TransitGatewayRoute.config required: false @@ -3353,9 +3353,9 @@ node_types: cloudify.nodes.aws.ec2.Route: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.Route.config required: false @@ -3385,8 +3385,8 @@ node_types: cloudify.nodes.aws.ec2.Image: derived_from: cloudify.nodes.Root properties: + resource_id: *id001 client_config: *id002 - resource_id: *id003 use_external_resource: type: boolean default: true @@ -3419,9 +3419,9 @@ node_types: cloudify.nodes.aws.ec2.Tags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.Tags.config required: false @@ -3451,10 +3451,10 @@ node_types: cloudify.nodes.aws.ec2.EBSVolume: derived_from: cloudify.nodes.aws.ec2.BaseType properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 device_name: *id010 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.EBSVolume.config required: false @@ -3494,9 +3494,9 @@ node_types: cloudify.nodes.aws.ec2.EBSAttachment: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.EBSAttachment.config required: false @@ -3526,9 +3526,9 @@ node_types: cloudify.nodes.aws.autoscaling.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.Group.config required: false @@ -3565,9 +3565,9 @@ node_types: cloudify.nodes.aws.autoscaling.LaunchConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.LaunchConfiguration.config required: false @@ -3597,9 +3597,9 @@ node_types: cloudify.nodes.aws.autoscaling.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.Policy.config required: false @@ -3629,9 +3629,9 @@ node_types: cloudify.nodes.aws.autoscaling.LifecycleHook: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.LifecycleHook.config required: false @@ -3661,9 +3661,9 @@ node_types: cloudify.nodes.aws.autoscaling.NotificationConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.NotificationConfiguration.config required: false @@ -3693,9 +3693,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Alarm: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Alarm.config required: false @@ -3725,9 +3725,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Rule.config required: false @@ -3757,9 +3757,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Event: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Event.config required: false @@ -3782,9 +3782,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Target: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Target.config required: false @@ -3814,9 +3814,9 @@ node_types: cloudify.nodes.aws.efs.FileSystem: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.FileSystem.config required: false @@ -3846,9 +3846,9 @@ node_types: cloudify.nodes.aws.efs.MountTarget: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.MountTarget.config required: false @@ -3878,9 +3878,9 @@ node_types: cloudify.nodes.aws.efs.FileSystemTags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.FileSystemTags.config required: false @@ -3910,9 +3910,9 @@ node_types: cloudify.nodes.aws.kms.CustomerMasterKey: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.CustomerMasterKey.config required: false @@ -3956,9 +3956,9 @@ node_types: cloudify.nodes.aws.kms.Alias: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.Alias.config required: false @@ -3988,9 +3988,9 @@ node_types: cloudify.nodes.aws.kms.Grant: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.Grant.config required: false @@ -4020,9 +4020,9 @@ node_types: cloudify.nodes.aws.CloudFormation.Stack: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.CloudFormation.Stack.config required: false @@ -4067,9 +4067,9 @@ node_types: cloudify.nodes.aws.ecs.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.Cluster.config required: false @@ -4099,9 +4099,9 @@ node_types: cloudify.nodes.aws.ecs.Service: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.Service.config required: false @@ -4131,9 +4131,9 @@ node_types: cloudify.nodes.aws.ecs.TaskDefinition: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.TaskDefinition.config required: false @@ -4171,9 +4171,9 @@ node_types: cloudify.nodes.aws.eks.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -4221,9 +4221,9 @@ node_types: cloudify.nodes.aws.eks.NodeGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -4268,9 +4268,9 @@ node_types: cloudify.nodes.aws.codepipeline.Pipeline: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.codepipeline.Pipeline.config interfaces: @@ -4307,9 +4307,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.UserPool.config interfaces: @@ -4338,9 +4338,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPoolClient: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.UserPoolClient.config interfaces: @@ -4369,9 +4369,9 @@ node_types: cloudify.nodes.aws.cognitoidp.IdentityProvider: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.IdentityProvider.config interfaces: @@ -4400,9 +4400,9 @@ node_types: cloudify.nodes.aws.cognito.IdentityPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognito.IdentityPool.config interfaces: @@ -4431,9 +4431,9 @@ node_types: cloudify.nodes.aws.ecr.AuthenticationToken: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ecr.AuthenticationToken.config interfaces: @@ -4455,9 +4455,9 @@ node_types: cloudify.nodes.aws.ecr.Repository: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ecr.Repository.config interfaces: diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml index 68d8d4cd..c06424fc 100644 --- a/plugin_1_4.yaml +++ b/plugin_1_4.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: 3.2.3 + package_version: 3.2.4 data_types: cloudify.datatypes.swift.Connection: @@ -1391,7 +1391,7 @@ dsl_definitions: required: false default: {} external_resource: - use_external_resource: &id001 + use_external_resource: &id003 description: > Indicate whether the resource exists or if Cloudify should create the resource, true if you are bringing an existing resource, false if you want cloudify to create it. type: boolean @@ -1403,7 +1403,7 @@ dsl_definitions: type: cloudify.datatypes.aws.ConnectionConfig required: false resource_id: - resource_id: &id003 + resource_id: &id001 description: > The AWS resource ID of the external resource, if use_external_resource is true. Otherwise it is an empty string. type: string @@ -1432,9 +1432,9 @@ node_types: cloudify.nodes.aws.dynamodb.Table: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1459,9 +1459,9 @@ node_types: cloudify.nodes.aws.iam.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1533,9 +1533,9 @@ node_types: cloudify.nodes.aws.iam.User: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1560,9 +1560,9 @@ node_types: cloudify.nodes.aws.iam.Role: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 policy_arns: description: > List of ARN policies to be provided. The list needs to contain dictionaries containing a single ARN policy with the key 'PolicyArn' @@ -1599,9 +1599,9 @@ node_types: cloudify.nodes.aws.iam.RolePolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1626,9 +1626,9 @@ node_types: cloudify.nodes.aws.iam.InstanceProfile: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1653,9 +1653,9 @@ node_types: cloudify.nodes.aws.iam.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1680,9 +1680,9 @@ node_types: cloudify.nodes.aws.lambda.Function: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1734,9 +1734,9 @@ node_types: cloudify.nodes.aws.lambda.Permission: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1768,9 +1768,9 @@ node_types: cloudify.nodes.aws.rds.Instance: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1809,9 +1809,9 @@ node_types: cloudify.nodes.aws.rds.InstanceReadReplica: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1843,9 +1843,9 @@ node_types: cloudify.nodes.aws.rds.SubnetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1877,9 +1877,9 @@ node_types: cloudify.nodes.aws.rds.OptionGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1904,9 +1904,9 @@ node_types: cloudify.nodes.aws.rds.Option: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1924,9 +1924,9 @@ node_types: cloudify.nodes.aws.rds.ParameterGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1958,9 +1958,9 @@ node_types: cloudify.nodes.aws.rds.Parameter: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -1978,9 +1978,9 @@ node_types: cloudify.nodes.aws.route53.HostedZone: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2034,9 +2034,9 @@ node_types: cloudify.nodes.aws.route53.RecordSet: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2068,9 +2068,9 @@ node_types: cloudify.nodes.aws.SQS.Queue: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2102,9 +2102,9 @@ node_types: cloudify.nodes.aws.SNS.Topic: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2136,9 +2136,9 @@ node_types: cloudify.nodes.aws.SNS.Subscription: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2177,9 +2177,9 @@ node_types: cloudify.nodes.aws.elb.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2222,9 +2222,9 @@ node_types: cloudify.nodes.aws.elb.Classic.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2267,9 +2267,9 @@ node_types: cloudify.nodes.aws.elb.Classic.HealthCheck: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2298,9 +2298,9 @@ node_types: cloudify.nodes.aws.elb.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2336,9 +2336,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2374,9 +2374,9 @@ node_types: cloudify.nodes.aws.elb.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2412,9 +2412,9 @@ node_types: cloudify.nodes.aws.elb.TargetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2457,9 +2457,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2519,8 +2519,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucket: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2552,8 +2552,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucketObject: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2599,9 +2599,9 @@ node_types: cloudify.nodes.aws.s3.BucketPolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2633,9 +2633,9 @@ node_types: cloudify.nodes.aws.s3.BucketLifecycleConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2667,9 +2667,9 @@ node_types: cloudify.nodes.aws.s3.BucketTagging: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2705,10 +2705,10 @@ node_types: cloudify.nodes.aws.ec2.BaseType: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2803,9 +2803,9 @@ node_types: cloudify.nodes.aws.ec2.VpcPeeringRequest: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2925,9 +2925,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleIngress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -2947,9 +2947,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleEgress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3074,10 +3074,10 @@ node_types: cloudify.nodes.aws.ec2.Instances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -3159,10 +3159,10 @@ node_types: cloudify.nodes.aws.ec2.SpotInstances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3303,10 +3303,10 @@ node_types: cloudify.nodes.aws.ec2.ElasticIP: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3407,9 +3407,9 @@ node_types: cloudify.nodes.aws.ec2.NetworkAclEntry: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3441,9 +3441,9 @@ node_types: cloudify.nodes.aws.ec2.DHCPOptions: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3534,9 +3534,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnection: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3568,9 +3568,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnectionRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3755,9 +3755,9 @@ node_types: cloudify.nodes.aws.ec2.TransitGatewayRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3835,9 +3835,9 @@ node_types: cloudify.nodes.aws.ec2.Route: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3869,8 +3869,8 @@ node_types: cloudify.nodes.aws.ec2.Image: derived_from: cloudify.nodes.Root properties: + resource_id: *id001 client_config: *id002 - resource_id: *id003 use_external_resource: type: boolean default: true @@ -3906,9 +3906,9 @@ node_types: cloudify.nodes.aws.ec2.Tags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3940,10 +3940,10 @@ node_types: cloudify.nodes.aws.ec2.EBSVolume: derived_from: cloudify.nodes.aws.ec2.BaseType properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 device_name: *id010 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -3986,9 +3986,9 @@ node_types: cloudify.nodes.aws.ec2.EBSAttachment: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4020,9 +4020,9 @@ node_types: cloudify.nodes.aws.autoscaling.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4061,9 +4061,9 @@ node_types: cloudify.nodes.aws.autoscaling.LaunchConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4095,9 +4095,9 @@ node_types: cloudify.nodes.aws.autoscaling.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4129,9 +4129,9 @@ node_types: cloudify.nodes.aws.autoscaling.LifecycleHook: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4163,9 +4163,9 @@ node_types: cloudify.nodes.aws.autoscaling.NotificationConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4197,9 +4197,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Alarm: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4231,9 +4231,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4265,9 +4265,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Event: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4292,9 +4292,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Target: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4326,9 +4326,9 @@ node_types: cloudify.nodes.aws.efs.FileSystem: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4360,9 +4360,9 @@ node_types: cloudify.nodes.aws.efs.MountTarget: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4394,9 +4394,9 @@ node_types: cloudify.nodes.aws.efs.FileSystemTags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4428,9 +4428,9 @@ node_types: cloudify.nodes.aws.kms.CustomerMasterKey: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4476,9 +4476,9 @@ node_types: cloudify.nodes.aws.kms.Alias: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4510,9 +4510,9 @@ node_types: cloudify.nodes.aws.kms.Grant: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4544,9 +4544,9 @@ node_types: cloudify.nodes.aws.CloudFormation.Stack: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4597,9 +4597,9 @@ node_types: cloudify.nodes.aws.ecs.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4631,9 +4631,9 @@ node_types: cloudify.nodes.aws.ecs.Service: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4665,9 +4665,9 @@ node_types: cloudify.nodes.aws.ecs.TaskDefinition: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4707,9 +4707,9 @@ node_types: cloudify.nodes.aws.eks.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -4762,9 +4762,9 @@ node_types: cloudify.nodes.aws.eks.NodeGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -4812,9 +4812,9 @@ node_types: cloudify.nodes.aws.codepipeline.Pipeline: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4853,9 +4853,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4886,9 +4886,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPoolClient: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4919,9 +4919,9 @@ node_types: cloudify.nodes.aws.cognitoidp.IdentityProvider: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4952,9 +4952,9 @@ node_types: cloudify.nodes.aws.cognito.IdentityPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -4985,9 +4985,9 @@ node_types: cloudify.nodes.aws.ecr.AuthenticationToken: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. @@ -5011,9 +5011,9 @@ node_types: cloudify.nodes.aws.ecr.Repository: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: description: > Configuration key-value data to be passed as-is to the corresponding Boto3 method. Key names must match the case that Boto3 requires. diff --git a/plugin_1_5.yaml b/plugin_1_5.yaml index 8c5fa60b..1681ac68 100644 --- a/plugin_1_5.yaml +++ b/plugin_1_5.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: '3.2.3' + package_version: '3.2.4' properties_description: | Manage AWS resources. Credentials documentation: https://docs.cloudify.co/latest/working_with/official_plugins/infrastructure/aws/#authentication-with-aws. @@ -1617,9 +1617,7 @@ node_types: cloudify.nodes.aws.dynamodb.Table: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1638,9 +1636,7 @@ node_types: cloudify.nodes.aws.iam.Group: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1716,9 +1712,7 @@ node_types: cloudify.nodes.aws.iam.User: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1737,9 +1731,7 @@ node_types: cloudify.nodes.aws.iam.Role: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] policy_arns: description: > List of ARN policies to be provided. @@ -1768,9 +1760,7 @@ node_types: cloudify.nodes.aws.iam.RolePolicy: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1789,9 +1779,7 @@ node_types: cloudify.nodes.aws.iam.InstanceProfile: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1810,9 +1798,7 @@ node_types: cloudify.nodes.aws.iam.Policy: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1831,9 +1817,7 @@ node_types: cloudify.nodes.aws.lambda.Function: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1890,9 +1874,7 @@ node_types: cloudify.nodes.aws.lambda.Permission: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1914,9 +1896,7 @@ node_types: cloudify.nodes.aws.rds.Instance: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1941,9 +1921,7 @@ node_types: cloudify.nodes.aws.rds.InstanceReadReplica: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1965,9 +1943,7 @@ node_types: cloudify.nodes.aws.rds.SubnetGroup: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -1989,9 +1965,7 @@ node_types: cloudify.nodes.aws.rds.OptionGroup: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2011,9 +1985,7 @@ node_types: cloudify.nodes.aws.rds.Option: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2030,9 +2002,7 @@ node_types: cloudify.nodes.aws.rds.ParameterGroup: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2055,9 +2025,7 @@ node_types: cloudify.nodes.aws.rds.Parameter: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2074,9 +2042,7 @@ node_types: cloudify.nodes.aws.route53.HostedZone: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2133,9 +2099,7 @@ node_types: cloudify.nodes.aws.route53.RecordSet: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2158,9 +2122,7 @@ node_types: cloudify.nodes.aws.SQS.Queue: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2183,9 +2145,7 @@ node_types: cloudify.nodes.aws.SNS.Topic: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2207,9 +2167,7 @@ node_types: cloudify.nodes.aws.SNS.Subscription: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2234,9 +2192,7 @@ node_types: cloudify.nodes.aws.elb.LoadBalancer: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2265,9 +2221,7 @@ node_types: cloudify.nodes.aws.elb.Classic.LoadBalancer: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2296,9 +2250,7 @@ node_types: cloudify.nodes.aws.elb.Classic.HealthCheck: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2321,9 +2273,7 @@ node_types: cloudify.nodes.aws.elb.Listener: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2349,9 +2299,7 @@ node_types: cloudify.nodes.aws.elb.Classic.Listener: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2377,9 +2325,7 @@ node_types: cloudify.nodes.aws.elb.Rule: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2405,9 +2351,7 @@ node_types: cloudify.nodes.aws.elb.TargetGroup: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2436,9 +2380,7 @@ node_types: cloudify.nodes.aws.elb.Classic.Policy: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2482,8 +2424,7 @@ node_types: cloudify.nodes.aws.s3.BaseBucket: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *resource_id + <<: [*external_resource, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2505,8 +2446,7 @@ node_types: cloudify.nodes.aws.s3.BaseBucketObject: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *resource_id + <<: [*external_resource, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2549,9 +2489,7 @@ node_types: cloudify.nodes.aws.s3.BucketPolicy: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2573,9 +2511,7 @@ node_types: cloudify.nodes.aws.s3.BucketLifecycleConfiguration: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2597,9 +2533,7 @@ node_types: cloudify.nodes.aws.s3.BucketTagging: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2626,10 +2560,7 @@ node_types: cloudify.nodes.aws.ec2.BaseType: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id - <<: *tags_property + <<: [*external_resource, *client_config, *resource_id, *tags_property] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2694,9 +2625,7 @@ node_types: cloudify.nodes.aws.ec2.VpcPeeringRequest: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2792,9 +2721,7 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleIngress: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2816,9 +2743,7 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleEgress: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -2901,10 +2826,7 @@ node_types: cloudify.nodes.aws.ec2.Instances: derived_from: cloudify.nodes.Compute properties: - <<: *external_resource - <<: *client_config - <<: *resource_id - <<: *tags_property + <<: [*external_resource, *client_config, *resource_id, *tags_property] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -2961,10 +2883,7 @@ node_types: cloudify.nodes.aws.ec2.SpotInstances: derived_from: cloudify.nodes.Compute properties: - <<: *external_resource - <<: *client_config - <<: *resource_id - <<: *tags_property + <<: [*external_resource, *client_config, *resource_id, *tags_property] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3064,10 +2983,7 @@ node_types: cloudify.nodes.aws.ec2.ElasticIP: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id - <<: *tags_property + <<: [*external_resource, *client_config, *resource_id, *tags_property] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3138,9 +3054,7 @@ node_types: cloudify.nodes.aws.ec2.NetworkAclEntry: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3162,9 +3076,7 @@ node_types: cloudify.nodes.aws.ec2.DHCPOptions: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3219,9 +3131,7 @@ node_types: cloudify.nodes.aws.ec2.VPNConnection: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3243,9 +3153,7 @@ node_types: cloudify.nodes.aws.ec2.VPNConnectionRoute: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3364,9 +3272,7 @@ node_types: cloudify.nodes.aws.ec2.TransitGatewayRoute: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3416,9 +3322,7 @@ node_types: cloudify.nodes.aws.ec2.Route: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3444,8 +3348,7 @@ node_types: type: boolean default: true description: indecates if external_resourc should be used - <<: *client_config - <<: *resource_id + <<: [*client_config, *resource_id] resource_config: description: > @@ -3468,9 +3371,7 @@ node_types: cloudify.nodes.aws.ec2.Tags: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3492,10 +3393,7 @@ node_types: cloudify.nodes.aws.ec2.EBSVolume: derived_from: cloudify.nodes.aws.ec2.BaseType properties: - <<: *external_resource - <<: *client_config - <<: *resource_id - <<: *device_name + <<: [*external_resource, *client_config, *resource_id, *device_name] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3524,9 +3422,7 @@ node_types: cloudify.nodes.aws.ec2.EBSAttachment: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3548,9 +3444,7 @@ node_types: cloudify.nodes.aws.autoscaling.Group: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3575,9 +3469,7 @@ node_types: cloudify.nodes.aws.autoscaling.LaunchConfiguration: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3599,9 +3491,7 @@ node_types: cloudify.nodes.aws.autoscaling.Policy: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3623,9 +3513,7 @@ node_types: cloudify.nodes.aws.autoscaling.LifecycleHook: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3647,9 +3535,7 @@ node_types: cloudify.nodes.aws.autoscaling.NotificationConfiguration: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3671,9 +3557,7 @@ node_types: cloudify.nodes.aws.cloudwatch.Alarm: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3695,9 +3579,7 @@ node_types: cloudify.nodes.aws.cloudwatch.Rule: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3719,9 +3601,7 @@ node_types: cloudify.nodes.aws.cloudwatch.Event: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3740,9 +3620,7 @@ node_types: cloudify.nodes.aws.cloudwatch.Target: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3764,9 +3642,7 @@ node_types: cloudify.nodes.aws.efs.FileSystem: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3788,9 +3664,7 @@ node_types: cloudify.nodes.aws.efs.MountTarget: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3812,9 +3686,7 @@ node_types: cloudify.nodes.aws.efs.FileSystemTags: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3836,9 +3708,7 @@ node_types: cloudify.nodes.aws.kms.CustomerMasterKey: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3866,9 +3736,7 @@ node_types: cloudify.nodes.aws.kms.Alias: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3890,9 +3758,7 @@ node_types: cloudify.nodes.aws.kms.Grant: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3914,9 +3780,7 @@ node_types: cloudify.nodes.aws.CloudFormation.Stack: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3955,9 +3819,7 @@ node_types: cloudify.nodes.aws.ecs.Cluster: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -3979,9 +3841,7 @@ node_types: cloudify.nodes.aws.ecs.Service: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4003,9 +3863,7 @@ node_types: cloudify.nodes.aws.ecs.TaskDefinition: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4044,9 +3902,7 @@ node_types: cloudify.nodes.aws.eks.Cluster: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -4086,9 +3942,7 @@ node_types: cloudify.nodes.aws.eks.NodeGroup: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] cloudify_tagging: description: an automatic tag to identify the ec2 instance type: boolean @@ -4122,9 +3976,7 @@ node_types: cloudify.nodes.aws.codepipeline.Pipeline: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4151,9 +4003,7 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPool: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4174,9 +4024,7 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPoolClient: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4197,9 +4045,7 @@ node_types: cloudify.nodes.aws.cognitoidp.IdentityProvider: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4220,9 +4066,7 @@ node_types: cloudify.nodes.aws.cognito.IdentityPool: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4243,9 +4087,7 @@ node_types: cloudify.nodes.aws.ecr.AuthenticationToken: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding @@ -4263,9 +4105,7 @@ node_types: cloudify.nodes.aws.ecr.Repository: derived_from: cloudify.nodes.Root properties: - <<: *external_resource - <<: *client_config - <<: *resource_id + <<: [*external_resource, *client_config, *resource_id] resource_config: description: > Configuration key-value data to be passed as-is to the corresponding diff --git a/v2_plugin.yaml b/v2_plugin.yaml index 6c8a7c89..7b3a440b 100644 --- a/v2_plugin.yaml +++ b/v2_plugin.yaml @@ -2,7 +2,7 @@ plugins: aws: executor: central_deployment_agent package_name: cloudify-aws-plugin - package_version: 3.2.3 + package_version: 3.2.4 data_types: cloudify.datatypes.swift.Connection: @@ -1107,7 +1107,7 @@ dsl_definitions: required: false default: {} external_resource: - use_external_resource: &id001 + use_external_resource: &id003 type: boolean default: false client_config: @@ -1115,7 +1115,7 @@ dsl_definitions: type: cloudify.datatypes.aws.ConnectionConfig required: false resource_id: - resource_id: &id003 + resource_id: &id001 type: string default: '' swift_config: @@ -1138,9 +1138,9 @@ node_types: cloudify.nodes.aws.dynamodb.Table: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.dynamodb.Table.config required: false @@ -1163,9 +1163,9 @@ node_types: cloudify.nodes.aws.iam.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.Group.config required: false @@ -1223,9 +1223,9 @@ node_types: cloudify.nodes.aws.iam.User: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.User.config required: false @@ -1248,9 +1248,9 @@ node_types: cloudify.nodes.aws.iam.Role: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 policy_arns: type: list default: [] @@ -1283,9 +1283,9 @@ node_types: cloudify.nodes.aws.iam.RolePolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.RolePolicy.config required: false @@ -1308,9 +1308,9 @@ node_types: cloudify.nodes.aws.iam.InstanceProfile: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.InstanceProfile.config required: false @@ -1333,9 +1333,9 @@ node_types: cloudify.nodes.aws.iam.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.iam.Policy.config required: false @@ -1358,9 +1358,9 @@ node_types: cloudify.nodes.aws.lambda.Function: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.lambda.Function.config required: false @@ -1402,9 +1402,9 @@ node_types: cloudify.nodes.aws.lambda.Permission: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.lambda.Permission.config required: false @@ -1434,9 +1434,9 @@ node_types: cloudify.nodes.aws.rds.Instance: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Instance.config required: false @@ -1473,9 +1473,9 @@ node_types: cloudify.nodes.aws.rds.InstanceReadReplica: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.InstanceReadReplica.config required: false @@ -1505,9 +1505,9 @@ node_types: cloudify.nodes.aws.rds.SubnetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.SubnetGroup.config required: false @@ -1537,9 +1537,9 @@ node_types: cloudify.nodes.aws.rds.OptionGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.OptionGroup.config required: false @@ -1562,9 +1562,9 @@ node_types: cloudify.nodes.aws.rds.Option: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Option.config required: false @@ -1580,9 +1580,9 @@ node_types: cloudify.nodes.aws.rds.ParameterGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.ParameterGroup.config required: false @@ -1612,9 +1612,9 @@ node_types: cloudify.nodes.aws.rds.Parameter: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.rds.Parameter.config required: false @@ -1630,9 +1630,9 @@ node_types: cloudify.nodes.aws.route53.HostedZone: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.route53.HostedZone.config required: false @@ -1674,9 +1674,9 @@ node_types: cloudify.nodes.aws.route53.RecordSet: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.route53.RecordSet.config required: false @@ -1706,9 +1706,9 @@ node_types: cloudify.nodes.aws.SQS.Queue: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SQS.Queue.config required: false @@ -1738,9 +1738,9 @@ node_types: cloudify.nodes.aws.SNS.Topic: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SNS.Topic.config required: false @@ -1770,9 +1770,9 @@ node_types: cloudify.nodes.aws.SNS.Subscription: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.SNS.Subscription.config required: false @@ -1809,9 +1809,9 @@ node_types: cloudify.nodes.aws.elb.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1851,9 +1851,9 @@ node_types: cloudify.nodes.aws.elb.Classic.LoadBalancer: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1893,9 +1893,9 @@ node_types: cloudify.nodes.aws.elb.Classic.HealthCheck: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1921,9 +1921,9 @@ node_types: cloudify.nodes.aws.elb.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1956,9 +1956,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Listener: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -1991,9 +1991,9 @@ node_types: cloudify.nodes.aws.elb.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2026,9 +2026,9 @@ node_types: cloudify.nodes.aws.elb.TargetGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2068,9 +2068,9 @@ node_types: cloudify.nodes.aws.elb.Classic.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2125,8 +2125,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucket: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.Bucket.config required: false @@ -2156,8 +2156,8 @@ node_types: cloudify.nodes.aws.s3.BaseBucketObject: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - resource_id: *id003 + resource_id: *id001 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketObject.config required: false @@ -2197,9 +2197,9 @@ node_types: cloudify.nodes.aws.s3.BucketPolicy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketPolicy.config required: false @@ -2229,9 +2229,9 @@ node_types: cloudify.nodes.aws.s3.BucketLifecycleConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketLifecycleConfiguration.config required: false @@ -2261,9 +2261,9 @@ node_types: cloudify.nodes.aws.s3.BucketTagging: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.s3.BucketTagging.config required: false @@ -2297,10 +2297,10 @@ node_types: cloudify.nodes.aws.ec2.BaseType: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2390,9 +2390,9 @@ node_types: cloudify.nodes.aws.ec2.VpcPeeringRequest: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VpcPeeringRequest.config required: false @@ -2505,9 +2505,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleIngress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SecurityGroupRules.config required: false @@ -2525,9 +2525,9 @@ node_types: cloudify.nodes.aws.ec2.SecurityGroupRuleEgress: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SecurityGroupRules.config required: false @@ -2646,10 +2646,10 @@ node_types: cloudify.nodes.aws.ec2.Instances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -2723,10 +2723,10 @@ node_types: cloudify.nodes.aws.ec2.SpotInstances: derived_from: cloudify.nodes.Compute properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.SpotInstances.config required: false @@ -2850,10 +2850,10 @@ node_types: cloudify.nodes.aws.ec2.ElasticIP: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 Tags: *id008 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.ElasticIP.config required: false @@ -2947,9 +2947,9 @@ node_types: cloudify.nodes.aws.ec2.NetworkAclEntry: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.NetworkAclEntry.config required: false @@ -2979,9 +2979,9 @@ node_types: cloudify.nodes.aws.ec2.DHCPOptions: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.DHCPOptions.config required: false @@ -3068,9 +3068,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnection: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VPNConnection.config required: false @@ -3100,9 +3100,9 @@ node_types: cloudify.nodes.aws.ec2.VPNConnectionRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.VPNConnectionRoute.config required: false @@ -3277,9 +3277,9 @@ node_types: cloudify.nodes.aws.ec2.TransitGatewayRoute: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.TransitGatewayRoute.config required: false @@ -3353,9 +3353,9 @@ node_types: cloudify.nodes.aws.ec2.Route: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.Route.config required: false @@ -3385,8 +3385,8 @@ node_types: cloudify.nodes.aws.ec2.Image: derived_from: cloudify.nodes.Root properties: + resource_id: *id001 client_config: *id002 - resource_id: *id003 use_external_resource: type: boolean default: true @@ -3419,9 +3419,9 @@ node_types: cloudify.nodes.aws.ec2.Tags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.Tags.config required: false @@ -3451,10 +3451,10 @@ node_types: cloudify.nodes.aws.ec2.EBSVolume: derived_from: cloudify.nodes.aws.ec2.BaseType properties: - use_external_resource: *id001 - client_config: *id002 - resource_id: *id003 device_name: *id010 + resource_id: *id001 + client_config: *id002 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.EBSVolume.config required: false @@ -3494,9 +3494,9 @@ node_types: cloudify.nodes.aws.ec2.EBSAttachment: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ec2.EBSAttachment.config required: false @@ -3526,9 +3526,9 @@ node_types: cloudify.nodes.aws.autoscaling.Group: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.Group.config required: false @@ -3565,9 +3565,9 @@ node_types: cloudify.nodes.aws.autoscaling.LaunchConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.LaunchConfiguration.config required: false @@ -3597,9 +3597,9 @@ node_types: cloudify.nodes.aws.autoscaling.Policy: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.Policy.config required: false @@ -3629,9 +3629,9 @@ node_types: cloudify.nodes.aws.autoscaling.LifecycleHook: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.LifecycleHook.config required: false @@ -3661,9 +3661,9 @@ node_types: cloudify.nodes.aws.autoscaling.NotificationConfiguration: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.autoscaling.NotificationConfiguration.config required: false @@ -3693,9 +3693,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Alarm: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Alarm.config required: false @@ -3725,9 +3725,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Rule: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Rule.config required: false @@ -3757,9 +3757,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Event: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Event.config required: false @@ -3782,9 +3782,9 @@ node_types: cloudify.nodes.aws.cloudwatch.Target: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cloudwatch.Target.config required: false @@ -3814,9 +3814,9 @@ node_types: cloudify.nodes.aws.efs.FileSystem: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.FileSystem.config required: false @@ -3846,9 +3846,9 @@ node_types: cloudify.nodes.aws.efs.MountTarget: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.MountTarget.config required: false @@ -3878,9 +3878,9 @@ node_types: cloudify.nodes.aws.efs.FileSystemTags: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.efs.FileSystemTags.config required: false @@ -3910,9 +3910,9 @@ node_types: cloudify.nodes.aws.kms.CustomerMasterKey: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.CustomerMasterKey.config required: false @@ -3956,9 +3956,9 @@ node_types: cloudify.nodes.aws.kms.Alias: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.Alias.config required: false @@ -3988,9 +3988,9 @@ node_types: cloudify.nodes.aws.kms.Grant: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.kms.Grant.config required: false @@ -4020,9 +4020,9 @@ node_types: cloudify.nodes.aws.CloudFormation.Stack: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.CloudFormation.Stack.config required: false @@ -4067,9 +4067,9 @@ node_types: cloudify.nodes.aws.ecs.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.Cluster.config required: false @@ -4099,9 +4099,9 @@ node_types: cloudify.nodes.aws.ecs.Service: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.Service.config required: false @@ -4131,9 +4131,9 @@ node_types: cloudify.nodes.aws.ecs.TaskDefinition: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ECS.TaskDefinition.config required: false @@ -4171,9 +4171,9 @@ node_types: cloudify.nodes.aws.eks.Cluster: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -4221,9 +4221,9 @@ node_types: cloudify.nodes.aws.eks.NodeGroup: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 cloudify_tagging: type: boolean default: true @@ -4268,9 +4268,9 @@ node_types: cloudify.nodes.aws.codepipeline.Pipeline: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.codepipeline.Pipeline.config interfaces: @@ -4307,9 +4307,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.UserPool.config interfaces: @@ -4338,9 +4338,9 @@ node_types: cloudify.nodes.aws.cognitoidp.UserPoolClient: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.UserPoolClient.config interfaces: @@ -4369,9 +4369,9 @@ node_types: cloudify.nodes.aws.cognitoidp.IdentityProvider: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognitoidp.IdentityProvider.config interfaces: @@ -4400,9 +4400,9 @@ node_types: cloudify.nodes.aws.cognito.IdentityPool: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.cognito.IdentityPool.config interfaces: @@ -4431,9 +4431,9 @@ node_types: cloudify.nodes.aws.ecr.AuthenticationToken: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ecr.AuthenticationToken.config interfaces: @@ -4455,9 +4455,9 @@ node_types: cloudify.nodes.aws.ecr.Repository: derived_from: cloudify.nodes.Root properties: - use_external_resource: *id001 + resource_id: *id001 client_config: *id002 - resource_id: *id003 + use_external_resource: *id003 resource_config: type: cloudify.datatypes.aws.ecr.Repository.config interfaces: