fix: resource_name length

ca-risken · Nov 8, 2023 · 7bedaf9 · 7bedaf9
1 parent 6deef65
commit 7bedaf9
Show file tree

Hide file tree

Showing 37 changed files with 66 additions and 59 deletions.
diff --git a/pkg/ai/mocks/AIService.go b/pkg/ai/mocks/AIService.go
diff --git a/pkg/db/mocks/AlertRepository.go b/pkg/db/mocks/AlertRepository.go
diff --git a/pkg/db/mocks/FindingRepository.go b/pkg/db/mocks/FindingRepository.go
diff --git a/pkg/db/mocks/IAMRepository.go b/pkg/db/mocks/IAMRepository.go
diff --git a/pkg/db/mocks/ProjectRepository.go b/pkg/db/mocks/ProjectRepository.go
diff --git a/pkg/db/mocks/ReportRepository.go b/pkg/db/mocks/ReportRepository.go
diff --git a/proto/alert/entity.pb.go b/proto/alert/entity.pb.go
diff --git a/proto/alert/mocks/AlertServiceClient.go b/proto/alert/mocks/AlertServiceClient.go
diff --git a/proto/alert/mocks/AlertServiceServer.go b/proto/alert/mocks/AlertServiceServer.go
diff --git a/proto/alert/service.pb.go b/proto/alert/service.pb.go
diff --git a/proto/alert/validator.go b/proto/alert/validator.go
@@ -405,7 +405,7 @@ func (e *AlertRuleForUpsert) Validate() error {
 		validation.Field(&e.ProjectId, validation.Required),
 		validation.Field(&e.Name, validation.Required, validation.Length(0, 200)),
 		validation.Field(&e.Score, validation.Min(0.0), validation.Max(1.0)),
-		validation.Field(&e.ResourceName, validation.Length(0, 255)),
+		validation.Field(&e.ResourceName, validation.Length(0, 512)),
 		validation.Field(&e.Tag, validation.Length(0, 64)),
 		validation.Field(&e.FindingCnt, validation.Min(uint(1))),
 	)

diff --git a/proto/alert/validator_entity_test.go b/proto/alert/validator_entity_test.go
@@ -5,6 +5,12 @@ import (
 	"testing"
 )
 
