fix: encrypted session handling

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.18
+FROM golang:1.22
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -20,7 +20,7 @@ COPY .devcontainer/install-powershell.sh /tmp/install/
 
 # Configure apt, install packages and tools
 RUN /tmp/install/install-powershell.sh \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     #
     # Update and install packages
     #
@@ -88,7 +88,7 @@ RUN /tmp/install/install-powershell.sh \
     # Install bash tools
     # https://github.com/bats-core/bats-core
     && npm install -g bats \
-    && apt-get install -y jq bash-completion asciinema \
+    && apt-get install -y vim jq bash-completion asciinema \
     #
     # Fish shell
     && apt-get install -y fish zsh \
@@ -121,14 +121,8 @@ RUN chown -R $USER_UID:$USER_GID /home/$USERNAME \
     && chsh -s /bin/zsh $USERNAME
 COPY tools/asciinema/config /home/$USERNAME/.config/asciinema/
 
-# Install powershell dependencies
+# Install shell dependencies
 USER $USERNAME
-#RUN pwsh -Command "Install-Module -Name platyPS -Scope CurrentUser -Force" \
-#   && pwsh -Command "Install-Module -Name Pester -Scope CurrentUser -MinimumVersion '5.0.0' -Force"
-    #
-    # create symlink to c8y
-#    && mkdir -p /workspaces/go-c8y-cli/tools/PSc8y/dist/PSc8y/Dependencies/ \
-#    && ln -s /workspaces/go-c8y-cli/tools/PSc8y/dist/PSc8y/Dependencies/c8y.linux /usr/local/bin/c8y
 
 # Install oh-my-zsh
 RUN curl -sSfL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh -s -- "" --unattended 2>&1 \
@@ -144,25 +138,24 @@ RUN echo "autoload -U compinit; compinit -i" | sudo tee -a /home/$USERNAME/.zshr
     #
     # fish config
     && sudo mkdir -p /home/$USERNAME/.config/fish/
-    # && echo "c8y completion fish | source" >> /home/$USERNAME/.config/fish/config.fish
-    # && echo "source ~/c8y.plugin.fish" >> /home/$USERNAME/.config/fish/config.fish
 
 # CI/CD tools
 RUN cd /tmp \
     && command -v task || sudo /usr/local/go/bin/go install github.com/go-task/task/v3/cmd/task@latest \
     && sudo cp /root/go/bin/task /usr/local/bin/ \
     && sudo /usr/local/go/bin/go install github.com/goreleaser/goreleaser@latest \
-    && sudo cp /root/go/bin/goreleaser /usr/local/bin/ \
-    && curl -fL https://getcli.jfrog.io | sudo sh \
-    && sudo chmod a+x jfrog \
-    && sudo mv jfrog /usr/local/bin/
+    && sudo cp /root/go/bin/goreleaser /usr/local/bin/
+
+# Fix gopath permissions for non-root user
+RUN sudo chown -R "$USERNAME:$USERNAME" /go
 
 # Update this to "on" or "off" as appropriate
 ENV GO111MODULE=auto
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 # Change default location of cumulocity profiles
+ENV C8Y_HOME=/workspaces/go-c8y-cli/.go-c8y-cli
 ENV C8Y_SESSION_HOME=/workspaces/go-c8y-cli/.cumulocity
 
 # Switch back to dialog for any ad-hoc use of apt-get

.devcontainer/devcontainer.json

@@ -67,7 +67,7 @@
 	],
 
 	// Install powershell module dependencies for tests etc.
-	"postCreateCommand": "sudo chown -R vscode /home/vscode",
+	"postCreateCommand": "task checkout-addons",
 
 	// Comment out the next line to run as root
 	"remoteUser": "vscode"

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
   push:
-    branches: [ master, main, next ]
+    branches: [ master, main, next, v2 ]
     tags-ignore:
       - 'v*'
     paths-ignore:
