From f2caaaf3cd43a89ca7b8a849f048ceedf1524667 Mon Sep 17 00:00:00 2001
From: Maksim Milykh <34083943+aidmax@users.noreply.github.com>
Date: Sat, 13 May 2023 06:34:30 +0300
Subject: [PATCH] Add merge and archive options (#17)

* Add merge and archive options

* Update docs

* Add tests

* Change versioning to major
---
 .github/workflows/test.yml |  3 +++
 README.md                  |  4 +++-
 action.yml                 | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9abbee1..f4ae2a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,3 +18,6 @@ jobs:
           key: ${{ secrets.STZR_API_KEY }}
           secret: ${{ secrets.STZR_API_SECRET }}
           workspace: ./tests/workspace.dsl
+          url: https://api.structurizr.com
+          merge: false
+          archive: false
diff --git a/README.md b/README.md
index adc69eb..5377283 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Run structurizr-cli action
-        uses: aidmax/structurizr-cli-action@v0.2.1
+        uses: aidmax/structurizr-cli-action@v1
         id: test
         with:
           id: # The workspace ID (required)
@@ -43,6 +43,8 @@ jobs:
           # optional parameters
           url: # The Structurizr API URL (optional; defaults to https://api.structurizr.com)
           passphrase: # The passphrase to use (optional; only required if client-side encryption enabled on the workspace)
+          merge: # Whether to merge layout information from the remote workspace (optional: defaults to true)
+          archive: # Whether to store the previous version of the remote workspace (optional; default to true)
 ```
 
 ## Details
diff --git a/action.yml b/action.yml
index ca4b1f0..23ebc0d 100644
--- a/action.yml
+++ b/action.yml
@@ -30,6 +30,12 @@ inputs:
   passphrase:
     description: 'The passphrase to use (optional; only required if client-side encryption enabled on the workspace)'
     required: false
+  merge:
+    description: 'Whether to merge layout information from the remote workspace (optional: defaults to true)'
+    required: false
+  archive:
+    description: 'Whether to store the previous version of the remote workspace (optional; default to true)'
+    required: false
 runs:
   using: 'docker'
   image: 'docker://ghcr.io/aidmax/structurizr-cli-docker:latest'
@@ -47,3 +53,7 @@ runs:
     - ${{ inputs.url }}
     - '-passphrase'
     - ${{ inputs.passphrase }}
+    - '-merge'
+    - ${{ inputs.merge }}
+    - '-archive'
+    - ${{ inputs.archive }}