5 Commits

Author SHA1 Message Date
d5a803644b do formatting to heading row of empty worksheet
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2024-06-28 09:19:25 +10:00
bfa2afbb6c add CICD
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2024-06-28 09:02:31 +10:00
24560ee8bf improve handling of empty data 2024-06-28 08:59:22 +10:00
2a89008a54 generate empty workbook if no data to add 2023-06-15 10:41:33 +10:00
c91d38f96c fix json keys 2023-05-31 11:51:04 +10:00
4 changed files with 106 additions and 14 deletions

15
.drone.sh Normal file
View File

@@ -0,0 +1,15 @@
#!/bin/sh
# disable CGO for cross-compiling
export CGO_ENABLED=0
export now=$(TZ=Australia/Sydney date '+%Y%m%d-%H%M%S')
echo $now
#pwd
#ls -lah ~
#go env
echo "build commences"
go build -ldflags "-X main.sha1ver=`git rev-parse HEAD` -X main.buildTime=$now" -o json2excel
echo "build complete"
sha256sum json2excel > json2excel_checksum.txt
ls -lah

30
.drone.yml Normal file
View File

@@ -0,0 +1,30 @@
kind: pipeline
type: docker
name: default
# Docs at https://docs.drone.io/pipeline/exec/overview/
# Also see https://github.com/harness/drone-cli/blob/master/.drone.yml
steps:
- name: build
image: golang
environment:
CGO_ENABLED: 0
commands:
- sh ./.drone.sh
- name: dell-sftp-deploy
image: hypervtechnics/drone-sftp
settings:
host: deft.dell.com
username:
from_secret: DELLFTP_USER
password:
from_secret: DELLFTP_PASS
port: 22
source: ./
filter: json2excel*
clean: false
target: /
overwrite: true
verbose: true

View File

@@ -22,6 +22,6 @@ Advanced settings can be provided via a top level json key named "config". Here
| Key | Example Value | Description |
|---------------|---------------|---------------------------|
| key-order | "Column3,Column1,Column2"| Comma separated list of column names in the desired order |
| overwrite-file | true | Boolean indicating whether output file should be overwritten if it already exists |
| parent-node | "results" | Specify an alternate starting key for the spreadsheet data than just the first non-config key. Useful with json structures with multiple top-level keys |
| keyOrder | "Column3,Column1,Column2"| Comma separated list of column names in the desired order |
| overwriteFile | true | Boolean indicating whether output file should be overwritten if it already exists |
| parentNode | "results" | Specify an alternate starting key for the spreadsheet data than just the first non-config key. Useful with json structures with multiple top-level keys |

View File

@@ -114,18 +114,18 @@ func main() {
// Parse each key into our config struct
for _, key := range configKeys {
if strings.EqualFold(key, "key-order") {
fmt.Printf("Found config element for key-order\n")
if strings.EqualFold(key, "keyOrder") {
fmt.Printf("Found config element for keyOrder\n")
e, _ := configMap.Get(key)
for i, e := range strings.Split(e.(string), ",") {
config.keyOrder[i] = e
}
fmt.Printf("Column order is now : '%v'\n", config.keyOrder)
} else if strings.EqualFold(key, "overwrite-file") {
} else if strings.EqualFold(key, "overwriteFile") {
fmt.Printf("Found config element for overwriting output file\n")
e, _ := configMap.Get(key)
overwriteFile = e.(bool)
} else if strings.EqualFold(key, "parent-node") {
} else if strings.EqualFold(key, "parentNode") {
fmt.Printf("Found config element for forcing parent key for spreadsheet data\n")
e, _ := configMap.Get(key)
config.parentOverride = e.(string)
@@ -153,6 +153,53 @@ func main() {
// Get an interface that we can work with to access the sub elements
vslice := vislice.([]interface{})
if len(vslice) < 1 {
// There was no data but lets just log that and close off the empty workbook
fmt.Printf("No data found contained in top-level json key '%s', no work to do.\n", parentNode)
// Create new file
xlsx = createWorkbook(worksheetName, outputFilename)
// Run code to add column names to the first row of the workbook based off the keyOrder, if defined
if len(config.keyOrder) > 0 {
var columnHeadings []string
for _, value := range config.keyOrder {
columnHeadings = append(columnHeadings, value)
}
createHeadingRow(xlsx, worksheetName, columnHeadings)
headerStyle, err := xlsx.NewStyle(&excelize.Style{
Font: &excelize.Font{
Bold: true,
},
})
if err != nil {
fmt.Printf("Error generating header style : '%s'\n", err)
} else {
// Set the style if there was no error generating it
if boldTopRow {
err = xlsx.SetRowStyle(worksheetName, 1, 1, headerStyle)
if err != nil {
fmt.Printf("Error setting header style : '%s'\n", err)
}
}
}
if autoWidth {
err = SetColAutoWidth(xlsx, worksheetName)
if err != nil {
fmt.Printf("Error setting auto width : '%s'\n", err)
}
}
}
// Close off the file
if err := xlsx.SaveAs(outputFilename); err != nil {
log.Fatal(err)
}
return
}
// Check that the first element is what we expected
if _, ok := vslice[0].(orderedmap.OrderedMap); !ok {
error := fmt.Sprintf("Type of first vslice element is not an ordered map. It appears to be '%v'\n", reflect.TypeOf(vslice[0]))
@@ -196,13 +243,13 @@ func main() {
})
if err2 != nil {
fmt.Printf("Error generating header style : '%s'\n", err2)
}
// Set the style
if boldTopRow {
err = xlsx.SetRowStyle(worksheetName, 1, 1, headerStyle)
if err != nil {
fmt.Printf("Error setting header style : '%s'\n", err)
} else {
// Set the style if there was no error generating it
if boldTopRow {
err = xlsx.SetRowStyle(worksheetName, 1, 1, headerStyle)
if err != nil {
fmt.Printf("Error setting header style : '%s'\n", err)
}
}
}