From a4c137eaa4d6f5f14c30df3d2595384b81e8f6df Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 20:05:05 +0300 Subject: [PATCH 01/15] FIX handle credential input handling --- .../amazon/aws/cloudformation/examples/launch_stack.sl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index f298275b15..0ec6976d9d 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -93,8 +93,8 @@ flow: - region - stack_name - template_body - - parameters - - capabilities + - parameters: '${template_parameters}' + - capabilities: '${stack_capabilities}' - proxy_host - proxy_port - proxy_username @@ -111,6 +111,7 @@ flow: cloudformation.list_stacks: - identity - credential: + value: '${access_key}' sensitive: true - proxy_host - proxy_port @@ -127,6 +128,7 @@ flow: cloudformation.get_stack_details: - identity - credential: + value: '${access_key}' sensitive: true - region - stack_name From 40fabaeb1bdb4852f187ced3eefca86b764cdb96 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 20:17:55 +0300 Subject: [PATCH 02/15] credential input should tak value from accessKey --- .../amazon/aws/cloudformation/examples/launch_stack.sl | 1 + 1 file changed, 1 insertion(+) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 0ec6976d9d..93350cb256 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -89,6 +89,7 @@ flow: cloudformation.create_stack: - identity - credential: + value: '${access_key}' sensitive: true - region - stack_name From 0c4e057b74c1ead36c86dd794ab3724a00003bf3 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 20:27:39 +0300 Subject: [PATCH 03/15] handle access key id --- .../amazon/aws/cloudformation/examples/launch_stack.sl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 93350cb256..3ff8694375 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -87,7 +87,8 @@ flow: - create_stack: do: cloudformation.create_stack: - - identity + - identity: + value: '${access_key_id}' - credential: value: '${access_key}' sensitive: true @@ -110,7 +111,8 @@ flow: - list_stacks: do: cloudformation.list_stacks: - - identity + - identity: + value: '${access_key_id}' - credential: value: '${access_key}' sensitive: true @@ -127,7 +129,8 @@ flow: - get_stack_details: do: cloudformation.get_stack_details: - - identity + - identity: + value: '${access_key_id}' - credential: value: '${access_key}' sensitive: true From 1f1c3c9137e6ca7d745ac5443048dd23583f1adc Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 21:10:53 +0300 Subject: [PATCH 04/15] add graphical data --- .../cloudformation/examples/launch_stack.sl | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 3ff8694375..5b78133a5c 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -186,4 +186,46 @@ flow: - LESS_THAN: sleep results: - FAILURE - - SUCCESS \ No newline at end of file + - SUCCESS + +extensions: + graph: + steps: + create_stack: + x: 71 + y: 106 + list_stacks: + x: 659 + y: 107 + navigate: + 40f99d8a-14df-ee1e-08fa-2150abef743d: + targetId: 9b31debc-5211-7ae2-d870-fa22325e37a9 + port: SUCCESS + get_stack_details: + x: 280 + y: 106 + is_stack_created: + x: 494 + y: 99 + sleep: + x: 281 + y: 280 + add_numbers: + x: 462 + y: 281 + check_retry: + x: 458 + y: 433 + navigate: + 9675d7e4-57c4-13b5-7a01-dee957d1d14b: + targetId: 3aa9d9ea-1ecd-b4d8-106c-f95ab0ef5472 + port: GREATER_THAN + results: + FAILURE: + 3aa9d9ea-1ecd-b4d8-106c-f95ab0ef5472: + x: 651 + y: 423 + SUCCESS: + 9b31debc-5211-7ae2-d870-fa22325e37a9: + x: 839 + y: 113 \ No newline at end of file From 6a531dbe2262293ddd4e3b246b4ebaa3f7610edc Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 21:31:43 +0300 Subject: [PATCH 05/15] proxy pwd --- .../amazon/aws/cloudformation/examples/launch_stack.sl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 5b78133a5c..0f4dde9796 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -101,6 +101,7 @@ flow: - proxy_port - proxy_username - proxy_password: + value: '${proxy_password}' sensitive: true publish: - retry_count: '0' @@ -120,6 +121,7 @@ flow: - proxy_port - proxy_username - proxy_password: + value: '${proxy_password}' sensitive: true - region navigate: @@ -140,6 +142,7 @@ flow: - proxy_port - proxy_username - proxy_password: + value: '${proxy_password}' sensitive: true publish: - stack_status From 383bb46d6afcc07c99fdccde861935447e94ede0 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Thu, 14 Jun 2018 21:48:53 +0300 Subject: [PATCH 06/15] description update --- content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl | 2 +- .../amazon/aws/cloudformation/examples/launch_stack.sl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl index 3a4c53c932..2823c76899 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl @@ -35,7 +35,7 @@ #! @input region: AWS region where the stack will be created. #! @input stack_name: AWS stack name to be created. #! @input template_body: AWS template body. -#! @input parameters: AWS template parameters in key:value format. Every key:value pair should be on its own line. +#! @input parameters: AWS template parameters in key=value format. Every key:value pair should be on its own line. #! @input capabilities: A list of values that you must specify before AWS CloudFormation can create certain stacks. Some stack templates might include resources that can affect permissions in your AWS account, for example, by creating new AWS Identity and Access Management (IAM) users. or those stacks, you must explicitly acknowledge their capabilities by specifying this parameter. #! Valid values: CAPABILITY_IAM, CAPABILITY_NAMED_IAM #! diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 0f4dde9796..521bf957bb 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -37,7 +37,7 @@ #! @input stack_capabilities: A list of values that you must specify before AWS CloudFormation can create certain stacks. Some stack templates might include resources that can affect permissions in your AWS account, for example, by creating new AWS Identity and Access Management (IAM) users. or those stacks, you must explicitly acknowledge their capabilities by specifying this parameter. #! Valid values: CAPABILITY_IAM, CAPABILITY_NAMED_IAM #! @input template_body: AWS template body. -#! @input template_parameters: AWS template parameters in key:value format. Every key:value pair should be on its own line. +#! @input template_parameters: AWS template parameters in key=value format. Every key:value pair should be on its own line. #! @input sleep_time: sleep time in seconds between retries #! @input retries_max: maximum number of retries before giving up #! From add64df52035a39be1e5bfa681b35306730b8ad4 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 6 Jul 2018 15:13:44 +0300 Subject: [PATCH 07/15] added outputs --- .../amazon/aws/cloudformation/examples/launch_stack.sl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl index 521bf957bb..a32a51410c 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/examples/launch_stack.sl @@ -37,7 +37,7 @@ #! @input stack_capabilities: A list of values that you must specify before AWS CloudFormation can create certain stacks. Some stack templates might include resources that can affect permissions in your AWS account, for example, by creating new AWS Identity and Access Management (IAM) users. or those stacks, you must explicitly acknowledge their capabilities by specifying this parameter. #! Valid values: CAPABILITY_IAM, CAPABILITY_NAMED_IAM #! @input template_body: AWS template body. -#! @input template_parameters: AWS template parameters in key=value format. Every key:value pair should be on its own line. +#! @input template_parameters: AWS template parameters in key=value format. Example: ${'param1=' + value1 + '\\n\\\nparam2=' + value2 + '\\n\\\nparam3=' + value3} #! @input sleep_time: sleep time in seconds between retries #! @input retries_max: maximum number of retries before giving up #! @@ -65,7 +65,6 @@ flow: required: false - template_body: '' - template_parameters: - default: "${'param1=' + value1 + '\\n\\\nparam2=' + value2 + '\\n\\\nparam3=' + value3}" required: false - proxy_host: required: false @@ -82,6 +81,11 @@ flow: - retries_max: default: '10' required: false + outputs: + - return_result + - stack_outputs + - stack_resources + - exception workflow: - create_stack: @@ -146,6 +150,8 @@ flow: sensitive: true publish: - stack_status + - stack_outputs + - stack_resources navigate: - SUCCESS: is_stack_created - FAILURE: on_failure From 8d090ed39155c38f2c7b4cef552fb68c47872132 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:04:34 +0200 Subject: [PATCH 08/15] Update create_stack.sl --- .../io/cloudslang/amazon/aws/cloudformation/create_stack.sl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl index 2823c76899..9c33d3450f 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl @@ -109,7 +109,7 @@ operation: sensitive: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.18' + gav: 'io.cloudslang.content:cs-amazon:1.0.22' class_name: io.cloudslang.content.amazon.actions.cloudformation.CreateStackAction method_name: execute @@ -120,4 +120,4 @@ operation: results: - SUCCESS: ${returnCode == "0"} - - FAILURE \ No newline at end of file + - FAILURE From 5f51ddb3b1c5db504d7bacf4ad5b0d49678c6eb3 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:04:55 +0200 Subject: [PATCH 09/15] Update delete_stack.sl --- .../io/cloudslang/amazon/aws/cloudformation/delete_stack.sl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl index e782b98116..42e50247df 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl @@ -98,7 +98,7 @@ operation: sensitive: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.18' + gav: 'io.cloudslang.content:cs-amazon:1.0.22' class_name: io.cloudslang.content.amazon.actions.cloudformation.DeleteStackAction method_name: execute @@ -109,4 +109,4 @@ operation: results: - SUCCESS: ${returnCode == "0"} - - FAILURE \ No newline at end of file + - FAILURE From e8db632aeed3f6234d028d80442f623e423e3405 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:05:09 +0200 Subject: [PATCH 10/15] Update get_stack_details.sl --- .../cloudslang/amazon/aws/cloudformation/get_stack_details.sl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl b/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl index 75726df35b..ec5d34b2dd 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl @@ -87,7 +87,7 @@ operation: private: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.18' + gav: 'io.cloudslang.content:cs-amazon:1.0.22' class_name: io.cloudslang.content.amazon.actions.cloudformation.GetStackDetailsAction method_name: execute From d0bffcf3207b98cb481841dc61bc3f3e22ea1e52 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:05:23 +0200 Subject: [PATCH 11/15] Update list_stacks.sl --- .../io/cloudslang/amazon/aws/cloudformation/list_stacks.sl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl b/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl index 225d199bf1..017bfc4624 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl @@ -92,7 +92,7 @@ operation: - region java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.18' + gav: 'io.cloudslang.content:cs-amazon:1.0.22' class_name: io.cloudslang.content.amazon.actions.cloudformation.ListStacksAction method_name: execute @@ -103,4 +103,4 @@ operation: results: - SUCCESS: ${returnCode == "0"} - - FAILURE \ No newline at end of file + - FAILURE From 0cd9c591d92867c4d35012216e6c320643329546 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:06:00 +0200 Subject: [PATCH 12/15] Update create_stack.sl --- content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl index 9c33d3450f..1deb3229ed 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/create_stack.sl @@ -109,7 +109,7 @@ operation: sensitive: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.22' + gav: 'io.cloudslang.content:cs-amazon:1.0.27' class_name: io.cloudslang.content.amazon.actions.cloudformation.CreateStackAction method_name: execute From aa12dd6ac6a41515c0d1daf3ddcf0a3567c474bd Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:06:11 +0200 Subject: [PATCH 13/15] Update delete_stack.sl --- content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl b/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl index 42e50247df..ba44ef5b85 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/delete_stack.sl @@ -98,7 +98,7 @@ operation: sensitive: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.22' + gav: 'io.cloudslang.content:cs-amazon:1.0.27' class_name: io.cloudslang.content.amazon.actions.cloudformation.DeleteStackAction method_name: execute From 7521fbb67f7418da0989f98ac29145037b4c41de Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:06:22 +0200 Subject: [PATCH 14/15] Update get_stack_details.sl --- .../cloudslang/amazon/aws/cloudformation/get_stack_details.sl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl b/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl index ec5d34b2dd..5f8ef374b0 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/get_stack_details.sl @@ -87,7 +87,7 @@ operation: private: true java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.22' + gav: 'io.cloudslang.content:cs-amazon:1.0.27' class_name: io.cloudslang.content.amazon.actions.cloudformation.GetStackDetailsAction method_name: execute From 762f6c90ae18a1468708a2ad03d4cd622e3d5448 Mon Sep 17 00:00:00 2001 From: Lucian Revnic Date: Fri, 25 Jan 2019 17:06:35 +0200 Subject: [PATCH 15/15] Update list_stacks.sl --- content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl b/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl index 017bfc4624..eaf591263d 100644 --- a/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl +++ b/content/io/cloudslang/amazon/aws/cloudformation/list_stacks.sl @@ -92,7 +92,7 @@ operation: - region java_action: - gav: 'io.cloudslang.content:cs-amazon:1.0.22' + gav: 'io.cloudslang.content:cs-amazon:1.0.27' class_name: io.cloudslang.content.amazon.actions.cloudformation.ListStacksAction method_name: execute