PrefixFrom does not return a NotFound, fix this (#129)

metal-stack · Jan 8, 2024 · 72b753b · 72b753b
1 parent 44e1550
commit 72b753b
Show file tree

Hide file tree

Showing 19 changed files with 422 additions and 280 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: "1.21"
         cache: false
@@ -90,7 +90,7 @@ jobs:
     steps:
 
     - name: Set up Go 1.21
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: "1.21"
         cache: false

diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /work
 COPY . .
 RUN make server client
 
-FROM alpine:3.18
+FROM alpine:3.19
 COPY --from=builder /work/bin/* /
 ENTRYPOINT [ "/server" ]
diff --git a/api/v1/apiv1connect/ipam.connect.go b/api/v1/apiv1connect/ipam.connect.go
diff --git a/api/v1/ipam.pb.go b/api/v1/ipam.pb.go
diff --git a/etcd.go b/etcd.go
@@ -139,7 +139,7 @@ func (e *etcd) ReadPrefix(ctx context.Context, prefix string, namespace string)
 	}
 
 	if get.Count == 0 {
-		return Prefix{}, fmt.Errorf("unable to read existing prefix:%v, error:%w", prefix, err)
+		return Prefix{}, fmt.Errorf("%w unable to read existing prefix:%v, error:%w", ErrNotFound, prefix, err)
 	}
 
 	return fromJSON(get.Kvs[0].Value)