1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From b4ca42455ccc9b56c1bd170f680b164a583afbbc Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas@fatal.se>
Date: Sun, 5 Jan 2025 18:27:17 +0100
Subject: [PATCH] Revert "chore: Update `kms` aliases in imports after
dependency upgrade"
This reverts commit b4ee351298479320365862432acb85727c045221.
---
artifact/gcp/signer.go | 4 ++--
artifact/gcp/signer_test.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/artifact/gcp/signer.go b/artifact/gcp/signer.go
index cac998d..1c479ce 100644
--- a/artifact/gcp/signer.go
+++ b/artifact/gcp/signer.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Northern.tech AS
+// Copyright 2021 Northern.tech AS
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@ import (
"github.com/mendersoftware/mender-artifact/artifact"
kms "cloud.google.com/go/kms/apiv1"
- "cloud.google.com/go/kms/apiv1/kmspb"
gax "github.com/googleapis/gax-go/v2"
"github.com/minio/sha256-simd"
"github.com/pkg/errors"
+ kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
"google.golang.org/protobuf/types/known/wrapperspb"
)
diff --git a/artifact/gcp/signer_test.go b/artifact/gcp/signer_test.go
index d2f8477..6f68a4b 100644
--- a/artifact/gcp/signer_test.go
+++ b/artifact/gcp/signer_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Northern.tech AS
+// Copyright 2021 Northern.tech AS
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@ import (
"testing"
"time"
- "cloud.google.com/go/kms/apiv1/kmspb"
gax "github.com/googleapis/gax-go/v2"
"github.com/mendersoftware/mender-artifact/artifact"
"github.com/pkg/errors"
+ kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
"google.golang.org/protobuf/types/known/wrapperspb"
)
--
2.45.2
|
