Skip to content

Commit

Permalink
Minor refactoring
Browse files Browse the repository at this point in the history
Signed-off-by: Aurel Canciu <[email protected]>
  • Loading branch information
relu committed Jun 30, 2023
1 parent 9c0ed23 commit 24e727c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions internal/provider/provider_resource_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type providerResourceData struct {
func NewProviderResourceData(ctx context.Context, data ProviderModel) (*providerResourceData, error) {
clientCfg, err := getClientConfiguration(ctx, data.Kubernetes)
if err != nil {
return nil, fmt.Errorf("Invalid Kubernetes configuration: %w", err)
return nil, fmt.Errorf("invalid Kubernetes configuration: %w", err)
}
rcg := utils.NewRestClientGetter(clientCfg)
return &providerResourceData{
Expand Down Expand Up @@ -189,7 +189,7 @@ func (prd *providerResourceData) GetEntityList() (openpgp.EntityList, error) {
var err error
entityList, err = openpgp.ReadKeyRing(strings.NewReader(prd.git.GpgKeyRing.ValueString()))
if err != nil {
return nil, fmt.Errorf("Failed to read GPG key ring: %w", err)
return nil, fmt.Errorf("failed to read GPG key ring: %w", err)
}
}
return entityList, nil
Expand All @@ -202,9 +202,7 @@ func getOpenPgpEntity(keyRing openpgp.EntityList, passphrase, keyID string) (*op

var entity *openpgp.Entity
if keyID != "" {
if strings.HasPrefix(keyID, "0x") {
keyID = strings.TrimPrefix(keyID, "0x")
}
keyID = strings.TrimPrefix(keyID, "0x")
if len(keyID) != 16 {
return nil, fmt.Errorf("invalid GPG key id length; expected %d, got %d", 16, len(keyID))
}
Expand Down

0 comments on commit 24e727c

Please sign in to comment.