update based on feedback part II

Signed-off-by: cpanato <[email protected]>
google · Nov 20, 2023 · ea4ee2c · ea4ee2c
1 parent 1cff3f0
commit ea4ee2c
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 74 deletions.
diff --git a/github/github-accessors.go b/github/github-accessors.go
diff --git a/github/github-accessors_test.go b/github/github-accessors_test.go
diff --git a/github/security_advisories.go b/github/security_advisories.go
@@ -97,19 +97,19 @@ type ListGlobalSecurityAdvisoriesOptions struct {
 // GlobalSecurityAdvisory represents the global security advisory object response.
 type GlobalSecurityAdvisory struct {
 	SecurityAdvisory
-	ID                    *int64             `json:"id,omitempty"`
-	RepositoryAdvisoryURL *string            `json:"repository_advisory_url,omitempty"`
-	Type                  *string            `json:"type,omitempty"`
-	SourceCodeLocation    *string            `json:"source_code_location,omitempty"`
-	References            []string           `json:"references,omitempty"`
-	Vulnerabilities       []*Vulnerabilities `json:"vulnerabilities,omitempty"`
-	GitHubReviewedAt      *Timestamp         `json:"github_reviewed_at,omitempty"`
-	NVDPublishedAt        *Timestamp         `json:"nvd_published_at,omitempty"`
-	Credits               []*Credit          `json:"credits,omitempty"`
+	ID                    *int64                         `json:"id,omitempty"`
+	RepositoryAdvisoryURL *string                        `json:"repository_advisory_url,omitempty"`
+	Type                  *string                        `json:"type,omitempty"`
+	SourceCodeLocation    *string                        `json:"source_code_location,omitempty"`
+	References            []string                       `json:"references,omitempty"`
+	Vulnerabilities       []*GlobalSecurityVulnerability `json:"vulnerabilities,omitempty"`
+	GithubReviewedAt      *Timestamp                     `json:"github_reviewed_at,omitempty"`
+	NVDPublishedAt        *Timestamp                     `json:"nvd_published_at,omitempty"`
+	Credits               []*Credit                      `json:"credits,omitempty"`
 }
 
 // Vulnerabilities represents the Vulnerabilities for the global security advisory.
-type Vulnerabilities struct {
+type GlobalSecurityVulnerability struct {
 	Package                *VulnerabilityPackage `json:"package,omitempty"`
 	FirstPatchedVersion    *string               `json:"first_patched_version,omitempty"`
 	VulnerableVersionRange *string               `json:"vulnerable_version_range,omitempty"`

diff --git a/github/security_advisories_test.go b/github/security_advisories_test.go
@@ -449,7 +449,7 @@ func TestListGlobalSecurityAdvisories(t *testing.T) {
 				},
 			},
 			References: []string{"https://nvd.nist.gov/vuln/detail/CVE-xoxo-1234"},
-			Vulnerabilities: []*Vulnerabilities{
+			Vulnerabilities: []*GlobalSecurityVulnerability{
 				{
 					Package: &VulnerabilityPackage{
 						Ecosystem: String("npm"),
@@ -463,7 +463,7 @@ func TestListGlobalSecurityAdvisories(t *testing.T) {
 			RepositoryAdvisoryURL: String("https://api.github.com/repos/project/a-package/security-advisories/GHSA-xoxo-1234-xoxo"),
 			Type:                  String("reviewed"),
 			SourceCodeLocation:    String("https://github.com/project/a-package"),
-			GitHubReviewedAt:      &date,
+			GithubReviewedAt:      &date,
 			NVDPublishedAt:        &date,
 			Credits: []*Credit{
 				{
@@ -633,10 +633,10 @@ func TestGetGlobalSecurityAdvisories(t *testing.T) {
 		Type:                  String("reviewed"),
 		SourceCodeLocation:    String("https://github.com/project/a-package"),
 		References:            []string{"https://nvd.nist.gov/vuln/detail/CVE-xoxo-1234"},
-		GitHubReviewedAt:      &date,
+		GithubReviewedAt:      &date,
 		NVDPublishedAt:        &date,
 
-		Vulnerabilities: []*Vulnerabilities{
+		Vulnerabilities: []*GlobalSecurityVulnerability{
 			{
 				Package: &VulnerabilityPackage{
 					Ecosystem: String("npm"),