@@ -11,60 +11,62 @@ on:
       - test/*.go
 
   pull_request:
-    branches: [ master, main, next ]
+    branches: [ master, main, next, v2 ]
 
 jobs:
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.22
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.18
-    - name: Use Node.js 14
-      uses: actions/setup-node@v1
+        go-version: "1.22"
+    - name: Use Node.js
+      uses: actions/setup-node@v4
       with:
-        node-version: 14
+        node-version: '20'
 
     - name: install tooling
       run: go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Install GoReleaser
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v5
       with:
-        version: latest
+        version: '~> v1'
         install-only: true
 
     - name: Install Task
-      uses: arduino/setup-task@v1
+      uses: arduino/setup-task@v2
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build cli
-      run: task build_powershell build-snapshot
+      run: task build-powershell build-snapshot
       shell: bash
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: c8y.windows.amd64
         path: dist/windows_windows_amd64_v1/bin/c8y*
         if-no-files-found: error
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: c8y.linux.amd64
         path: dist/linux_linux_amd64_v1/bin/c8y*
         if-no-files-found: error
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: c8y.macos.amd64
-        path: dist/macos_darwin_amd64_v1/bin/c8y*
+        path: dist/macOS_darwin_amd64_v1/bin/c8y*
         if-no-files-found: error
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: PSc8y Module
         path: output_pwsh/PSc8y/
@@ -80,27 +82,31 @@ jobs:
       C8Y_USER: ${{ secrets.C8Y_USER }}
       C8Y_USERNAME: ${{ secrets.C8Y_USER }}
       C8Y_PASSWORD: ${{ secrets.C8Y_PASSWORD }}
+      DEVICE_BOOTSTRAP_USER: ${{ secrets.DEVICE_BOOTSTRAP_USER }}
+      DEVICE_BOOTSTRAP_PASSWORD: ${{ secrets.DEVICE_BOOTSTRAP_PASSWORD }}
 
       # Max timeout for each request (in milliseconds)
       C8Y_SETTINGS_DEFAULTS_TIMEOUT: 30000
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.22
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.18
+        go-version: "1.22"
 
     - name: Install Task
-      uses: arduino/setup-task@v1
+      uses: arduino/setup-task@v2
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       id: download
       with:
         name: c8y.linux.amd64
@@ -127,54 +133,58 @@ jobs:
       C8Y_TENANT: ${{ secrets.C8Y_TENANT }}
       C8Y_USER: ${{ secrets.C8Y_USER }}
       C8Y_PASSWORD: ${{ secrets.C8Y_PASSWORD }}
+      DEVICE_BOOTSTRAP_USER: ${{ secrets.DEVICE_BOOTSTRAP_USER }}
+      DEVICE_BOOTSTRAP_PASSWORD: ${{ secrets.DEVICE_BOOTSTRAP_PASSWORD }}
 
       # Max timeout for each request (in milliseconds)
       C8Y_SETTINGS_DEFAULTS_TIMEOUT: 30000
 
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04]
+        os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.22
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.18
+        go-version: "1.22"
 
     - name: Install Task
-      uses: arduino/setup-task@v1
+      uses: arduino/setup-task@v2
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build powershell module
-      run: task build_powershell build-snapshot
+      run: task build-powershell build-snapshot
       shell: bash
 
     - name: Test powershell module
       if: ${{ true }}
-      run: task test_powershell test_powershell_sessions
+      run: task test-powershell
       shell: bash
       timeout-minutes: 30
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: test-results-${{ matrix.os }}
         path: tools/PSc8y/reports/*.xml
 
   publish-test-results:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: [test-pwsh]
     # Disabled as pester does not support junit reports (only nunit)
     if: always() && false
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04]
+        os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Get test results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: test-results-${{ matrix.os }}
           path: test-results-${{ matrix.os }}

.github/workflows/publish-linux-packages.yml

@@ -27,33 +27,35 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.CR_PAT }}
 
   publish-nuget:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.22
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.18
+        go-version: "1.22"
 
     - name: install tooling
       run: go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Install GoReleaser
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v5
       with:
-        version: latest
+        version: '~> v1'
         install-only: true
 
     - name: Install Task
-      uses: arduino/setup-task@v1
+      uses: arduino/setup-task@v2
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build Powershell Module
       run: task generate build
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: ReleaseArtifacts
         path: |

.github/workflows/release.yml

@@ -11,28 +11,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up Go 1.18
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: "1.22"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
       - name: Install Task
-        uses: arduino/setup-task@v1
+        uses: arduino/setup-task@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: install tooling
         run: go install golang.org/x/tools/cmd/goimports@latest
 
       - name: Install GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: '~> v1'
           install-only: true
 
       - name: Publish Release

.gitignore

@@ -9,6 +9,7 @@ test/c8y_test/debug.test
 test/c8y_test/application.setup.properties
 .cumulocity/
 temp-example/
+*.tmp
 c8y.env
 c8y.activitylog.*.json
 c8y~