fix: ssl test

Signed-off-by: Fatih USTA <[email protected]>
apache · May 30, 2024 · 7a61f1c · 7a61f1c
1 parent c3ba292
commit 7a61f1c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 48 deletions.
diff --git a/api/internal/handler/ssl/ssl.go b/api/internal/handler/ssl/ssl.go
@@ -199,8 +199,10 @@ func (h *Handler) List(c droplet.Context) (interface{}, error) {
 		ssl := &entity.SSL{}
 		_ = utils.ObjectClone(item, ssl)
 		x509_validity, _ := x509CertValidity(ssl.Cert)
-		ssl.ValidityStart = x509_validity.NotBefore
-		ssl.ValidityEnd = x509_validity.NotAfter
+		if x509_validity != nil {
+			ssl.ValidityStart = x509_validity.NotBefore
+			ssl.ValidityEnd = x509_validity.NotAfter
+		}
 		ssl.Key = ""
 		ssl.Keys = nil
 		list = append(list, ssl)
@@ -455,8 +457,10 @@ func (h *Handler) Validate(c droplet.Context) (interface{}, error) {
 	}
 
 	x509_validity, _ := x509CertValidity(input.Cert)
-	ssl.ValidityStart = x509_validity.NotBefore
-	ssl.ValidityEnd = x509_validity.NotAfter
+	if x509_validity != nil {
+		ssl.ValidityStart = x509_validity.NotBefore
+		ssl.ValidityEnd = x509_validity.NotAfter
+	}
 
 	return ssl, nil
 }

diff --git a/api/internal/handler/ssl/ssl_test.go b/api/internal/handler/ssl/ssl_test.go
@@ -288,10 +288,8 @@ func TestSSL_Create(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantInput: &entity.SSL{
 				BaseInfo: entity.BaseInfo{
@@ -304,10 +302,8 @@ func TestSSL_Create(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantRet: &entity.SSL{
 				BaseInfo: entity.BaseInfo{
@@ -320,10 +316,8 @@ func TestSSL_Create(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantErr: nil,
 		},
@@ -348,10 +342,8 @@ func TestSSL_Create(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantErr: fmt.Errorf("create failed"),
 			wantRet: handler.SpecCodeResponse(fmt.Errorf("create failed")),
@@ -419,10 +411,8 @@ func TestSSL_Update(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantInput: &entity.SSL{
 				BaseInfo: entity.BaseInfo{
@@ -435,10 +425,8 @@ func TestSSL_Update(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantRet: &entity.SSL{
 				BaseInfo: entity.BaseInfo{
@@ -451,10 +439,8 @@ func TestSSL_Update(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 		},
 		{
@@ -561,10 +547,8 @@ func TestSSL_Patch(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			giveInput: &PatchInput{
 				ID:      "ssl1",
@@ -597,10 +581,8 @@ func TestSSL_Patch(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			getCalled: true,
 		},
@@ -622,10 +604,8 @@ func TestSSL_Patch(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			wantInput: &entity.SSL{
 				BaseInfo: entity.BaseInfo{
@@ -653,10 +633,8 @@ func TestSSL_Patch(t *testing.T) {
 					"env":     "production",
 					"version": "v2",
 				},
-				Snis:          []string{"test2.com", "*.test2.com"},
-				ValidityStart: 1586038672,
-				ValidityEnd:   4739638672,
-				Status:        1,
+				Snis:   []string{"test2.com", "*.test2.com"},
+				Status: 1,
 			},
 			getCalled: true,
 		},