mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-14 11:57:59 +00:00
Code Activity

Merge pull request #132 from external-secrets/fix/status-conditions

Browse source 
fix: update condition when error message changes
This commit is contained in:
paul-the-alien[bot] 2021-05-05 06:22:14 +00:00 committed by GitHub
commit 1877a38996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/controllers/externalsecret/util.go
View file

@ -46,7 +46,8 @@ func GetExternalSecretCondition(status esv1alpha1.ExternalSecretStatus, condType
func SetExternalSecretCondition(es *esv1alpha1.ExternalSecret, condition esv1alpha1.ExternalSecretStatusCondition) {
currentCond := GetExternalSecretCondition(es.Status, condition.Type)
if currentCond != nil && currentCond.Status == condition.Status && currentCond.Reason == condition.Reason {
if currentCond != nil && currentCond.Status == condition.Status &&
currentCond.Reason == condition.Reason && currentCond.Message == condition.Message {
updateExternalSecretCondition(es, &condition, 1.0)
return
}

3
pkg/provider/aws/parameterstore/parameterstore.go
View file

@ -25,6 +25,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
esv1alpha1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1alpha1"
"github.com/external-secrets/external-secrets/pkg/provider/aws/util"
)
// ParameterStore is a provider for AWS ParameterStore.
@ -55,7 +56,7 @@ func (pm *ParameterStore) GetSecret(ctx context.Context, ref esv1alpha1.External
WithDecryption: aws.Bool(true),
})
if err != nil {
return nil, fmt.Errorf("unable to get parameter: %w", err)
return nil, util.SanitizeErr(err)
}
if ref.Property == "" {
if out.Parameter.Value != nil {

3
pkg/provider/aws/secretsmanager/secretsmanager.go
View file

@ -24,6 +24,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
esv1alpha1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1alpha1"
"github.com/external-secrets/external-secrets/pkg/provider/aws/util"
)
// SecretsManager is a provider for AWS SecretsManager.
@ -58,7 +59,7 @@ func (sm *SecretsManager) GetSecret(ctx context.Context, ref esv1alpha1.External
VersionStage: &ver,
})
if err != nil {
return nil, err
return nil, util.SanitizeErr(err)
}
if ref.Property == "" {
if secretOut.SecretString != nil {

32
pkg/provider/aws/util/errors.go Normal file
View file

@ -0,0 +1,32 @@
/*
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package util
import (
"errors"
"fmt"
"github.com/aws/aws-sdk-go/aws/awserr"
)
// SanitizeErr removes sanitizes the error string
// because the requestID must not be included in the error.
func SanitizeErr(err error) error {
var bErr awserr.BatchedErrors
if errors.As(bErr, &bErr) {
return fmt.Errorf("%s: %s", bErr.Code(), bErr.Message())
}
return err
}