Merge pull request #1156 from k8up-io/fix/archive-nil-s3-985

Fix nil pointer panic in S3Spec.RestoreEnvVars with nil receiver

Author: Kidswiss

api/v1/backend.go

@@ -147,6 +147,9 @@ func (in *S3Spec) String() string {
 
 // RestoreEnvVars returns the env vars for this backend when using Restore jobs.
 func (in *S3Spec) RestoreEnvVars() map[string]*corev1.EnvVar {
+	if in == nil {
+		return nil
+	}
 	vars := make(map[string]*corev1.EnvVar)
 	if in.AccessKeyIDSecretRef != nil {
 		vars[cfg.RestoreS3AccessKeyIDEnvName] = &corev1.EnvVar{

api/v1/restore_types_test.go

@@ -0,0 +1,18 @@
+package v1
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestS3SpecRestoreEnvVarsWithNilReceiver(t *testing.T) {
+	// When a user specifies "s3:" with a nil value in YAML,
+	// S3 is nil but RestoreMethod is not.
+	// Calling RestoreEnvVars() on nil S3Spec must not panic.
+	var s3 *S3Spec
+	assert.NotPanics(t, func() {
+		result := s3.RestoreEnvVars()
+		assert.Nil(t, result)
+	})
+}