fix: [CDS-77684]: Handle null point exception if created by field is …

…nil (#665) * [fix]: [CDS-77684]: Handle null point exception if created by field is not set * fix: [CDS-77684]: Add nil check to file_store * fix: [CDS-77684]: Update func name * fix: [CDS-77684]: Update change.log * Update 665.txt --------- Co-authored-by: Yogesh Chauhan <yogesh.chauhan@harness.io>
harness · Aug 25, 2023 · 3e41bdb · 3e41bdb
1 parent c63338d
commit 3e41bdb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/.changelog/665.txt b/.changelog/665.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Fixed harness_platform_file_store_folder create resource plugin crash, when service account token was used to create
+```
diff --git a/internal/service/platform/file_store/file_store_utils.go b/internal/service/platform/file_store/file_store_utils.go
@@ -79,5 +79,16 @@ func getOptionalString(str interface{}) optional.String {
 	return optional.NewString(v)
 }
 
+func getEmail(user *nextgen.EmbeddedUserDetailsDto) string {
+	if user != nil {
+		return user.Email
+	}
+	return ""
+}
 
-
+func getName(user *nextgen.EmbeddedUserDetailsDto) string {
+	if user != nil {
+		return user.Name
+	}
+	return ""
+}
diff --git a/internal/service/platform/file_store/resource_file.go b/internal/service/platform/file_store/resource_file.go
@@ -269,14 +269,14 @@ func readFileNode(d *schema.ResourceData, file *nextgen.File, fileContentOpt opt
 	d.Set(tags, FlattenTags(file.Tags))
 	d.Set(createdBy, []interface{}{
 		map[string]interface{}{
-			"email": file.CreatedBy.Email,
-			"name":  file.CreatedBy.Name,
+			"email": getEmail(file.CreatedBy),
+			"name":  getName(file.CreatedBy),
 		},
 	})
 	d.Set(lastModifiedBy, []interface{}{
 		map[string]interface{}{
-			"email": file.LastModifiedBy.Email,
-			"name":  file.LastModifiedBy.Name,
+			"email": getEmail(file.LastModifiedBy),
+			"name":  getName(file.LastModifiedBy),
 		},
 	})
 	d.Set(lastModifiedAt, file.LastModifiedAt)

diff --git a/internal/service/platform/file_store/resource_folder.go b/internal/service/platform/file_store/resource_folder.go
@@ -217,14 +217,14 @@ func readFolderNode(d *schema.ResourceData, file *nextgen.File, fileContentOpt o
 	d.Set(path, file.Path)
 	d.Set(createdBy, []interface{}{
 		map[string]interface{}{
-			"email": file.CreatedBy.Email,
-			"name":  file.CreatedBy.Name,
+			"email": getEmail(file.CreatedBy),
+			"name":  getName(file.CreatedBy),
 		},
 	})
 	d.Set(lastModifiedBy, []interface{}{
 		map[string]interface{}{
-			"email": file.LastModifiedBy.Email,
-			"name":  file.LastModifiedBy.Name,
+			"email": getEmail(file.LastModifiedBy),
+			"name":  getName(file.LastModifiedBy),
 		},
 	})
 	d.Set(lastModifiedAt, file.LastModifiedAt)