Skip to content

Commit 3f75f92

Browse files
authored
Make necessary results spreadsheet functions public (redhat-best-practices-for-k8s#2442)
1 parent 63e7aaf commit 3f75f92

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

cmd/certsuite/upload/results_spreadsheet/results_spreadsheet.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func readCSV(fp string) ([][]string, error) {
7373
return records, nil
7474
}
7575

76-
func createSheetsAndDriveServices() (sheetService *sheets.Service, driveService *drive.Service, err error) {
76+
func CreateSheetsAndDriveServices() (sheetService *sheets.Service, driveService *drive.Service, err error) {
7777
ctx := context.Background()
7878
b, err := os.ReadFile(credentials)
7979
if err != nil {
@@ -148,7 +148,7 @@ func createSingleWorkloadRawResultsSheet(rawResultsSheet *sheets.Sheet, workload
148148
filteredRows[0].Values = append(filteredRows[0].Values, rawResultsSheet.Data[0].RowData[0].Values...)
149149

150150
headers := getHeadersFromSheet(rawResultsSheet)
151-
indices, err := getHeaderIndicesByColumnNames(headers, []string{"CNFName"})
151+
indices, err := GetHeaderIndicesByColumnNames(headers, []string{"CNFName"})
152152
if err != nil {
153153
return nil, err
154154
}
@@ -222,7 +222,7 @@ func createConclusionsSheet(sheetsService *sheets.Service, driveService *drive.S
222222
}
223223

224224
rawSheetHeaders := getHeadersFromSheet(rawResultsSheet)
225-
colsIndices, err := getHeaderIndicesByColumnNames(rawSheetHeaders, []string{workloadNameRawResultsCol, workloadTypeRawResultsCol, operatorVersionRawResultsCol})
225+
colsIndices, err := GetHeaderIndicesByColumnNames(rawSheetHeaders, []string{workloadNameRawResultsCol, workloadTypeRawResultsCol, operatorVersionRawResultsCol})
226226
if err != nil {
227227
return nil, err
228228
}
@@ -321,7 +321,7 @@ func createRawResultsSheet(fp string) (*sheets.Sheet, error) {
321321
}
322322

323323
func generateResultsSpreadSheet() {
324-
sheetService, driveService, err := createSheetsAndDriveServices()
324+
sheetService, driveService, err := CreateSheetsAndDriveServices()
325325
if err != nil {
326326
log.Fatalf("Unable to create services: %v", err)
327327
}

cmd/certsuite/upload/results_spreadsheet/sheet_utils.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ func getHeadersFromSheet(sheet *sheets.Sheet) []string {
1414
return headers
1515
}
1616

17-
func getHeadersFromValueRange(sheetsValues *sheets.ValueRange) []string {
17+
func GetHeadersFromValueRange(sheetsValues *sheets.ValueRange) []string {
1818
headers := []string{}
1919
for _, val := range sheetsValues.Values[0] {
2020
headers = append(headers, fmt.Sprint(val))
2121
}
2222
return headers
2323
}
2424

25-
func getHeaderIndicesByColumnNames(headers, names []string) ([]int, error) {
25+
func GetHeaderIndicesByColumnNames(headers, names []string) ([]int, error) {
2626
indices := []int{}
2727
for _, name := range names {
2828
found := false
@@ -40,7 +40,7 @@ func getHeaderIndicesByColumnNames(headers, names []string) ([]int, error) {
4040
return indices, nil
4141
}
4242

43-
func getSheetIDByName(spreadsheet *sheets.Spreadsheet, name string) (int64, error) {
43+
func GetSheetIDByName(spreadsheet *sheets.Spreadsheet, name string) (int64, error) {
4444
for _, sheet := range spreadsheet.Sheets {
4545
if sheet.Properties.Title == name {
4646
return sheet.Properties.SheetId, nil
@@ -75,13 +75,13 @@ func addDescendingSortFilterToSheet(srv *sheets.Service, spreadsheet *sheets.Spr
7575
if err != nil {
7676
return fmt.Errorf("unable to retrieve sheet %s values: %v", sheetName, err)
7777
}
78-
headers := getHeadersFromValueRange(sheetsValues)
79-
indices, err := getHeaderIndicesByColumnNames(headers, []string{colName})
78+
headers := GetHeadersFromValueRange(sheetsValues)
79+
indices, err := GetHeaderIndicesByColumnNames(headers, []string{colName})
8080
if err != nil {
8181
return nil
8282
}
8383

84-
sheetID, err := getSheetIDByName(spreadsheet, sheetName)
84+
sheetID, err := GetSheetIDByName(spreadsheet, sheetName)
8585
if err != nil {
8686
return fmt.Errorf("unable to retrieve sheet %s id: %v", sheetName, err)
8787
}
@@ -117,16 +117,16 @@ func addFilterByFailedAndMandatoryToSheet(srv *sheets.Service, spreadsheet *shee
117117
if err != nil {
118118
return fmt.Errorf("unable to retrieve sheet %s values: %v", sheetName, err)
119119
}
120-
headers := getHeadersFromValueRange(sheetsValues)
121-
indices, err := getHeaderIndicesByColumnNames(headers, []string{"State", "Mandatory/Optional"})
120+
headers := GetHeadersFromValueRange(sheetsValues)
121+
indices, err := GetHeaderIndicesByColumnNames(headers, []string{"State", "Mandatory/Optional"})
122122
if err != nil {
123123
return nil
124124
}
125125

126126
stateColIndex := indices[0]
127127
isMandatoryColIndex := indices[1]
128128

129-
sheetID, err := getSheetIDByName(spreadsheet, sheetName)
129+
sheetID, err := GetSheetIDByName(spreadsheet, sheetName)
130130
if err != nil {
131131
return fmt.Errorf("unable to retrieve sheet %s id: %v", sheetName, err)
132132
}

0 commit comments

Comments
 (0)