From b0685bdd08616a0bb909d12f2821fd6e576468eb Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Tue, 16 Feb 2021 08:30:35 -0800 Subject: [PATCH] fix(executor): Fix S3 policy based auth. Fixes #5110 (#5111) igned-off-by: Alex Collins --- workflow/artifacts/artifacts.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/artifacts/artifacts.go b/workflow/artifacts/artifacts.go index c56ef2dca486..07f7b12e0dd3 100644 --- a/workflow/artifacts/artifacts.go +++ b/workflow/artifacts/artifacts.go @@ -35,7 +35,7 @@ func NewDriver(ctx context.Context, art *wfv1.Artifact, ri resource.Interface) ( var accessKey string var secretKey string - if art.S3.AccessKeySecret.Name != "" { + if art.S3.AccessKeySecret != nil && art.S3.AccessKeySecret.Name != "" { accessKeyBytes, err := ri.GetSecret(ctx, art.S3.AccessKeySecret.Name, art.S3.AccessKeySecret.Key) if err != nil { return nil, err @@ -117,7 +117,7 @@ func NewDriver(ctx context.Context, art *wfv1.Artifact, ri resource.Interface) ( var accessKey string var secretKey string - if art.OSS.AccessKeySecret.Name != "" { + if art.OSS.AccessKeySecret != nil && art.OSS.AccessKeySecret.Name != "" { accessKeyBytes, err := ri.GetSecret(ctx, art.OSS.AccessKeySecret.Name, art.OSS.AccessKeySecret.Key) if err != nil { return nil, err @@ -140,7 +140,7 @@ func NewDriver(ctx context.Context, art *wfv1.Artifact, ri resource.Interface) ( if art.GCS != nil { driver := gcs.ArtifactDriver{} - if art.GCS.ServiceAccountKeySecret.Name != "" { + if art.GCS.ServiceAccountKeySecret != nil && art.GCS.ServiceAccountKeySecret.Name != "" { serviceAccountKeyBytes, err := ri.GetSecret(ctx, art.GCS.ServiceAccountKeySecret.Name, art.GCS.ServiceAccountKeySecret.Key) if err != nil { return nil, err