Merge pull request #5 from wild-devops/develop

v1.3.0

Author: wild-devops

.github/workflows/tests.yml

@@ -11,4 +11,5 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Run tests
-      run: pwsh -NoLogo -NoProfile -File ./tests/pwshake.Tests.ps1
+      run: ./tests/pwshake.Tests.ps1
+      shell: pwsh

.gitignore

@@ -1,2 +1,3 @@
 *.log
-.*/
+.*/
+*.xml

README.md

@@ -0,0 +1,10 @@
+# Simple task invokation and attributes interpolation
+attributes:
+  hello_to: PWSHAKE
+
+tasks:
+  say_hello:
+  - powershell: Write-Host "Hello {{hello_to}}!"
+
+invoke_tasks:
+- say_hello

doc/config.md

@@ -0,0 +1,14 @@
+attributes:
+  hello_to: PWSHAKE
+
+# Simple template substitution
+templates:
+  echo:
+    powershell: Write-Host "$($step.echo)"
+
+tasks:
+  say_hello:
+  - echo: "Hello {{hello_to}}!"
+
+invoke_tasks:
+- say_hello

doc/invoke_tasks.md

@@ -0,0 +1,11 @@
+attributes:
+  pwshake_verbosity: Normal # Try to change with any of: Error, Warning, Normal, Verbose, Debug
+  hello_to: PWSHAKE
+
+tasks:
+  say_hello:
+  # 'echo' template is now included in the built-in templates
+  - echo: "Hello {{hello_to}}!"
+
+invoke_tasks:
+- say_hello

doc/resources.md

@@ -0,0 +1,5 @@
+attributes:
+  a:
+    b:
+      c: d
+  e: "{{a.b.c}}"

doc/templates.md

@@ -0,0 +1,7 @@
+attributes:
+  a: "{{b}}"
+  b: "{{c}}"
+  c: "d"
+  env_name: "{{$env:HOSTNAME}}"
+  override_to: "{{c}}ev"
+  win_fqdn: "{{env_name}}-windows.shake.{{override_to}}"

examples/1.hello/v1.0/my_pwshake.yaml

@@ -1,8 +1,6 @@
 # Includes
 includes:
   - attributes.json
-  - hello_pwshake.yaml
-  - empty_tasks_pwshake.yaml
 
 # Attributes overrides
 attributes_overrides:

examples/1.hello/v1.2/my_pwshake.yaml

@@ -1,21 +1,16 @@
 # Tasks declared
 roles:
-  update_chef:
-    - powershell: Write-Host "Here chef step."
-  deploy_role:    
-    - powershell: Write-Host "Deploy role $($env:shake_application_role)"
-    - powershell: Write-Host "Here firewall rules for $($env:shake_application_role)"
   role_webui:
-    - powershell: $env:shake_application_role = 'webui'
+    - powershell: $script:shake_application_role = 'webui'
     - invoke_tasks:
       - deploy_role
   role_api:
-    - powershell: $env:shake_application_role = 'api'
+    - powershell: $script:shake_application_role = 'api'
     - invoke_tasks:
       - deploy_role
   role_static:
     scripts:
-    - powershell: $env:shake_application_role = 'static'
+    - powershell: $script:shake_application_role = 'static'
     - in: attributes_overrides
       pwsh: |
         Get-Location
@@ -32,6 +27,11 @@ roles:
         - role_api
         - role_static
       - pwsh: Write-Host "{{$([System.Guid]::Empty)}}"
+  update_chef:
+    - powershell: Write-Host "Here chef step."
+  deploy_role:    
+    - powershell: Write-Host "Deploy role $shake_application_role"
+    - powershell: Write-Host "Here firewall rules for $shake_application_role"
 
 # Tasks to execute
 invoke_tasks:

examples/1.hello/v1.3/my_pwshake.yaml

@@ -1,5 +1,6 @@
 attributes:
-  py_arg: 0
+  py_arg: 42
+  pwsh_arg:
 
 includes:
 - module.json
@@ -25,7 +26,7 @@ tasks:
     pwsh: |
       Invoke-Command -ScriptBlock {
         if ($true) {
-          & '{{pwshake_path}}/call_throw.ps1' 'pwshake{{py_arg}}'
+          & '{{pwshake_path}}/call_throw.ps1' 'dir{{pwsh_arg}}'
         }
       } -InformationAction Ignore -ErrorAction Stop
 