+const (
+	STRING_LENGTH_10  = "1234567890"
+	STRING_LENGTH_100 = STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10 + STRING_LENGTH_10
+	STRING_LENGTH_513 = STRING_LENGTH_100 + STRING_LENGTH_100 + STRING_LENGTH_100 + STRING_LENGTH_100 + STRING_LENGTH_100 + STRING_LENGTH_10 + "0123"
+)
+
 func TestValidateAlertForUpsert(t *testing.T) {
 	cases := []struct {
 		name    string
@@ -253,7 +259,7 @@ func TestValidateAlertRuleForUpsert(t *testing.T) {
 		},
 		{
 			name:    "NG too long resource_name",
-			input:   &AlertRuleForUpsert{Name: "test_alert_rule", Score: 1.0, ProjectId: 1001, ResourceName: "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456", Tag: "test_tag", FindingCnt: 1},
+			input:   &AlertRuleForUpsert{Name: "test_alert_rule", Score: 1.0, ProjectId: 1001, ResourceName: STRING_LENGTH_513, Tag: "test_tag", FindingCnt: 1},
 			wantErr: true,
 		},
 		{

diff --git a/proto/finding/entity.pb.go b/proto/finding/entity.pb.go
diff --git a/proto/finding/mocks/FindingServiceClient.go b/proto/finding/mocks/FindingServiceClient.go
diff --git a/proto/finding/mocks/FindingServiceServer.go b/proto/finding/mocks/FindingServiceServer.go
diff --git a/proto/finding/mocks/FindingService_GetAISummaryStreamClient.go b/proto/finding/mocks/FindingService_GetAISummaryStreamClient.go
diff --git a/proto/finding/mocks/FindingService_GetAISummaryStreamServer.go b/proto/finding/mocks/FindingService_GetAISummaryStreamServer.go
diff --git a/proto/finding/service.pb.go b/proto/finding/service.pb.go
diff --git a/proto/finding/validator.go b/proto/finding/validator.go
@@ -19,7 +19,7 @@ func (l *ListFindingRequest) Validate() error {
 	return validation.ValidateStruct(l,
 		validation.Field(&l.ProjectId, validation.Required),
 		validation.Field(&l.DataSource, validation.Each(validation.Length(0, 64))),
-		validation.Field(&l.ResourceName, validation.Each(validation.Length(0, 255))),
+		validation.Field(&l.ResourceName, validation.Each(validation.Length(0, 512))),
 		validation.Field(&l.FromScore, validation.Min(0.0), validation.Max(1.0)),
 		validation.Field(&l.ToScore, validation.Min(0.0), validation.Max(1.0)),
 		validation.Field(&l.Tag, validation.Each(validation.Length(0, 64))),
@@ -36,7 +36,7 @@ func (b *BatchListFindingRequest) Validate() error {
 	return validation.ValidateStruct(b,
 		validation.Field(&b.ProjectId, validation.Required),
 		validation.Field(&b.DataSource, validation.Each(validation.Length(0, 64))),
-		validation.Field(&b.ResourceName, validation.Each(validation.Length(0, 255))),
+		validation.Field(&b.ResourceName, validation.Each(validation.Length(0, 512))),
 		validation.Field(&b.FromScore, validation.Min(0.0), validation.Max(1.0)),
 		validation.Field(&b.ToScore, validation.Min(0.0), validation.Max(1.0)),
 		validation.Field(&b.Tag, validation.Each(validation.Length(0, 64))),
@@ -165,7 +165,7 @@ func (c *ClearScoreRequest) Validate() error {
 func (l *ListResourceRequest) Validate() error {
 	return validation.ValidateStruct(l,
 		validation.Field(&l.ProjectId, validation.Required),
-		validation.Field(&l.ResourceName, validation.Each(validation.Length(0, 255))),
+		validation.Field(&l.ResourceName, validation.Each(validation.Length(0, 512))),
 		validation.Field(&l.Tag, validation.Each(validation.Length(0, 64))),
 		validation.Field(&l.Sort, validation.In(
 			"resource_id", "resource_name", "updated_at")),
@@ -383,7 +383,7 @@ func (f *FindingForUpsert) Validate() error {
 		validation.Field(&f.Description, validation.Length(0, 200)),
 		validation.Field(&f.DataSource, validation.Required, validation.Length(0, 64)),
 		validation.Field(&f.DataSourceId, validation.Required, validation.Length(0, 255)),
-		validation.Field(&f.ResourceName, validation.Required, validation.Length(0, 255)),
+		validation.Field(&f.ResourceName, validation.Required, validation.Length(0, 512)),
 		validation.Field(&f.OriginalScore, validation.Min(0.0), validation.Max(f.OriginalMaxScore)),
 		validation.Field(&f.OriginalMaxScore, validation.NilOrNotEmpty, validation.Min(0.0), validation.Max(999.99)),
 		validation.Field(&f.Data, is.JSON),
@@ -401,7 +401,7 @@ func (f *FindingTagForUpsert) Validate() error {
 // Validate ResourceForUpsert
 func (r *ResourceForUpsert) Validate() error {
 	return validation.ValidateStruct(r,
-		validation.Field(&r.ResourceName, validation.Required, validation.Length(0, 255)),
+		validation.Field(&r.ResourceName, validation.Required, validation.Length(0, 512)),
 	)
 }
 

diff --git a/proto/finding/validator_test.go b/proto/finding/validator_test.go
@@ -9,6 +9,7 @@ const (
 	len129string string = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789=12345678901234567890123456789"
 	len201string string = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789=123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789=1"
 	len256string string = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789=123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789=12345678901234567890123456789012345678901234567890123456"
+	len513string string = len256string + len256string + "1"
 	maxLimit     int32  = 200
 )
 
@@ -29,7 +30,7 @@ func TestValidate_ListFindingRequest(t *testing.T) {
 		},
 		{
 			name:    "NG too long resource_name",
-			input:   &ListFindingRequest{ProjectId: 1, ResourceName: []string{len256string}},
+			input:   &ListFindingRequest{ProjectId: 1, ResourceName: []string{len513string}},
 			wantErr: true,
 		},
 		{
@@ -117,7 +118,7 @@ func TestValidate_BatchListFindingRequest(t *testing.T) {
 		},
 		{
 			name:    "NG too long resource_name",
-			input:   &BatchListFindingRequest{ProjectId: 1, ResourceName: []string{len256string}},
+			input:   &BatchListFindingRequest{ProjectId: 1, ResourceName: []string{len513string}},
 			wantErr: true,
 		},
 		{
@@ -517,7 +518,7 @@ func TestValidate_ListResourceRequest(t *testing.T) {
 		},
 		{
 			name:    "NG Length(resource_name)",
-			input:   &ListResourceRequest{ProjectId: 1, ResourceName: []string{len256string}},
+			input:   &ListResourceRequest{ProjectId: 1, ResourceName: []string{len513string}},
 			wantErr: true,
 		},
 		{
@@ -1236,7 +1237,7 @@ func TestValidate_FindingForUpsert(t *testing.T) {
 		},
 		{
 			name:    "NG too long resource name",
-			input:   &FindingForUpsert{Description: "desc", DataSource: "ds", DataSourceId: "ds-001", ResourceName: len256string, ProjectId: 1001, OriginalScore: 50.5, OriginalMaxScore: 100.0, Data: `{"key": "value"}`},
+			input:   &FindingForUpsert{Description: "desc", DataSource: "ds", DataSourceId: "ds-001", ResourceName: len513string, ProjectId: 1001, OriginalScore: 50.5, OriginalMaxScore: 100.0, Data: `{"key": "value"}`},
 			wantErr: true,
 		},
 		{

diff --git a/proto/iam/access_token.pb.go b/proto/iam/access_token.pb.go
diff --git a/proto/iam/entity.pb.go b/proto/iam/entity.pb.go
diff --git a/proto/iam/mocks/IAMServiceClient.go b/proto/iam/mocks/IAMServiceClient.go
diff --git a/proto/iam/mocks/IAMServiceServer.go b/proto/iam/mocks/IAMServiceServer.go
diff --git a/proto/iam/policy.pb.go b/proto/iam/policy.pb.go
diff --git a/proto/iam/role.pb.go b/proto/iam/role.pb.go
diff --git a/proto/iam/service.pb.go b/proto/iam/service.pb.go
diff --git a/proto/iam/user.pb.go b/proto/iam/user.pb.go
diff --git a/proto/iam/user_reserved.pb.go b/proto/iam/user_reserved.pb.go
diff --git a/proto/project/entity.pb.go b/proto/project/entity.pb.go
diff --git a/proto/project/mocks/ProjectServiceClient.go b/proto/project/mocks/ProjectServiceClient.go
diff --git a/proto/project/mocks/ProjectServiceServer.go b/proto/project/mocks/ProjectServiceServer.go
diff --git a/proto/project/service.pb.go b/proto/project/service.pb.go
diff --git a/proto/report/entity.pb.go b/proto/report/entity.pb.go
diff --git a/proto/report/mocks/ReportServiceClient.go b/proto/report/mocks/ReportServiceClient.go
diff --git a/proto/report/mocks/ReportServiceServer.go b/proto/report/mocks/ReportServiceServer.go
diff --git a/proto/report/service.pb.go b/proto/report/service.pb.go