Browse Source

fix: gitlab group variable regression (#4379)

Signed-off-by: Damien Degois <damien@degois.info>
Damien Degois 1 year ago
parent
commit
fb945246f6
2 changed files with 3 additions and 3 deletions
  1. 1 1
      pkg/provider/gitlab/gitlab.go
  2. 2 2
      pkg/provider/gitlab/provider.go

+ 1 - 1
pkg/provider/gitlab/gitlab.go

@@ -262,7 +262,7 @@ func (g *gitlabBase) GetSecret(_ context.Context, ref esv1beta1.ExternalSecretDa
 
 	// _Note_: getVariables potentially alters vopts environment variable.
 	data, resp, err := g.getVariables(ref, vopts)
-	if err != nil {
+	if err != nil && (resp == nil || resp.StatusCode != http.StatusNotFound) {
 		return nil, err
 	}
 

+ 2 - 2
pkg/provider/gitlab/provider.go

@@ -109,10 +109,10 @@ func (g *gitlabBase) getVariables(ref esv1beta1.ExternalSecretDataRemoteRef, vop
 			data, resp, err = g.projectVariablesClient.GetVariable(g.store.ProjectID, ref.Key, vopts)
 			metrics.ObserveAPICall(constants.ProviderGitLab, constants.CallGitLabProjectVariableGet, err)
 			if err != nil || resp == nil {
-				return nil, nil, fmt.Errorf("error getting variable %s from GitLab: %w", ref.Key, err)
+				return nil, resp, fmt.Errorf("error getting variable %s from GitLab: %w", ref.Key, err)
 			}
 		} else {
-			return nil, nil, err
+			return nil, resp, err
 		}
 	}