deps: update nix lock file (#870)

* deps: update nix lock file * azure-no-agent: run nix fmt * qemu-static: use upstream src * go: remove deprecated linter > "The linter 'exportloopref' is deprecated (since v1.60.2) due to: > Since Go1.22 (loopvar) this linter is no longer relevant. Replaced by > copyloopvar. We already use copyloopvar. * memstore: don't use predeclared identifier clear --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tom Dohrmann <[email protected]>
edgelesssys · Sep 11, 2024 · e58e0c6 · e58e0c6
1 parent db8e64b
commit e58e0c6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 62 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -32,7 +32,6 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - exportloopref
     - forcetypeassert
     - gocheckcompilerdirectives
     - gochecknoinits

diff --git a/flake.lock b/flake.lock
diff --git a/internal/memstore/memstore_test.go b/internal/memstore/memstore_test.go
@@ -177,7 +177,7 @@ func TestStoreConcurrent(t *testing.T) {
 			defer wg.Done()
 			s.Set(key, value)
 		}
-		clear := func() {
+		clearStore := func() {
 			defer wg.Done()
 			s.Clear()
 		}
@@ -187,10 +187,10 @@ func TestStoreConcurrent(t *testing.T) {
 		}
 
 		wg.Add(16)
-		go clear()
-		go clear()
-		go clear()
-		go clear()
+		go clearStore()
+		go clearStore()
+		go clearStore()
+		go clearStore()
 		go set("foo", 1)
 		go set("bar", 2)
 		go set("baz", 3)
@@ -199,10 +199,10 @@ func TestStoreConcurrent(t *testing.T) {
 		go getAll()
 		go getAll()
 		go getAll()
-		go clear()
-		go clear()
-		go clear()
-		go clear()
+		go clearStore()
+		go clearStore()
+		go clearStore()
+		go clearStore()
 		wg.Wait()
 
 		s.Clear()

diff --git a/packages/by-name/azure-no-agent/no-agent.sh b/packages/by-name/azure-no-agent/no-agent.sh
@@ -1,34 +1,34 @@
 #!/bin/bash
+# Copyright 2024 Edgeless Systems GmbH
+# SPDX-License-Identifier: AGPL-3.0-only
 
 attempts=1
-until [ "$attempts" -gt 5 ]
-do
-    echo "obtaining goal state - attempt $attempts"
-    goalstate=$(curl --fail -v -X 'GET' -H "x-ms-agent-name: azure-vm-register" \
-                                        -H "Content-Type: text/xml;charset=utf-8" \
-                                        -H "x-ms-version: 2012-11-30" \
-                                           "http://168.63.129.16/machine/?comp=goalstate")
-    # shellcheck disable=SC2181
-    if [ $? -eq 0 ]
-    then
-       echo "successfully retrieved goal state"
-       retrieved_goal_state=true
-       break
-    fi
-    sleep 5
-    attempts=$((attempts+1))
+until [ "$attempts" -gt 5 ]; do
+  echo "obtaining goal state - attempt $attempts"
+  goalstate=$(curl --fail -v -X 'GET' -H "x-ms-agent-name: azure-vm-register" \
+    -H "Content-Type: text/xml;charset=utf-8" \
+    -H "x-ms-version: 2012-11-30" \
+    "http://168.63.129.16/machine/?comp=goalstate")
+  # shellcheck disable=SC2181
+  if [ $? -eq 0 ]; then
+    echo "successfully retrieved goal state"
+    retrieved_goal_state=true
+    break
+  fi
+  sleep 5
+  attempts=$((attempts + 1))
 done
 
-if [ "$retrieved_goal_state" != "true" ]
-then
-    echo "failed to obtain goal state - cannot register this VM"
-    exit 1
+if [ "$retrieved_goal_state" != "true" ]; then
+  echo "failed to obtain goal state - cannot register this VM"
+  exit 1
 fi
 
-container_id=$(grep ContainerId <<< "$goalstate" | sed 's/\s*<\/*ContainerId>//g' | sed 's/\r$//')
-instance_id=$(grep InstanceId <<< "$goalstate" | sed 's/\s*<\/*InstanceId>//g' | sed 's/\r$//')
+container_id=$(grep ContainerId <<<"$goalstate" | sed 's/\s*<\/*ContainerId>//g' | sed 's/\r$//')
+instance_id=$(grep InstanceId <<<"$goalstate" | sed 's/\s*<\/*InstanceId>//g' | sed 's/\r$//')
 
-ready_doc=$(cat << EOF
+ready_doc=$(
+  cat <<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <Health xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <GoalStateIncarnation>1</GoalStateIncarnation>
@@ -48,19 +48,17 @@ EOF
 )
 
 attempts=1
-until [ "$attempts" -gt 5 ]
-do
-    echo "registering with Azure - attempt $attempts"
-    curl --fail -v -X 'POST' -H "x-ms-agent-name: azure-vm-register" \
-                             -H "Content-Type: text/xml;charset=utf-8" \
-                             -H "x-ms-version: 2012-11-30" \
-                             -d "$ready_doc" \
-                             "http://168.63.129.16/machine?comp=health"
-    # shellcheck disable=SC2181
-    if [ $? -eq 0 ]
-    then
-       echo "successfully register with Azure"
-       break
-    fi
-    sleep 5 # sleep to prevent throttling from wire server
+until [ "$attempts" -gt 5 ]; do
+  echo "registering with Azure - attempt $attempts"
+  curl --fail -v -X 'POST' -H "x-ms-agent-name: azure-vm-register" \
+    -H "Content-Type: text/xml;charset=utf-8" \
+    -H "x-ms-version: 2012-11-30" \
+    -d "$ready_doc" \
+    "http://168.63.129.16/machine?comp=health"
+  # shellcheck disable=SC2181
+  if [ $? -eq 0 ]; then
+    echo "successfully register with Azure"
+    break
+  fi
+  sleep 5 # sleep to prevent throttling from wire server
 done
diff --git a/packages/by-name/qemu-static/package.nix b/packages/by-name/qemu-static/package.nix
@@ -5,7 +5,6 @@
   qemu,
   libaio,
   dtc,
-  fetchurl,
   python3Packages,
 }:
 let
@@ -29,13 +28,6 @@ in
   hostCpuTargets = [ "x86_64-softmmu" ];
 })).overrideAttrs
   (previousAttrs: rec {
-    version = "9.1.0-rc4";
-
-    src = fetchurl {
-      url = "https://download.qemu.org/qemu-${version}.tar.xz";
-      hash = "sha256-gnvAOou9nR+yU67yK4Sa2fM2ZChR8zINoLy12ZROhSw=";
-    };
-
     configureFlags = previousAttrs.configureFlags ++ [
       "-Dlinux_aio_path=${libaio}/lib"
       "-Dlinux_fdt_path=${patchedDtc}/lib"