backport PSS and PKI delete fix

giantswarm · Apr 23, 2024 · 273e18f · 273e18f
1 parent 254e5c8
commit 273e18f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/service/collector/error.go b/service/collector/error.go
@@ -12,8 +12,7 @@ import (
 // This error should never be matched against and therefore there is no matcher
 // implement. For further information see:
 //
-//     https://github.com/giantswarm/fmt/blob/master/go/errors.md#matching-errors
-//
+//	https://github.com/giantswarm/fmt/blob/master/go/errors.md#matching-errors
 var executionFailedError = &microerror.Error{
 	Kind: "executionFailedError",
 }
@@ -36,8 +35,7 @@ var vaultAccessError = &microerror.Error{
 // temporarily replies with HTTP responses. In such cases we intend to cancel
 // collection and wait until Vault is fully operational again.
 //
-//     Get https://vault.g8s.foo.bar:8200/v1/sys/mounts: http: server gave HTTP response to HTTPS client
-//
+//	Get https://vault.g8s.foo.bar:8200/v1/sys/mounts: http: server gave HTTP response to HTTPS client
 func IsVaultAccess(err error) bool {
 	if err == nil {
 		return false

diff --git a/service/controller/resources/vaultaccess/error.go b/service/controller/resources/vaultaccess/error.go
@@ -24,8 +24,7 @@ var vaultAccessError = &microerror.Error{
 // temporarily replies with HTTP responses. In such cases we intend to cancel
 // reconciliation and wait until Vault is fully operational again.
 //
-//     Get https://vault.g8s.amag.ch:8200/v1/sys/mounts: http: server gave HTTP response to HTTPS client
-//
+//	Get https://vault.g8s.amag.ch:8200/v1/sys/mounts: http: server gave HTTP response to HTTPS client
 func IsVaultAccess(err error) bool {
 	if err == nil {
 		return false