test(github): add access_token default to test cases

release-argus · Jan 26, 2025 · b012eb0 · b012eb0
1 parent de6deac
commit b012eb0
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 10 deletions.
diff --git a/config/yaml_help_test.go b/config/yaml_help_test.go
@@ -185,6 +185,10 @@ func testYAML_config_test(path string, t *testing.T) {
 
 func testYAML_SomeNilServices(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		service:
 			a:
 				latest_version:
@@ -309,6 +313,10 @@ func testYAML_Ordering_1_no_services(path string, t *testing.T) {
 
 func testYAML_Ordering_2_obscure_service_names(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		service:
 			"123":
 				latest_version:
@@ -357,6 +365,10 @@ func testYAML_Ordering_2_obscure_service_names(path string, t *testing.T) {
 
 func testYAML_Ordering_3_empty_line_after_service_line(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		service:
 
 			C:
@@ -380,6 +392,10 @@ func testYAML_Ordering_3_empty_line_after_service_line(path string, t *testing.T
 
 func testYAML_Ordering_4_multiple_empty_lines_after_service_line(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		service:
 ` + strings.Repeat("\n", 3) + `
 			P:
@@ -403,17 +419,25 @@ func testYAML_Ordering_4_multiple_empty_lines_after_service_line(path string, t
 
 func testYAML_Ordering_5_eof_is_service_line(path string, t *testing.T) {
 	data := test.TrimYAML(`
-	settings:
-	data:
-	database_file: test-ordering_5.db
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
+		settings:
+		data:
+		database_file: test-ordering_5.db
 
-	service:`)
+		service:`)
 
 	writeFile(path, data, t)
 }
 
 func testYAML_Ordering_6_no_services_after_service_line_another_block(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		service:
 
 		settings:
@@ -426,6 +450,10 @@ func testYAML_Ordering_6_no_services_after_service_line_another_block(path strin
 
 func testYAML_Ordering_7_no_services_after_service_line(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		settings:
 			data:
 				database_file: test-ordering_5.db

diff --git a/service/latest_version/types/github/query.go b/service/latest_version/types/github/query.go
@@ -116,13 +116,11 @@ func (l *Lookup) createRequest(logFrom logutil.LogFrom) (*http.Request, error) {
 	// Set headers.
 	req.Header.Set("Connection", "close")
 	// Access Token.
-	accessToken := l.accessToken()
-	if accessToken != "" {
+	if accessToken := l.accessToken(); accessToken != "" {
 		req.Header.Set("Authorization", fmt.Sprintf("token %s", accessToken))
 	}
 	// Conditional requests - https://docs.github.com/en/rest/overview/resources-in-the-rest-api#conditional-requests.
-	eTag := l.data.ETag()
-	if eTag != "" {
+	if eTag := l.data.ETag(); eTag != "" {
 		req.Header.Set("If-None-Match", eTag)
 	}
 

diff --git a/service/latest_version/types/github/query_test.go b/service/latest_version/types/github/query_test.go
@@ -280,6 +280,9 @@ func TestQuery(t *testing.T) {
 				try++
 				temporaryFailureInNameResolution = false
 				lookup := testLookup(false)
+				if strings.Contains(tc.overrides, "access_token: null") {
+					lookup.HardDefaults.AccessToken = ""
+				}
 				lookup.Status.ServiceID = &name
 				err := yaml.Unmarshal([]byte(tc.overrides), lookup)
 				if err != nil {

diff --git a/web/api/v1/yaml_help_test.go b/web/api/v1/yaml_help_test.go
@@ -1,4 +1,4 @@
-// Copyright [2024] [Argus]
+// Copyright [2025] [Argus]
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,6 +30,10 @@ func writeFile(path string, data string) {
 
 func testYAML_Argus(path string) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		settings:
 			data:
 				database_file: test-argus.db

diff --git a/web/yaml_help_test.go b/web/yaml_help_test.go
@@ -1,4 +1,4 @@
-// Copyright [2024] [Argus]
+// Copyright [2025] [Argus]
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,6 +34,10 @@ func writeFile(path string, data string, t *testing.T) {
 
 func testYAML_Argus(path string, t *testing.T) {
 	data := test.TrimYAML(`
+		defaults:
+			service:
+				latest_version:
+					access_token: ` + os.Getenv("GITHUB_TOKEN") + `
 		settings:
 			data:
 				database_file: test-web.db