Skip to content

Commit 12a2456

Browse files
authored
Remove the unused error return from getProvider (#24)
Remove the unused error return from ibmCloudHelper.getProvider.
1 parent 34ea6ce commit 12a2456

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

iam_helper.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,21 @@ func (h *ibmCloudHelper) Cleanup() {
110110
h.providerLock.Unlock()
111111
}
112112

113-
func (h *ibmCloudHelper) getProvider() (*oidc.Provider, error) {
113+
func (h *ibmCloudHelper) getProvider() *oidc.Provider {
114114
h.providerLock.RLock()
115115
unlockFunc := h.providerLock.RUnlock
116116
defer func() { unlockFunc() }()
117117

118118
if h.provider != nil {
119-
return h.provider, nil
119+
return h.provider
120120
}
121121

122122
h.providerLock.RUnlock()
123123
h.providerLock.Lock()
124124
unlockFunc = h.providerLock.Unlock
125125

126126
if h.provider != nil {
127-
return h.provider, nil
127+
return h.provider
128128
}
129129

130130
providerCtx := h.providerCtx
@@ -138,7 +138,7 @@ func (h *ibmCloudHelper) getProvider() (*oidc.Provider, error) {
138138

139139
provider := providerConfig.NewProvider(providerCtx)
140140
h.provider = provider
141-
return provider, nil
141+
return provider
142142
}
143143

144144
/**
@@ -180,10 +180,7 @@ with relevant items contained in the token.
180180
*/
181181
func (h *ibmCloudHelper) VerifyToken(ctx context.Context, token string) (*tokenInfo, *logical.Response) {
182182
// verify the token
183-
provider, err := h.getProvider()
184-
if err != nil {
185-
return nil, logical.ErrorResponse("an error occurred retreiving the OIDC provider: %s", err)
186-
}
183+
provider := h.getProvider()
187184

188185
oidcConfig := &oidc.Config{
189186
SkipClientIDCheck: true,

0 commit comments

Comments
 (0)