examples/2.attributes/v1.0/attributes_hierarchy_pwshake.yaml

@@ -1,5 +1,5 @@
 includes:
-- templates/templates.yaml
+- templates/dotnet.yaml
 
 attributes:
   configuration: Release

examples/2.attributes/v1.0/attributes_interpolation_pwshake.yaml

@@ -1,5 +1,5 @@
 includes:
-- python.yaml
+- templates/python.yaml
 
 tasks:
   test_python_template:
@@ -9,8 +9,7 @@ tasks:
   - python:
       inline: print('Hello pwshake!');
   - python:
-      file: |
-        {{pwshake_path}}/hello.py again
+      file: '{{pwshake_path}}/hello.py again'
   - python: '{{pwshake_path}}/hello.py twice'
 
 invoke_tasks:

examples/empty_tasks_pwshake.yaml renamed to examples/3.tasks/v1.0/empty_tasks_pwshake.yaml

@@ -0,0 +1,13 @@
+templates:
+  dotnet:
+    command:
+    options: --version
+    powershell: |
+      $cmd = "dotnet"
+      if ($step.command) {
+        $cmd += " $($step.command)"
+      }
+      if ($step.options) {
+        $cmd += " $($step.options)"
+      }
+      $cmd | Cmd-Shell

examples/attributes.json renamed to examples/4.complex/v1.0/attributes.json

@@ -0,0 +1,8 @@
+templates:
+  file:
+    path:
+    content:
+    encoding: UTF8
+    powershell: |
+      if (-not (Test-Path $step.path)) { New-Item -ItemType File -Path $step.path }
+      Set-Content -Path (Resolve-Path $step.path) -Value $step.content -Encoding $step.encoding -Force

examples/attributes_overrides/local.yaml renamed to examples/4.complex/v1.0/attributes_overrides/local.yaml

@@ -1,10 +1,4 @@
 templates:
-  dotnet:
-    command:
-    options: --version
-    powershell: |
-      "dotnet $($step.command) $($step.options)" | Cmd-Shell
-
   transform_xml_file:
     path:
     appends:

examples/attributes_overrides/prod.yaml renamed to examples/4.complex/v1.0/attributes_overrides/prod.yaml

@@ -0,0 +1,33 @@
+includes:
+- templates/file.yaml
+- templates/transform_xml_file.yaml
+
+tasks:
+  transform_xml_config:
+  - file:
+      path: '{{pwshake_path}}/test.xml'
+      content: |
+        <xml>
+          <one />
+          <two three="wrong" />
+          <six seven="wrong" />
+        </xml>
+  - pwsh: |
+      Write-Host "Initial content:"
+      Get-Content {{pwshake_path}}/test.xml -Raw
+  - transform_xml_file:
+      path: test.xml
+      appends:
+        '/xml': '<five six="seven" />'
+        '/xml/five[1]': '<eight nine="ten" />'
+      updates:
+        '/xml/two/@three': 'four'
+      removes:
+        '/xml/six[@seven="wrong"]':
+  - pwsh: |
+      Write-Host "Transform result:"
+      Get-Content {{pwshake_path}}/test.xml -Raw
+      Remove-Item {{pwshake_path}}/test.xml -Force
+
+invoke_tasks:
+- transform_xml_config

examples/attributes_overrides/stage.yaml renamed to examples/4.complex/v1.0/attributes_overrides/stage.yaml

@@ -0,0 +1,16 @@
+attributes:
+  test_path: '{{pwshake_path}}/hello.json'
+
+tasks:
+  test_new_actions:
+  - echo: 'Creating: {{test_path}}'
+  - file:
+      path: '{{test_path}}'
+      content: '$(@{"I"="m";"a"="test"} | ConvertTo-Json)'
+  - echo: 'Checking: {{test_path}}'
+  - echo: '$(Get-Content {{test_path}} -Raw)'
+  - echo: 'Removing: {{test_path}}'
+  - pwsh: Remove-Item {{test_path}} -Force
+
+invoke_tasks:
+- test_new_actions

examples/attributes_overrides/test.yaml renamed to examples/4.complex/v1.0/attributes_overrides/test.yaml

@@ -0,0 +1,4 @@
+# Added Yaml parser errors handling
+corrupted:
+  step:
+  step: